From 0b742657905a4b5cccb7accef42e4942bdf8b20f Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Tue, 24 Aug 2021 10:19:16 +0800
Subject: [PATCH] Fix test

---
 dialects/dameng.go               |  2 +-
 dialects/dialect.go              |  4 ++--
 dialects/mssql.go                |  4 ++--
 dialects/mysql.go                | 13 +++----------
 integrations/session_get_test.go |  1 +
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/dialects/dameng.go b/dialects/dameng.go
index 148177dd..8f664c62 100644
--- a/dialects/dameng.go
+++ b/dialects/dameng.go
@@ -13,8 +13,8 @@ import (
 	"strconv"
 	"strings"
 
+	"xorm.io/xorm/convert"
 	"xorm.io/xorm/core"
-	"xorm.io/xorm/internal/convert"
 	"xorm.io/xorm/internal/utils"
 	"xorm.io/xorm/schemas"
 )
diff --git a/dialects/dialect.go b/dialects/dialect.go
index 6d616535..78110b55 100644
--- a/dialects/dialect.go
+++ b/dialects/dialect.go
@@ -119,7 +119,7 @@ func (db *Base) URI() *URI {
 }
 
 // CreateTableSQL implements Dialect
-func (db *Base) CreateTableSQL(table *schemas.Table, tableName string) ([]string, bool) {
+func (db *Base) CreateTableSQL(ctx context.Context, queryer core.Queryer, table *schemas.Table, tableName string) (string, bool, error) {
 	if tableName == "" {
 		tableName = table.Name
 	}
@@ -148,7 +148,7 @@ func (db *Base) CreateTableSQL(table *schemas.Table, tableName string) ([]string
 
 	b.WriteString(")")
 
-	return []string{b.String()}, false
+	return b.String(), false, nil
 }
 
 func (db *Base) CreateSequenceSQL(ctx context.Context, queryer core.Queryer, seqName string) (string, error) {
diff --git a/dialects/mssql.go b/dialects/mssql.go
index 4556aa5a..cd19afb9 100644
--- a/dialects/mssql.go
+++ b/dialects/mssql.go
@@ -631,7 +631,7 @@ WHERE IXS.TYPE_DESC='NONCLUSTERED' and OBJECT_NAME(IXS.OBJECT_ID) =?
 	return indexes, nil
 }
 
-func (db *mssql) CreateTableSQL(table *schemas.Table, tableName string) ([]string, bool) {
+func (db *mssql) CreateTableSQL(ctx context.Context, queryer core.Queryer, table *schemas.Table, tableName string) (string, bool, error) {
 	if tableName == "" {
 		tableName = table.Name
 	}
@@ -662,7 +662,7 @@ func (db *mssql) CreateTableSQL(table *schemas.Table, tableName string) ([]strin
 
 	b.WriteString(")")
 
-	return []string{b.String()}, true
+	return b.String(), true, nil
 }
 
 func (db *mssql) ForUpdateSQL(query string) string {
diff --git a/dialects/mysql.go b/dialects/mysql.go
index 5f3e17ec..ce3bd705 100644
--- a/dialects/mysql.go
+++ b/dialects/mysql.go
@@ -631,7 +631,7 @@ func (db *mysql) GetIndexes(queryer core.Queryer, ctx context.Context, tableName
 	return indexes, nil
 }
 
-func (db *mysql) CreateTableSQL(table *schemas.Table, tableName string) ([]string, bool) {
+func (db *mysql) CreateTableSQL(ctx context.Context, queryer core.Queryer, table *schemas.Table, tableName string) (string, bool, error) {
 	if tableName == "" {
 		tableName = table.Name
 	}
@@ -684,15 +684,8 @@ func (db *mysql) CreateTableSQL(table *schemas.Table, tableName string) ([]strin
 		b.WriteString(" ROW_FORMAT=")
 		b.WriteString(db.rowFormat)
 	}
-<<<<<<< HEAD
-<<<<<<< HEAD
-	return []string{b.String()}, true
-=======
-	return []string{sql}, true, nil
->>>>>>> 4dbe145 (fix insert)
-=======
-	return sql, true, nil
->>>>>>> 21b6352 (Fix more bugs)
+
+	return b.String(), true, nil
 }
 
 func (db *mysql) Filters() []Filter {
diff --git a/integrations/session_get_test.go b/integrations/session_get_test.go
index fa6cf002..4fc30adb 100644
--- a/integrations/session_get_test.go
+++ b/integrations/session_get_test.go
@@ -15,6 +15,7 @@ import (
 	"xorm.io/xorm"
 	"xorm.io/xorm/contexts"
 	"xorm.io/xorm/convert"
+	"xorm.io/xorm/dialects"
 	"xorm.io/xorm/schemas"
 
 	"github.com/shopspring/decimal"