Skip to content
This repository was archived by the owner on Sep 7, 2021. It is now read-only.
This repository is currently being migrated. It's locked while the migration is in progress.

Commit 12e0367

Browse files
authored
add more tests for Sync2 (#925)
1 parent ae0364a commit 12e0367

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

engine.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1188,7 +1188,7 @@ func (engine *Engine) Sync(beans ...interface{}) error {
11881188

11891189
for _, bean := range beans {
11901190
v := rValue(bean)
1191-
tableNameNoSchema := engine.tbNameNoSchema(v.Interface())
1191+
tableNameNoSchema := engine.TableName(bean)
11921192
table, err := engine.autoMapType(v)
11931193
if err != nil {
11941194
return err

session_schema.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ func (session *Session) DropTable(beanOrTableName interface{}) error {
122122
}
123123

124124
func (session *Session) dropTable(beanOrTableName interface{}) error {
125-
tableName := session.engine.tbNameNoSchema(beanOrTableName)
125+
tableName := session.engine.TableName(beanOrTableName)
126126
var needDrop = true
127127
if !session.engine.dialect.SupportDropIfExists() {
128128
sqlStr, args := session.engine.dialect.TableCheckSql(tableName)
@@ -147,7 +147,7 @@ func (session *Session) IsTableExist(beanOrTableName interface{}) (bool, error)
147147
defer session.Close()
148148
}
149149

150-
tableName := session.engine.tbNameNoSchema(beanOrTableName)
150+
tableName := session.engine.TableName(beanOrTableName)
151151

152152
return session.isTableExist(tableName)
153153
}
@@ -163,7 +163,7 @@ func (session *Session) IsTableEmpty(bean interface{}) (bool, error) {
163163
if session.isAutoClose {
164164
defer session.Close()
165165
}
166-
return session.isTableEmpty(session.engine.tbNameNoSchema(bean))
166+
return session.isTableEmpty(session.engine.TableName(bean))
167167
}
168168

169169
func (session *Session) isTableEmpty(tableName string) (bool, error) {

session_schema_test.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,21 @@ func TestSync2_2(t *testing.T) {
289289

290290
assert.NoError(t, prepareEngine())
291291

292+
var tableNames = make(map[string]bool)
292293
for i := 0; i < 10; i++ {
293294
tableName := fmt.Sprintf("test_sync2_index_%d", i)
295+
tableNames[tableName] = true
294296
assert.NoError(t, testEngine.Table(tableName).Sync2(new(TestSync2Index)))
297+
298+
exist, err := testEngine.IsTableExist(tableName)
299+
assert.NoError(t, err)
300+
assert.True(t, exist)
301+
}
302+
303+
tables, err := testEngine.DBMetas()
304+
assert.NoError(t, err)
305+
306+
for _, table := range tables {
307+
assert.True(t, tableNames[table.Name])
295308
}
296309
}

0 commit comments

Comments
 (0)