improve sync2 (#1443)

engine.go

@@ -377,24 +377,17 @@ func (engine *Engine) NoAutoCondition(no ...bool) *Session {
 	return session.NoAutoCondition(no...)
 }
 
-// DBMetas Retrieve all tables, columns, indexes' informations from database.
+func (engine *Engine) loadTableInfo(table *core.Table) error {
-func (engine *Engine) DBMetas() ([]*core.Table, error) {
-	tables, err := engine.dialect.GetTables()
-	if err != nil {
-		return nil, err
-	}
-
-	for _, table := range tables {
 	colSeq, cols, err := engine.dialect.GetColumns(table.Name)
 	if err != nil {
-			return nil, err
+		return err
 	}
 	for _, name := range colSeq {
 		table.AddColumn(cols[name])
 	}
 	indexes, err := engine.dialect.GetIndexes(table.Name)
 	if err != nil {
-			return nil, err
+		return err
 	}
 	table.Indexes = indexes
 
@@ -403,10 +396,24 @@ func (engine *Engine) DBMetas() ([]*core.Table, error) {
 			if col := table.GetColumn(name); col != nil {
 				col.Indexes[index.Name] = index.Type
 			} else {
-					return nil, fmt.Errorf("Unknown col %s in index %v of table %v, columns %v", name, index.Name, table.Name, table.ColumnsSeq())
+				return fmt.Errorf("Unknown col %s in index %v of table %v, columns %v", name, index.Name, table.Name, table.ColumnsSeq())
 			}
 		}
 	}
+	return nil
+}
+
+// DBMetas Retrieve all tables, columns, indexes' informations from database.
+func (engine *Engine) DBMetas() ([]*core.Table, error) {
+	tables, err := engine.dialect.GetTables()
+	if err != nil {
+		return nil, err
+	}
+
+	for _, table := range tables {
+		if err = engine.loadTableInfo(table); err != nil {
+			return nil, err
+		}
 	}
 	return tables, nil
 }

session_schema.go

@@ -228,7 +228,7 @@ func (session *Session) Sync2(beans ...interface{}) error {
 		defer session.Close()
 	}
 
-	tables, err := engine.DBMetas()
+	tables, err := engine.dialect.GetTables()
 	if err != nil {
 		return err
 	}
@@ -239,15 +239,12 @@ func (session *Session) Sync2(beans ...interface{}) error {
 		session.resetStatement()
 	}()
 
-	var structTables []*core.Table
-
 	for _, bean := range beans {
 		v := rValue(bean)
 		table, err := engine.mapType(v)
 		if err != nil {
 			return err
 		}
-		structTables = append(structTables, table)
 		tbName := engine.TableName(bean)
 		tbNameWithSchema := engine.TableName(tbName, true)
 
@@ -259,6 +256,7 @@ func (session *Session) Sync2(beans ...interface{}) error {
 			}
 		}
 
+		// this is a new table
 		if oriTable == nil {
 			err = session.StoreEngine(session.statement.StoreEngine).createTable(bean)
 			if err != nil {
@@ -274,7 +272,15 @@ func (session *Session) Sync2(beans ...interface{}) error {
 			if err != nil {
 				return err
 			}
-		} else {
+			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 *core.Column
 			for _, col2 := range oriTable.Columns() {
@@ -284,7 +290,17 @@ func (session *Session) Sync2(beans ...interface{}) error {
 				}
 			}
 
-				if oriCol != nil {
+			// column is not exist on table
+			if oriCol == nil {
+				session.statement.RefTable = table
+				session.statement.tableName = 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 {
@@ -331,11 +347,7 @@ func (session *Session) Sync2(beans ...interface{}) error {
 				engine.logger.Warnf("Table %s Column %s db nullable is %v, struct nullable is %v",
 					tbName, col.Name, oriCol.Nullable, col.Nullable)
 			}
-				} else {
+
-					session.statement.RefTable = table
-					session.statement.tableName = tbNameWithSchema
-					err = session.addColumn(col.Name)
-				}
 			if err != nil {
 				return err
 			}
@@ -394,28 +406,14 @@ func (session *Session) Sync2(beans ...interface{}) error {
 				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)
+			}
 		}
 	}
 
-	for _, table := range tables {
-		var oriTable *core.Table
-		for _, structTable := range structTables {
-			if strings.EqualFold(table.Name, session.tbNameNoSchema(structTable)) {
-				oriTable = structTable
-				break
-			}
-		}
-
-		if oriTable == nil {
-			//engine.LogWarnf("Table %s has no struct to mapping it", table.Name)
-			continue
-		}
-
-		for _, colName := range table.ColumnsSeq() {
-			if oriTable.GetColumn(colName) == nil {
-				engine.logger.Warnf("Table %s has column %s but struct has not related field", engine.TableName(table.Name, true), colName)
-			}
-		}
-	}
 	return nil
 }