From d1ec487ef58852c357298147ae845ace8f0a6d80 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 10 Oct 2016 15:08:08 +0800 Subject: [PATCH] remove wrong files --- a.patch | 24 ------------------------ patch | 31 ------------------------------- 2 files changed, 55 deletions(-) delete mode 100644 a.patch delete mode 100644 patch diff --git a/a.patch b/a.patch deleted file mode 100644 index 6bcd457c..00000000 --- a/a.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/statement.go b/statement.go -index 5a08ef7..9a9350e 100644 ---- a/statement.go -+++ b/statement.go -@@ -1199,7 +1199,7 @@ func (statement *Statement) genSelectSQL(columnStr, condSQL string) (a string) { - top = fmt.Sprintf(" TOP %d ", statement.LimitN) - } - if statement.Start > 0 { -- var column = "(id)" -+ var column string - if len(statement.RefTable.PKColumns()) == 0 { - for _, index := range statement.RefTable.Indexes { - if len(index.Cols) == 1 { -@@ -1210,7 +1210,10 @@ func (statement *Statement) genSelectSQL(columnStr, condSQL string) (a string) { - if len(column) == 0 { - column = statement.RefTable.ColumnsSeq()[0] - } -+ } else { -+ column = statement.RefTable.PKColumns()[0].Name - } -+ - var orderStr string - if len(statement.OrderStr) > 0 { - orderStr = " ORDER BY " + statement.OrderStr diff --git a/patch b/patch deleted file mode 100644 index b8c95f04..00000000 --- a/patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/statement.go b/statement.go -index 5a08ef7..5d59a32 100644 ---- a/statement.go -+++ b/statement.go -@@ -1199,7 +1199,7 @@ func (statement *Statement) genSelectSQL(columnStr, condSQL string) (a string) { - top = fmt.Sprintf(" TOP %d ", statement.LimitN) - } - if statement.Start > 0 { -- var column = "(id)" -+ var column string - if len(statement.RefTable.PKColumns()) == 0 { - for _, index := range statement.RefTable.Indexes { - if len(index.Cols) == 1 { -@@ -1210,7 +1210,17 @@ func (statement *Statement) genSelectSQL(columnStr, condSQL string) (a string) { - if len(column) == 0 { - column = statement.RefTable.ColumnsSeq()[0] - } -+ } else { -+ column = statement.RefTable.PKColumns()[0].Name - } -+ if statement.needTableName() { -+ if len(statement.TableAlias) > 0 { -+ column = statement.TableAlias + "." + column -+ } else { -+ column = statement.TableName() + "." + column -+ } -+ } -+ - var orderStr string - if len(statement.OrderStr) > 0 { - orderStr = " ORDER BY " + statement.OrderStr