merge origin master
This commit is contained in:
brookechen
parent
a678ef1c27
commit
0b9bf4f167
|
|
@ -15,7 +15,6 @@ import (
|
||||||
|
|
||||||
"xorm.io/xorm/dialects"
|
"xorm.io/xorm/dialects"
|
||||||
"xorm.io/xorm/internal/utils"
|
"xorm.io/xorm/internal/utils"
|
||||||
"xorm.io/xorm/schemas"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Ping test if database is ok
|
// Ping test if database is ok
|
||||||
|
|
@ -169,7 +168,7 @@ func (session *Session) dropTable(beanOrTableName interface{}) error {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
var seqName = utils.SeqName(tableName)
|
seqName := utils.SeqName(tableName)
|
||||||
exist, err := session.engine.dialect.IsSequenceExist(session.ctx, session.getQueryer(), seqName)
|
exist, err := session.engine.dialect.IsSequenceExist(session.ctx, session.getQueryer(), seqName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
@ -244,231 +243,6 @@ func (session *Session) addUnique(tableName, uqeName string) error {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sync2 synchronize structs to database tables
|
|
||||||
// Depricated
|
|
||||||
func (session *Session) Sync2(beans ...interface{}) error {
|
|
||||||
return session.Sync(beans...)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sync synchronize structs to database tables
|
|
||||||
func (session *Session) Sync(beans ...interface{}) error {
|
|
||||||
engine := session.engine
|
|
||||||
|
|
||||||
if session.isAutoClose {
|
|
||||||
session.isAutoClose = false
|
|
||||||
defer session.Close()
|
|
||||||
}
|
|
||||||
|
|
||||||
tables, err := engine.dialect.GetTables(session.getQueryer(), session.ctx)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
session.autoResetStatement = false
|
|
||||||
defer func() {
|
|
||||||
session.autoResetStatement = true
|
|
||||||
session.resetStatement()
|
|
||||||
}()
|
|
||||||
|
|
||||||
for _, bean := range beans {
|
|
||||||
v := utils.ReflectValue(bean)
|
|
||||||
table, err := engine.tagParser.ParseWithCache(v)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
var tbName string
|
|
||||||
if len(session.statement.AltTableName) > 0 {
|
|
||||||
tbName = session.statement.AltTableName
|
|
||||||
} else {
|
|
||||||
tbName = engine.TableName(bean)
|
|
||||||
}
|
|
||||||
tbNameWithSchema := engine.tbNameWithSchema(tbName)
|
|
||||||
|
|
||||||
var oriTable *schemas.Table
|
|
||||||
for _, tb := range tables {
|
|
||||||
if strings.EqualFold(engine.tbNameWithSchema(tb.Name), engine.tbNameWithSchema(tbName)) {
|
|
||||||
oriTable = tb
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// this is a new table
|
|
||||||
if oriTable == nil {
|
|
||||||
err = session.StoreEngine(session.statement.StoreEngine).createTable(bean)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
err = session.createUniques(bean)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
err = session.createIndexes(bean)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
// this will modify an old table
|
|
||||||
if err = engine.loadTableInfo(oriTable); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
// check columns
|
|
||||||
for _, col := range table.Columns() {
|
|
||||||
var oriCol *schemas.Column
|
|
||||||
for _, col2 := range oriTable.Columns() {
|
|
||||||
if strings.EqualFold(col.Name, col2.Name) {
|
|
||||||
oriCol = col2
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// column is not exist on table
|
|
||||||
if oriCol == nil {
|
|
||||||
session.statement.RefTable = table
|
|
||||||
session.statement.SetTableName(tbNameWithSchema)
|
|
||||||
if err = session.addColumn(col.Name); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
err = nil
|
|
||||||
expectedType := engine.dialect.SQLType(col)
|
|
||||||
curType := engine.dialect.SQLType(oriCol)
|
|
||||||
if expectedType != curType {
|
|
||||||
if expectedType == schemas.Text &&
|
|
||||||
strings.HasPrefix(curType, schemas.Varchar) {
|
|
||||||
// currently only support mysql & postgres
|
|
||||||
if engine.dialect.URI().DBType == schemas.MYSQL ||
|
|
||||||
engine.dialect.URI().DBType == schemas.POSTGRES {
|
|
||||||
engine.logger.Infof("Table %s column %s change type from %s to %s\n",
|
|
||||||
tbNameWithSchema, col.Name, curType, expectedType)
|
|
||||||
_, err = session.exec(engine.dialect.ModifyColumnSQL(tbNameWithSchema, col))
|
|
||||||
} else {
|
|
||||||
engine.logger.Warnf("Table %s column %s db type is %s, struct type is %s\n",
|
|
||||||
tbNameWithSchema, col.Name, curType, expectedType)
|
|
||||||
}
|
|
||||||
} else if strings.HasPrefix(curType, schemas.Varchar) && strings.HasPrefix(expectedType, schemas.Varchar) {
|
|
||||||
if engine.dialect.URI().DBType == schemas.MYSQL {
|
|
||||||
if oriCol.Length < col.Length {
|
|
||||||
engine.logger.Infof("Table %s column %s change type from varchar(%d) to varchar(%d)\n",
|
|
||||||
tbNameWithSchema, col.Name, oriCol.Length, col.Length)
|
|
||||||
_, err = session.exec(engine.dialect.ModifyColumnSQL(tbNameWithSchema, col))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if !(strings.HasPrefix(curType, expectedType) && curType[len(expectedType)] == '(') {
|
|
||||||
if !strings.EqualFold(schemas.SQLTypeName(curType), engine.dialect.Alias(schemas.SQLTypeName(expectedType))) {
|
|
||||||
engine.logger.Warnf("Table %s column %s db type is %s, struct type is %s",
|
|
||||||
tbNameWithSchema, col.Name, curType, expectedType)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if expectedType == schemas.Varchar {
|
|
||||||
if engine.dialect.URI().DBType == schemas.MYSQL {
|
|
||||||
if oriCol.Length < col.Length {
|
|
||||||
engine.logger.Infof("Table %s column %s change type from varchar(%d) to varchar(%d)\n",
|
|
||||||
tbNameWithSchema, col.Name, oriCol.Length, col.Length)
|
|
||||||
_, err = session.exec(engine.dialect.ModifyColumnSQL(tbNameWithSchema, col))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if col.Comment != oriCol.Comment {
|
|
||||||
// only postgres dialect implement update comment now.
|
|
||||||
if engine.dialect.URI().DBType == schemas.POSTGRES {
|
|
||||||
_, err = session.exec(engine.dialect.ModifyColumnSQL(tbNameWithSchema, col))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if col.Default != oriCol.Default {
|
|
||||||
switch {
|
|
||||||
case col.IsAutoIncrement: // For autoincrement column, don't check default
|
|
||||||
case (col.SQLType.Name == schemas.Bool || col.SQLType.Name == schemas.Boolean) &&
|
|
||||||
((strings.EqualFold(col.Default, "true") && oriCol.Default == "1") ||
|
|
||||||
(strings.EqualFold(col.Default, "false") && oriCol.Default == "0")):
|
|
||||||
default:
|
|
||||||
engine.logger.Warnf("Table %s Column %s db default is %s, struct default is %s",
|
|
||||||
tbName, col.Name, oriCol.Default, col.Default)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if col.Nullable != oriCol.Nullable {
|
|
||||||
engine.logger.Warnf("Table %s Column %s db nullable is %v, struct nullable is %v",
|
|
||||||
tbName, col.Name, oriCol.Nullable, col.Nullable)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var foundIndexNames = make(map[string]bool)
|
|
||||||
var addedNames = make(map[string]*schemas.Index)
|
|
||||||
|
|
||||||
for name, index := range table.Indexes {
|
|
||||||
var oriIndex *schemas.Index
|
|
||||||
for name2, index2 := range oriTable.Indexes {
|
|
||||||
if index.Equal(index2) {
|
|
||||||
oriIndex = index2
|
|
||||||
foundIndexNames[name2] = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if oriIndex != nil {
|
|
||||||
if oriIndex.Type != index.Type {
|
|
||||||
sql := engine.dialect.DropIndexSQL(tbNameWithSchema, oriIndex)
|
|
||||||
_, err = session.exec(sql)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
oriIndex = nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if oriIndex == nil {
|
|
||||||
addedNames[name] = index
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for name2, index2 := range oriTable.Indexes {
|
|
||||||
if _, ok := foundIndexNames[name2]; !ok {
|
|
||||||
sql := engine.dialect.DropIndexSQL(tbNameWithSchema, index2)
|
|
||||||
_, err = session.exec(sql)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for name, index := range addedNames {
|
|
||||||
if index.Type == schemas.UniqueType {
|
|
||||||
session.statement.RefTable = table
|
|
||||||
session.statement.SetTableName(tbNameWithSchema)
|
|
||||||
err = session.addUnique(tbNameWithSchema, name)
|
|
||||||
} else if index.Type == schemas.IndexType {
|
|
||||||
session.statement.RefTable = table
|
|
||||||
session.statement.SetTableName(tbNameWithSchema)
|
|
||||||
err = session.addIndex(tbNameWithSchema, name)
|
|
||||||
}
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// check all the columns which removed from struct fields but left on database tables.
|
|
||||||
for _, colName := range oriTable.ColumnsSeq() {
|
|
||||||
if table.GetColumn(colName) == nil {
|
|
||||||
engine.logger.Warnf("Table %s has column %s but struct has not related field", engine.TableName(oriTable.Name, true), colName)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ImportFile SQL DDL file
|
// ImportFile SQL DDL file
|
||||||
func (session *Session) ImportFile(ddlPath string) ([]sql.Result, error) {
|
func (session *Session) ImportFile(ddlPath string) ([]sql.Result, error) {
|
||||||
file, err := os.Open(ddlPath)
|
file, err := os.Open(ddlPath)
|
||||||
|
|
@ -493,7 +267,7 @@ func (session *Session) Import(r io.Reader) ([]sql.Result, error) {
|
||||||
if atEOF && len(data) == 0 {
|
if atEOF && len(data) == 0 {
|
||||||
return 0, nil, nil
|
return 0, nil, nil
|
||||||
}
|
}
|
||||||
var oriInSingleQuote = inSingleQuote
|
oriInSingleQuote := inSingleQuote
|
||||||
for i, b := range data {
|
for i, b := range data {
|
||||||
if startComment {
|
if startComment {
|
||||||
if b == '\n' {
|
if b == '\n' {
|
||||||
|
|
|
||||||
5
sync.go
5
sync.go
|
|
@ -181,7 +181,10 @@ func (session *Session) SyncWithOptions(opts SyncOptions, beans ...interface{})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if col.Comment != oriCol.Comment {
|
} else if col.Comment != oriCol.Comment {
|
||||||
_, err = session.exec(engine.dialect.ModifyColumnSQL(tbNameWithSchema, col))
|
// only postgres dialect implement update comment now.
|
||||||
|
if engine.dialect.URI().DBType == schemas.POSTGRES {
|
||||||
|
_, err = session.exec(engine.dialect.ModifyColumnSQL(tbNameWithSchema, col))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if col.Default != oriCol.Default {
|
if col.Default != oriCol.Default {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue