From 9cd8d8ff2c0447aaa6460b690de69533ca57d1f4 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Thu, 5 Aug 2021 00:46:01 +0800
Subject: [PATCH] Fix tests

---
 dialects/dameng.go                  |  3 +--
 integrations/engine_dm_test.go      | 13 +++++++++++++
 integrations/engine_test.go         |  4 +++-
 integrations/session_insert_test.go | 13 ++++++++++++-
 internal/statements/insert.go       | 16 +++++++++++++---
 session_insert.go                   |  2 ++
 6 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 integrations/engine_dm_test.go

diff --git a/dialects/dameng.go b/dialects/dameng.go
index 5ecea321..d9ec55ae 100644
--- a/dialects/dameng.go
+++ b/dialects/dameng.go
@@ -552,8 +552,7 @@ func (db *dameng) Version(ctx context.Context, queryer core.Queryer) (*schemas.V
 
 func (db *dameng) Features() *DialectFeatures {
 	return &DialectFeatures{
-		AutoincrMode:    SequenceAutoincrMode,
-		SupportSequence: true,
+		AutoincrMode: SequenceAutoincrMode,
 	}
 }
 
diff --git a/integrations/engine_dm_test.go b/integrations/engine_dm_test.go
new file mode 100644
index 00000000..6c2f6103
--- /dev/null
+++ b/integrations/engine_dm_test.go
@@ -0,0 +1,13 @@
+// Copyright 2021 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build dm
+
+package integrations
+
+import "xorm.io/xorm/schemas"
+
+func init() {
+	dbtypes = append(dbtypes, schemas.DAMENG)
+}
diff --git a/integrations/engine_test.go b/integrations/engine_test.go
index 70956d75..f45d6859 100644
--- a/integrations/engine_test.go
+++ b/integrations/engine_test.go
@@ -135,6 +135,8 @@ func TestDump(t *testing.T) {
 	}
 }
 
+var dbtypes = []schemas.DBType{schemas.SQLITE, schemas.MYSQL, schemas.POSTGRES, schemas.MSSQL}
+
 func TestDumpTables(t *testing.T) {
 	assert.NoError(t, PrepareEngine())
 
@@ -170,7 +172,7 @@ func TestDumpTables(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NoError(t, sess.Commit())
 
-	for _, tp := range []schemas.DBType{schemas.SQLITE, schemas.MYSQL, schemas.POSTGRES, schemas.MSSQL} {
+	for _, tp := range dbtypes {
 		name := fmt.Sprintf("dump_%v-table.sql", tp)
 		t.Run(name, func(t *testing.T) {
 			assert.NoError(t, testEngine.(*xorm.Engine).DumpTablesToFile([]*schemas.Table{tb}, name, tp))
diff --git a/integrations/session_insert_test.go b/integrations/session_insert_test.go
index 598aa69d..8f8693d5 100644
--- a/integrations/session_insert_test.go
+++ b/integrations/session_insert_test.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"xorm.io/xorm"
+	"xorm.io/xorm/schemas"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -624,6 +625,11 @@ func TestAnonymousStruct(t *testing.T) {
 }
 
 func TestInsertMap(t *testing.T) {
+	if testEngine.Dialect().URI().DBType == schemas.DAMENG {
+		t.SkipNow()
+		return
+	}
+
 	type InsertMap struct {
 		Id     int64
 		Width  uint32
@@ -727,7 +733,7 @@ func TestInsertWhere(t *testing.T) {
 	}
 
 	inserted, err := testEngine.SetExpr("`index`", "coalesce(MAX(`index`),0)+1").
-		Where("repo_id=?", 1).
+		Where("`repo_id`=?", 1).
 		Insert(&i)
 	assert.NoError(t, err)
 	assert.EqualValues(t, 1, inserted)
@@ -1067,6 +1073,11 @@ func TestInsertDeleted(t *testing.T) {
 }
 
 func TestInsertMultipleMap(t *testing.T) {
+	if testEngine.Dialect().URI().DBType == schemas.DAMENG {
+		t.SkipNow()
+		return
+	}
+
 	type InsertMultipleMap struct {
 		Id     int64
 		Width  uint32
diff --git a/internal/statements/insert.go b/internal/statements/insert.go
index 358ea300..91a33319 100644
--- a/internal/statements/insert.go
+++ b/internal/statements/insert.go
@@ -97,13 +97,23 @@ func (statement *Statement) GenInsertSQL(colNames []string, args []interface{})
 				return "", nil, err
 			}
 
+			if needSeq {
+				if len(args) > 0 {
+					if _, err := buf.WriteString(","); err != nil {
+						return "", nil, err
+					}
+				}
+				if _, err := buf.WriteString(utils.SeqName(tableName) + ".nextval"); err != nil {
+					return "", nil, err
+				}
+			}
 			if len(exprs) > 0 {
 				if _, err := buf.WriteString(","); err != nil {
 					return "", nil, err
 				}
-			}
-			if err := exprs.WriteArgs(buf); err != nil {
-				return "", nil, err
+				if err := exprs.WriteArgs(buf); err != nil {
+					return "", nil, err
+				}
 			}
 
 			if _, err := buf.WriteString(" FROM "); err != nil {
diff --git a/session_insert.go b/session_insert.go
index 990fdbff..8f8798c2 100644
--- a/session_insert.go
+++ b/session_insert.go
@@ -658,6 +658,7 @@ func (session *Session) insertMap(columns []string, args []interface{}) (int64,
 	if err != nil {
 		return 0, err
 	}
+	sql = session.engine.dialect.Quoter().Replace(sql)
 
 	if err := session.cacheInsert(tableName); err != nil {
 		return 0, err
@@ -684,6 +685,7 @@ func (session *Session) insertMultipleMap(columns []string, argss [][]interface{
 	if err != nil {
 		return 0, err
 	}
+	sql = session.engine.dialect.Quoter().Replace(sql)
 
 	if err := session.cacheInsert(tableName); err != nil {
 		return 0, err