From 7fc2459df982dd1aa87a655d59aa5dd5ff49820a Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 4 Aug 2021 22:04:49 +0800 Subject: [PATCH] drop duplicated feature --- dialects/dialect.go | 3 +-- engine.go | 2 +- session_schema.go | 5 +++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dialects/dialect.go b/dialects/dialect.go index f5b04368..396727ce 100644 --- a/dialects/dialect.go +++ b/dialects/dialect.go @@ -44,8 +44,7 @@ const ( ) type DialectFeatures struct { - AutoincrMode int // 0 autoincrement column, 1 sequence - SupportSequence bool + AutoincrMode int // 0 autoincrement column, 1 sequence } // Dialect represents a kind of database diff --git a/engine.go b/engine.go index b7c45563..f868e23a 100644 --- a/engine.go +++ b/engine.go @@ -513,7 +513,7 @@ func (engine *Engine) dumpTables(ctx context.Context, tables []*schemas.Table, w return err } - if dstTable.AutoIncrement != "" && dstDialect.Features().SupportSequence { + if dstTable.AutoIncrement != "" && dstDialect.Features().AutoincrMode == dialects.SequenceAutoincrMode { sqlstr, err = dstDialect.CreateSequenceSQL(ctx, engine.db, utils.SeqName(dstTableName)) if err != nil { return err diff --git a/session_schema.go b/session_schema.go index ba622b82..52ffcf8e 100644 --- a/session_schema.go +++ b/session_schema.go @@ -13,6 +13,7 @@ import ( "os" "strings" + "xorm.io/xorm/dialects" "xorm.io/xorm/internal/utils" "xorm.io/xorm/schemas" ) @@ -53,7 +54,7 @@ func (session *Session) createTable(bean interface{}) error { return err } - if refTable.AutoIncrement != "" && session.engine.dialect.Features().SupportSequence { + if refTable.AutoIncrement != "" && session.engine.dialect.Features().AutoincrMode == dialects.SequenceAutoincrMode { sqlStr, err = session.engine.dialect.CreateSequenceSQL(context.Background(), session.engine.db, utils.SeqName(tableName)) if err != nil { return err @@ -164,7 +165,7 @@ func (session *Session) dropTable(beanOrTableName interface{}) error { return err } - if !session.engine.dialect.Features().SupportSequence { + if session.engine.dialect.Features().AutoincrMode == dialects.IncrAutoincrMode { return nil }