Allow shared foreign key for many2many jointable

.github/workflows/invalid_question.yml

@@ -16,7 +16,7 @@ jobs:
       ACTIONS_STEP_DEBUG: true
     steps:
     - name: Close Stale Issues
-      uses: actions/stale@v7
+      uses: actions/stale@v5
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: "This issue has been marked as invalid question, please give more information by following the `Question` template, if you believe there is a bug of GORM, please create a pull request that could reproduce the issue on [https://github.com/go-gorm/playground](https://github.com/go-gorm/playground), the issue will be closed in 30 days if no further activity occurs. most likely your question already answered https://github.com/go-gorm/gorm/issues or described in the document https://gorm.io ✨ [Search Before Asking](https://stackoverflow.com/help/how-to-ask) ✨"

.github/workflows/missing_playground.yml

@@ -16,7 +16,7 @@ jobs:
       ACTIONS_STEP_DEBUG: true
     steps:
     - name: Close Stale Issues
-      uses: actions/stale@v7
+      uses: actions/stale@v5
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: "The issue has been automatically marked as stale as it missing playground pull request link, which is important to help others understand your issue effectively and make sure the issue hasn't been fixed on latest master, checkout [https://github.com/go-gorm/playground](https://github.com/go-gorm/playground) for details. it will be closed in 30 days if no further activity occurs. if you are asking question, please use the `Question` template, most likely your question already answered https://github.com/go-gorm/gorm/issues or described in the document https://gorm.io ✨ [Search Before Asking](https://stackoverflow.com/help/how-to-ask) ✨"

.github/workflows/stale.yml

@@ -16,7 +16,7 @@ jobs:
       ACTIONS_STEP_DEBUG: true
     steps:
     - name: Close Stale Issues
-      uses: actions/stale@v7
+      uses: actions/stale@v5
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: "This issue has been automatically marked as stale because it has been open 360 days with no activity. Remove stale label or comment or this will be closed in 180 days"

.github/workflows/tests.yml

@@ -16,7 +16,7 @@ jobs:
   sqlite:
     strategy:
       matrix:
-        go: ['1.19', '1.18']
+        go: ['1.19', '1.18', '1.17', '1.16']
         platform: [ubuntu-latest] # can not run in windows OS
     runs-on: ${{ matrix.platform }}
 
@@ -42,7 +42,7 @@ jobs:
     strategy:
       matrix:
         dbversion: ['mysql:latest', 'mysql:5.7', 'mariadb:latest']
-        go: ['1.19', '1.18']
+        go: ['1.19', '1.18', '1.17', '1.16']
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
 
@@ -86,7 +86,7 @@ jobs:
     strategy:
       matrix:
         dbversion: ['postgres:latest', 'postgres:13', 'postgres:12', 'postgres:11', 'postgres:10']
-        go: ['1.19', '1.18']
+        go: ['1.19', '1.18', '1.17', '1.16']
         platform: [ubuntu-latest] # can not run in macOS and Windows
     runs-on: ${{ matrix.platform }}
 
@@ -128,7 +128,7 @@ jobs:
   sqlserver:
     strategy:
       matrix:
-        go: ['1.19', '1.18']
+        go: ['1.19', '1.18', '1.17', '1.16']
         platform: [ubuntu-latest] # can not run test in macOS and windows
     runs-on: ${{ matrix.platform }}
 
@@ -167,36 +167,3 @@ jobs:
 
     - name: Tests
       run: GITHUB_ACTION=true GORM_DIALECT=sqlserver GORM_DSN="sqlserver://gorm:LoremIpsum86@localhost:9930?database=gorm" ./tests/tests_all.sh
-
-  tidb:
-    strategy:
-      matrix:
-        dbversion: [ 'v6.5.0' ]
-        go: [ '1.19', '1.18' ]
-        platform: [ ubuntu-latest ]
-    runs-on: ${{ matrix.platform }}
-
-    steps:
-      - name: Setup TiDB
-        uses: Icemap/tidb-action@main
-        with:
-          port: 9940
-          version: ${{matrix.dbversion}}
-
-      - name: Set up Go 1.x
-        uses: actions/setup-go@v3
-        with:
-          go-version: ${{ matrix.go }}
-
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
-
-
-      - name: go mod package cache
-        uses: actions/cache@v3
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ matrix.go }}-${{ hashFiles('tests/go.mod') }}
-
-      - name: Tests
-        run: GITHUB_ACTION=true GORM_DIALECT=tidb GORM_DSN="root:@tcp(localhost:9940)/test?charset=utf8&parseTime=True&loc=Local" ./tests/tests_all.sh

.golangci.yml

@@ -9,12 +9,3 @@ linters:
     - prealloc
     - unconvert
     - unparam
-    - goimports
-    - whitespace
-
-linters-settings:
-  whitespace:
-    multi-func: true
-  goimports:
-    local-prefixes: gorm.io/gorm
-

README.md

@@ -4,6 +4,9 @@ The fantastic ORM library for Golang, aims to be developer friendly.
 
 [![go report card](https://goreportcard.com/badge/github.com/go-gorm/gorm "go report card")](https://goreportcard.com/report/github.com/go-gorm/gorm)
 [![test status](https://github.com/go-gorm/gorm/workflows/tests/badge.svg?branch=master "test status")](https://github.com/go-gorm/gorm/actions)
+[![Join the chat at https://gitter.im/jinzhu/gorm](https://img.shields.io/gitter/room/jinzhu/gorm.svg)](https://gitter.im/jinzhu/gorm?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Open Collective Backer](https://opencollective.com/gorm/tiers/backer/badge.svg?label=backer&color=brightgreen "Open Collective Backer")](https://opencollective.com/gorm)
+[![Open Collective Sponsor](https://opencollective.com/gorm/tiers/sponsor/badge.svg?label=sponsor&color=brightgreen "Open Collective Sponsor")](https://opencollective.com/gorm)
 [![MIT license](https://img.shields.io/badge/license-MIT-brightgreen.svg)](https://opensource.org/licenses/MIT)
 [![Go.Dev reference](https://img.shields.io/badge/go.dev-reference-blue?logo=go&logoColor=white)](https://pkg.go.dev/gorm.io/gorm?tab=doc)
 
@@ -27,18 +30,12 @@ The fantastic ORM library for Golang, aims to be developer friendly.
 ## Getting Started
 
 * GORM Guides [https://gorm.io](https://gorm.io)
-* Gen Guides [https://gorm.io/gen/index.html](https://gorm.io/gen/index.html)
+* GORM Gen    [gorm/gen](https://github.com/go-gorm/gen#gormgen)
 
 ## Contributing
 
 [You can help to deliver a better GORM, check out things you can do](https://gorm.io/contribute.html)
 
-## Contributors
-
-Thank you for contributing to the GORM framework!
-
-[![Contributors](https://contrib.rocks/image?repo=go-gorm/gorm)](https://github.com/go-gorm/gorm/graphs/contributors)
-
 ## License
 
 © Jinzhu, 2013~time.Now

callbacks.go

@@ -93,10 +93,6 @@ func (p *processor) Execute(db *DB) *DB {
 		resetBuildClauses = true
 	}
 
-	if optimizer, ok := db.Statement.Dest.(StatementModifier); ok {
-		optimizer.ModifyStatement(stmt)
-	}
-
 	// assign model values
 	if stmt.Model == nil {
 		stmt.Model = stmt.Dest
@@ -136,11 +132,7 @@ func (p *processor) Execute(db *DB) *DB {
 
 	if stmt.SQL.Len() > 0 {
 		db.Logger.Trace(stmt.Context, curTime, func() (string, int64) {
-			sql, vars := stmt.SQL.String(), stmt.Vars
-			if filter, ok := db.Logger.(ParamsFilter); ok {
-				sql, vars = filter.ParamsFilter(stmt.Context, stmt.SQL.String(), stmt.Vars...)
-			}
-			return db.Dialector.Explain(sql, vars...), db.RowsAffected
+			return db.Dialector.Explain(stmt.SQL.String(), stmt.Vars...), db.RowsAffected
 		}, db.Error)
 	}
 

callbacks/associations.go

@@ -208,10 +208,7 @@ func SaveAfterAssociations(create bool) func(db *gorm.DB) {
 
 							cacheKey := utils.ToStringKey(relPrimaryValues...)
 							if len(relPrimaryValues) != len(rel.FieldSchema.PrimaryFields) || !identityMap[cacheKey] {
-								if cacheKey != "" { // has primary fields
-									identityMap[cacheKey] = true
-								}
-
+								identityMap[cacheKey] = true
 								if isPtr {
 									elems = reflect.Append(elems, elem)
 								} else {
@@ -297,10 +294,7 @@ func SaveAfterAssociations(create bool) func(db *gorm.DB) {
 
 							cacheKey := utils.ToStringKey(relPrimaryValues...)
 							if len(relPrimaryValues) != len(rel.FieldSchema.PrimaryFields) || !identityMap[cacheKey] {
-								if cacheKey != "" { // has primary fields
-									identityMap[cacheKey] = true
-								}
-
+								identityMap[cacheKey] = true
 								distinctElems = reflect.Append(distinctElems, elem)
 							}
 

callbacks/query.go

@@ -117,20 +117,12 @@ func BuildQuerySQL(db *gorm.DB) {
 				} else if relation, ok := db.Statement.Schema.Relationships.Relations[join.Name]; ok {
 					tableAliasName := relation.Name
 
-					columnStmt := gorm.Statement{
-						Table: tableAliasName, DB: db, Schema: relation.FieldSchema,
-						Selects: join.Selects, Omits: join.Omits,
-					}
-
-					selectColumns, restricted := columnStmt.SelectAndOmitColumns(false, false)
 					for _, s := range relation.FieldSchema.DBNames {
-						if v, ok := selectColumns[s]; (ok && v) || (!ok && !restricted) {
-							clauseSelect.Columns = append(clauseSelect.Columns, clause.Column{
-								Table: tableAliasName,
-								Name:  s,
-								Alias: tableAliasName + "__" + s,
-							})
-						}
+						clauseSelect.Columns = append(clauseSelect.Columns, clause.Column{
+							Table: tableAliasName,
+							Name:  s,
+							Alias: tableAliasName + "__" + s,
+						})
 					}
 
 					exprs := make([]clause.Expression, len(relation.References))
@@ -185,7 +177,7 @@ func BuildQuerySQL(db *gorm.DB) {
 					}
 
 					fromClause.Joins = append(fromClause.Joins, clause.Join{
-						Type:  join.JoinType,
+						Type:  clause.LeftJoin,
 						Table: clause.Table{Name: relation.FieldSchema.Table, Alias: tableAliasName},
 						ON:    clause.Where{Exprs: exprs},
 					})

callbacks/row.go

@@ -7,7 +7,7 @@ import (
 func RowQuery(db *gorm.DB) {
 	if db.Error == nil {
 		BuildQuerySQL(db)
-		if db.DryRun || db.Error != nil {
+		if db.DryRun {
 			return
 		}
 

chainable_api.go

@@ -10,11 +10,10 @@ import (
 )
 
 // Model specify the model you would like to run db operations
-//
-//	// update all users's name to `hello`
-//	db.Model(&User{}).Update("name", "hello")
-//	// if user's primary key is non-blank, will use it as condition, then will only update that user's name to `hello`
-//	db.Model(&user).Update("name", "hello")
+//    // update all users's name to `hello`
+//    db.Model(&User{}).Update("name", "hello")
+//    // if user's primary key is non-blank, will use it as condition, then will only update the user's name to `hello`
+//    db.Model(&user).Update("name", "hello")
 func (db *DB) Model(value interface{}) (tx *DB) {
 	tx = db.getInstance()
 	tx.Statement.Model = value
@@ -22,19 +21,6 @@ func (db *DB) Model(value interface{}) (tx *DB) {
 }
 
 // Clauses Add clauses
-//
-// This supports both standard clauses (clause.OrderBy, clause.Limit, clause.Where) and more
-// advanced techniques like specifying lock strength and optimizer hints. See the
-// [docs] for more depth.
-//
-//	// add a simple limit clause
-//	db.Clauses(clause.Limit{Limit: 1}).Find(&User{})
-//	// tell the optimizer to use the `idx_user_name` index
-//	db.Clauses(hints.UseIndex("idx_user_name")).Find(&User{})
-//	// specify the lock strength to UPDATE
-//	db.Clauses(clause.Locking{Strength: "UPDATE"}).Find(&users)
-//
-// [docs]: https://gorm.io/docs/sql_builder.html#Clauses
 func (db *DB) Clauses(conds ...clause.Expression) (tx *DB) {
 	tx = db.getInstance()
 	var whereConds []interface{}
@@ -55,22 +41,15 @@ func (db *DB) Clauses(conds ...clause.Expression) (tx *DB) {
 	return
 }
 
-var tableRegexp = regexp.MustCompile(`(?i)(?:.+? AS (\w+)\s*(?:$|,)|^\w+\s+(\w+)$)`)
+var tableRegexp = regexp.MustCompile(`(?i).+? AS (\w+)\s*(?:$|,)`)
 
 // Table specify the table you would like to run db operations
-//
-//	// Get a user
-//	db.Table("users").take(&result)
 func (db *DB) Table(name string, args ...interface{}) (tx *DB) {
 	tx = db.getInstance()
 	if strings.Contains(name, " ") || strings.Contains(name, "`") || len(args) > 0 {
 		tx.Statement.TableExpr = &clause.Expr{SQL: name, Vars: args}
-		if results := tableRegexp.FindStringSubmatch(name); len(results) == 3 {
-			if results[1] != "" {
-				tx.Statement.Table = results[1]
-			} else {
-				tx.Statement.Table = results[2]
-			}
+		if results := tableRegexp.FindStringSubmatch(name); len(results) == 2 {
+			tx.Statement.Table = results[1]
 		}
 	} else if tables := strings.Split(name, "."); len(tables) == 2 {
 		tx.Statement.TableExpr = &clause.Expr{SQL: tx.Statement.Quote(name)}
@@ -86,11 +65,6 @@ func (db *DB) Table(name string, args ...interface{}) (tx *DB) {
 }
 
 // Distinct specify distinct fields that you want querying
-//
-//	// Select distinct names of users
-//	db.Distinct("name").Find(&results)
-//	// Select distinct name/age pairs from users
-//	db.Distinct("name", "age").Find(&results)
 func (db *DB) Distinct(args ...interface{}) (tx *DB) {
 	tx = db.getInstance()
 	tx.Statement.Distinct = true
@@ -101,14 +75,6 @@ func (db *DB) Distinct(args ...interface{}) (tx *DB) {
 }
 
 // Select specify fields that you want when querying, creating, updating
-//
-// Use Select when you only want a subset of the fields. By default, GORM will select all fields.
-// Select accepts both string arguments and arrays.
-//
-//	// Select name and age of user using multiple arguments
-//	db.Select("name", "age").Find(&users)
-//	// Select name and age of user using an array
-//	db.Select([]string{"name", "age"}).Find(&users)
 func (db *DB) Select(query interface{}, args ...interface{}) (tx *DB) {
 	tx = db.getInstance()
 
@@ -186,17 +152,6 @@ func (db *DB) Omit(columns ...string) (tx *DB) {
 }
 
 // Where add conditions
-//
-// See the [docs] for details on the various formats that where clauses can take. By default, where clauses chain with AND.
-//
-//	// Find the first user with name jinzhu
-//	db.Where("name = ?", "jinzhu").First(&user)
-//	// Find the first user with name jinzhu and age 20
-//	db.Where(&User{Name: "jinzhu", Age: 20}).First(&user)
-//	// Find the first user with name jinzhu and age not equal to 20
-//	db.Where("name = ?", "jinzhu").Where("age <> ?", "20").First(&user)
-//
-// [docs]: https://gorm.io/docs/query.html#Conditions
 func (db *DB) Where(query interface{}, args ...interface{}) (tx *DB) {
 	tx = db.getInstance()
 	if conds := tx.Statement.BuildCondition(query, args...); len(conds) > 0 {
@@ -206,11 +161,6 @@ func (db *DB) Where(query interface{}, args ...interface{}) (tx *DB) {
 }
 
 // Not add NOT conditions
-//
-// Not works similarly to where, and has the same syntax.
-//
-//	// Find the first user with name not equal to jinzhu
-//	db.Not("name = ?", "jinzhu").First(&user)
 func (db *DB) Not(query interface{}, args ...interface{}) (tx *DB) {
 	tx = db.getInstance()
 	if conds := tx.Statement.BuildCondition(query, args...); len(conds) > 0 {
@@ -220,11 +170,6 @@ func (db *DB) Not(query interface{}, args ...interface{}) (tx *DB) {
 }
 
 // Or add OR conditions
-//
-// Or is used to chain together queries with an OR.
-//
-//	// Find the first user with name equal to jinzhu or john
-//	db.Where("name = ?", "jinzhu").Or("name = ?", "john").First(&user)
 func (db *DB) Or(query interface{}, args ...interface{}) (tx *DB) {
 	tx = db.getInstance()
 	if conds := tx.Statement.BuildCondition(query, args...); len(conds) > 0 {
@@ -234,42 +179,26 @@ func (db *DB) Or(query interface{}, args ...interface{}) (tx *DB) {
 }
 
 // Joins specify Joins conditions
-//
-//	db.Joins("Account").Find(&user)
-//	db.Joins("JOIN emails ON emails.user_id = users.id AND emails.email = ?", "jinzhu@example.org").Find(&user)
-//	db.Joins("Account", DB.Select("id").Where("user_id = users.id AND name = ?", "someName").Model(&Account{}))
+//     db.Joins("Account").Find(&user)
+//     db.Joins("JOIN emails ON emails.user_id = users.id AND emails.email = ?", "jinzhu@example.org").Find(&user)
+//     db.Joins("Account", DB.Select("id").Where("user_id = users.id AND name = ?", "someName").Model(&Account{}))
 func (db *DB) Joins(query string, args ...interface{}) (tx *DB) {
-	return joins(db, clause.LeftJoin, query, args...)
-}
-
-// InnerJoins specify inner joins conditions
-// db.InnerJoins("Account").Find(&user)
-func (db *DB) InnerJoins(query string, args ...interface{}) (tx *DB) {
-	return joins(db, clause.InnerJoin, query, args...)
-}
-
-func joins(db *DB, joinType clause.JoinType, query string, args ...interface{}) (tx *DB) {
 	tx = db.getInstance()
 
 	if len(args) == 1 {
 		if db, ok := args[0].(*DB); ok {
-			j := join{Name: query, Conds: args, Selects: db.Statement.Selects, Omits: db.Statement.Omits}
 			if where, ok := db.Statement.Clauses["WHERE"].Expression.(clause.Where); ok {
-				j.On = &where
+				tx.Statement.Joins = append(tx.Statement.Joins, join{Name: query, Conds: args, On: &where})
+				return
 			}
-			tx.Statement.Joins = append(tx.Statement.Joins, j)
-			return
 		}
 	}
 
-	tx.Statement.Joins = append(tx.Statement.Joins, join{Name: query, Conds: args, JoinType: joinType})
+	tx.Statement.Joins = append(tx.Statement.Joins, join{Name: query, Conds: args})
 	return
 }
 
 // Group specify the group method on the find
-//
-//	// Select the sum age of users with given names
-//	db.Model(&User{}).Select("name, sum(age) as total").Group("name").Find(&results)
 func (db *DB) Group(name string) (tx *DB) {
 	tx = db.getInstance()
 
@@ -281,9 +210,6 @@ func (db *DB) Group(name string) (tx *DB) {
 }
 
 // Having specify HAVING conditions for GROUP BY
-//
-//	// Select the sum age of users with name jinzhu
-//	db.Model(&User{}).Select("name, sum(age) as total").Group("name").Having("name = ?", "jinzhu").Find(&result)
 func (db *DB) Having(query interface{}, args ...interface{}) (tx *DB) {
 	tx = db.getInstance()
 	tx.Statement.AddClause(clause.GroupBy{
@@ -292,10 +218,9 @@ func (db *DB) Having(query interface{}, args ...interface{}) (tx *DB) {
 	return
 }
 
-// Order specify order when retrieving records from database
-//
-//	db.Order("name DESC")
-//	db.Order(clause.OrderByColumn{Column: clause.Column{Name: "name"}, Desc: true})
+// Order specify order when retrieve records from database
+//     db.Order("name DESC")
+//     db.Order(clause.OrderByColumn{Column: clause.Column{Name: "name"}, Desc: true})
 func (db *DB) Order(value interface{}) (tx *DB) {
 	tx = db.getInstance()
 
@@ -317,27 +242,13 @@ func (db *DB) Order(value interface{}) (tx *DB) {
 }
 
 // Limit specify the number of records to be retrieved
-//
-// Limit conditions can be cancelled by using `Limit(-1)`.
-//
-//	// retrieve 3 users
-//	db.Limit(3).Find(&users)
-//	// retrieve 3 users into users1, and all users into users2
-//	db.Limit(3).Find(&users1).Limit(-1).Find(&users2)
 func (db *DB) Limit(limit int) (tx *DB) {
 	tx = db.getInstance()
-	tx.Statement.AddClause(clause.Limit{Limit: &limit})
+	tx.Statement.AddClause(clause.Limit{Limit: limit})
 	return
 }
 
 // Offset specify the number of records to skip before starting to return the records
-//
-// Offset conditions can be cancelled by using `Offset(-1)`.
-//
-//	// select the third user
-//	db.Offset(2).First(&user)
-//	// select the first user by cancelling an earlier chained offset
-//	db.Offset(5).Offset(-1).First(&user)
 func (db *DB) Offset(offset int) (tx *DB) {
 	tx = db.getInstance()
 	tx.Statement.AddClause(clause.Limit{Offset: offset})
@@ -345,18 +256,17 @@ func (db *DB) Offset(offset int) (tx *DB) {
 }
 
 // Scopes pass current database connection to arguments `func(DB) DB`, which could be used to add conditions dynamically
+//     func AmountGreaterThan1000(db *gorm.DB) *gorm.DB {
+//         return db.Where("amount > ?", 1000)
+//     }
 //
-//	func AmountGreaterThan1000(db *gorm.DB) *gorm.DB {
-//	    return db.Where("amount > ?", 1000)
-//	}
+//     func OrderStatus(status []string) func (db *gorm.DB) *gorm.DB {
+//         return func (db *gorm.DB) *gorm.DB {
+//             return db.Scopes(AmountGreaterThan1000).Where("status in (?)", status)
+//         }
+//     }
 //
-//	func OrderStatus(status []string) func (db *gorm.DB) *gorm.DB {
-//	    return func (db *gorm.DB) *gorm.DB {
-//	        return db.Scopes(AmountGreaterThan1000).Where("status in (?)", status)
-//	    }
-//	}
-//
-//	db.Scopes(AmountGreaterThan1000, OrderStatus([]string{"paid", "shipped"})).Find(&orders)
+//     db.Scopes(AmountGreaterThan1000, OrderStatus([]string{"paid", "shipped"})).Find(&orders)
 func (db *DB) Scopes(funcs ...func(*DB) *DB) (tx *DB) {
 	tx = db.getInstance()
 	tx.Statement.scopes = append(tx.Statement.scopes, funcs...)
@@ -364,9 +274,7 @@ func (db *DB) Scopes(funcs ...func(*DB) *DB) (tx *DB) {
 }
 
 // Preload preload associations with given conditions
-//
-//	// get all users, and preload all non-cancelled orders
-//	db.Preload("Orders", "state NOT IN (?)", "cancelled").Find(&users)
+//    db.Preload("Orders", "state NOT IN (?)", "cancelled").Find(&users)
 func (db *DB) Preload(query string, args ...interface{}) (tx *DB) {
 	tx = db.getInstance()
 	if tx.Statement.Preloads == nil {
@@ -376,41 +284,12 @@ func (db *DB) Preload(query string, args ...interface{}) (tx *DB) {
 	return
 }
 
-// Attrs provide attributes used in [FirstOrCreate] or [FirstOrInit]
-//
-// Attrs only adds attributes if the record is not found.
-//
-//	// assign an email if the record is not found
-//	db.Where(User{Name: "non_existing"}).Attrs(User{Email: "fake@fake.org"}).FirstOrInit(&user)
-//	// user -> User{Name: "non_existing", Email: "fake@fake.org"}
-//
-//	// assign an email if the record is not found, otherwise ignore provided email
-//	db.Where(User{Name: "jinzhu"}).Attrs(User{Email: "fake@fake.org"}).FirstOrInit(&user)
-//	// user -> User{Name: "jinzhu", Age: 20}
-//
-// [FirstOrCreate]: https://gorm.io/docs/advanced_query.html#FirstOrCreate
-// [FirstOrInit]: https://gorm.io/docs/advanced_query.html#FirstOrInit
 func (db *DB) Attrs(attrs ...interface{}) (tx *DB) {
 	tx = db.getInstance()
 	tx.Statement.attrs = attrs
 	return
 }
 
-// Assign provide attributes used in [FirstOrCreate] or [FirstOrInit]
-//
-// Assign adds attributes even if the record is found. If using FirstOrCreate, this means that
-// records will be updated even if they are found.
-//
-//	// assign an email regardless of if the record is not found
-//	db.Where(User{Name: "non_existing"}).Assign(User{Email: "fake@fake.org"}).FirstOrInit(&user)
-//	// user -> User{Name: "non_existing", Email: "fake@fake.org"}
-//
-//	// assign email regardless of if record is found
-//	db.Where(User{Name: "jinzhu"}).Assign(User{Email: "fake@fake.org"}).FirstOrInit(&user)
-//	// user -> User{Name: "jinzhu", Age: 20, Email: "fake@fake.org"}
-//
-// [FirstOrCreate]: https://gorm.io/docs/advanced_query.html#FirstOrCreate
-// [FirstOrInit]: https://gorm.io/docs/advanced_query.html#FirstOrInit
 func (db *DB) Assign(attrs ...interface{}) (tx *DB) {
 	tx = db.getInstance()
 	tx.Statement.assigns = attrs

clause/benchmarks_test.go

@@ -29,7 +29,6 @@ func BenchmarkSelect(b *testing.B) {
 func BenchmarkComplexSelect(b *testing.B) {
 	user, _ := schema.Parse(&tests.User{}, &sync.Map{}, db.NamingStrategy)
 
-	limit10 := 10
 	for i := 0; i < b.N; i++ {
 		stmt := gorm.Statement{DB: db, Table: user.Table, Schema: user, Clauses: map[string]clause.Clause{}}
 		clauses := []clause.Interface{
@@ -44,7 +43,7 @@ func BenchmarkComplexSelect(b *testing.B) {
 				clause.Or(clause.Gt{Column: "score", Value: 100}, clause.Like{Column: "name", Value: "%linus%"}),
 			}},
 			clause.GroupBy{Columns: []clause.Column{{Name: "role"}}, Having: []clause.Expression{clause.Eq{"role", "admin"}}},
-			clause.Limit{Limit: &limit10, Offset: 20},
+			clause.Limit{Limit: 10, Offset: 20},
 			clause.OrderBy{Columns: []clause.OrderByColumn{{Column: clause.PrimaryColumn, Desc: true}}},
 		}
 

clause/clause.go

@@ -20,7 +20,6 @@ type Builder interface {
 	Writer
 	WriteQuoted(field interface{})
 	AddVar(Writer, ...interface{})
-	AddError(error) error
 }
 
 // Clause

clause/joins.go

@@ -9,7 +9,7 @@ const (
 	RightJoin JoinType = "RIGHT"
 )
 
-// Join clause for from
+// Join join clause for from
 type Join struct {
 	Type       JoinType
 	Table      Table

clause/joins_test.go

@@ -1,101 +0,0 @@
-package clause_test
-
-import (
-	"sync"
-	"testing"
-
-	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
-	"gorm.io/gorm/schema"
-	"gorm.io/gorm/utils/tests"
-)
-
-func TestJoin(t *testing.T) {
-	results := []struct {
-		name string
-		join clause.Join
-		sql  string
-	}{
-		{
-			name: "LEFT JOIN",
-			join: clause.Join{
-				Type:  clause.LeftJoin,
-				Table: clause.Table{Name: "user"},
-				ON: clause.Where{
-					Exprs: []clause.Expression{clause.Eq{clause.Column{Table: "user_info", Name: "user_id"}, clause.PrimaryColumn}},
-				},
-			},
-			sql: "LEFT JOIN `user` ON `user_info`.`user_id` = `users`.`id`",
-		},
-		{
-			name: "RIGHT JOIN",
-			join: clause.Join{
-				Type:  clause.RightJoin,
-				Table: clause.Table{Name: "user"},
-				ON: clause.Where{
-					Exprs: []clause.Expression{clause.Eq{clause.Column{Table: "user_info", Name: "user_id"}, clause.PrimaryColumn}},
-				},
-			},
-			sql: "RIGHT JOIN `user` ON `user_info`.`user_id` = `users`.`id`",
-		},
-		{
-			name: "INNER JOIN",
-			join: clause.Join{
-				Type:  clause.InnerJoin,
-				Table: clause.Table{Name: "user"},
-				ON: clause.Where{
-					Exprs: []clause.Expression{clause.Eq{clause.Column{Table: "user_info", Name: "user_id"}, clause.PrimaryColumn}},
-				},
-			},
-			sql: "INNER JOIN `user` ON `user_info`.`user_id` = `users`.`id`",
-		},
-		{
-			name: "CROSS JOIN",
-			join: clause.Join{
-				Type:  clause.CrossJoin,
-				Table: clause.Table{Name: "user"},
-				ON: clause.Where{
-					Exprs: []clause.Expression{clause.Eq{clause.Column{Table: "user_info", Name: "user_id"}, clause.PrimaryColumn}},
-				},
-			},
-			sql: "CROSS JOIN `user` ON `user_info`.`user_id` = `users`.`id`",
-		},
-		{
-			name: "USING",
-			join: clause.Join{
-				Type:  clause.InnerJoin,
-				Table: clause.Table{Name: "user"},
-				Using: []string{"id"},
-			},
-			sql: "INNER JOIN `user` USING (`id`)",
-		},
-		{
-			name: "Expression",
-			join: clause.Join{
-				// Invalid
-				Type:  clause.LeftJoin,
-				Table: clause.Table{Name: "user"},
-				ON: clause.Where{
-					Exprs: []clause.Expression{clause.Eq{clause.Column{Table: "user_info", Name: "user_id"}, clause.PrimaryColumn}},
-				},
-				// Valid
-				Expression: clause.Join{
-					Type:  clause.InnerJoin,
-					Table: clause.Table{Name: "user"},
-					Using: []string{"id"},
-				},
-			},
-			sql: "INNER JOIN `user` USING (`id`)",
-		},
-	}
-	for _, result := range results {
-		t.Run(result.name, func(t *testing.T) {
-			user, _ := schema.Parse(&tests.User{}, &sync.Map{}, db.NamingStrategy)
-			stmt := &gorm.Statement{DB: db, Table: user.Table, Schema: user, Clauses: map[string]clause.Clause{}}
-			result.join.Build(stmt)
-			if result.sql != stmt.SQL.String() {
-				t.Errorf("want: %s, got: %s", result.sql, stmt.SQL.String())
-			}
-		})
-	}
-}

clause/limit.go

@@ -4,7 +4,7 @@ import "strconv"
 
 // Limit limit clause
 type Limit struct {
-	Limit  *int
+	Limit  int
 	Offset int
 }
 
@@ -15,12 +15,12 @@ func (limit Limit) Name() string {
 
 // Build build where clause
 func (limit Limit) Build(builder Builder) {
-	if limit.Limit != nil && *limit.Limit >= 0 {
+	if limit.Limit > 0 {
 		builder.WriteString("LIMIT ")
-		builder.WriteString(strconv.Itoa(*limit.Limit))
+		builder.WriteString(strconv.Itoa(limit.Limit))
 	}
 	if limit.Offset > 0 {
-		if limit.Limit != nil && *limit.Limit >= 0 {
+		if limit.Limit > 0 {
 			builder.WriteByte(' ')
 		}
 		builder.WriteString("OFFSET ")
@@ -33,7 +33,7 @@ func (limit Limit) MergeClause(clause *Clause) {
 	clause.Name = ""
 
 	if v, ok := clause.Expression.(Limit); ok {
-		if (limit.Limit == nil || *limit.Limit == 0) && (v.Limit != nil && *v.Limit != 0) {
+		if limit.Limit == 0 && v.Limit != 0 {
 			limit.Limit = v.Limit
 		}
 

clause/limit_test.go

@@ -8,10 +8,6 @@ import (
 )
 
 func TestLimit(t *testing.T) {
-	limit0 := 0
-	limit10 := 10
-	limit50 := 50
-	limitNeg10 := -10
 	results := []struct {
 		Clauses []clause.Interface
 		Result  string
@@ -19,15 +15,11 @@ func TestLimit(t *testing.T) {
 	}{
 		{
 			[]clause.Interface{clause.Select{}, clause.From{}, clause.Limit{
-				Limit:  &limit10,
+				Limit:  10,
 				Offset: 20,
 			}},
 			"SELECT * FROM `users` LIMIT 10 OFFSET 20", nil,
 		},
-		{
-			[]clause.Interface{clause.Select{}, clause.From{}, clause.Limit{Limit: &limit0}},
-			"SELECT * FROM `users` LIMIT 0", nil,
-		},
 		{
 			[]clause.Interface{clause.Select{}, clause.From{}, clause.Limit{Offset: 20}},
 			"SELECT * FROM `users` OFFSET 20", nil,
@@ -37,23 +29,23 @@ func TestLimit(t *testing.T) {
 			"SELECT * FROM `users` OFFSET 30", nil,
 		},
 		{
-			[]clause.Interface{clause.Select{}, clause.From{}, clause.Limit{Offset: 20}, clause.Limit{Limit: &limit10}},
+			[]clause.Interface{clause.Select{}, clause.From{}, clause.Limit{Offset: 20}, clause.Limit{Limit: 10}},
 			"SELECT * FROM `users` LIMIT 10 OFFSET 20", nil,
 		},
 		{
-			[]clause.Interface{clause.Select{}, clause.From{}, clause.Limit{Limit: &limit10, Offset: 20}, clause.Limit{Offset: 30}},
+			[]clause.Interface{clause.Select{}, clause.From{}, clause.Limit{Limit: 10, Offset: 20}, clause.Limit{Offset: 30}},
 			"SELECT * FROM `users` LIMIT 10 OFFSET 30", nil,
 		},
 		{
-			[]clause.Interface{clause.Select{}, clause.From{}, clause.Limit{Limit: &limit10, Offset: 20}, clause.Limit{Offset: 30}, clause.Limit{Offset: -10}},
+			[]clause.Interface{clause.Select{}, clause.From{}, clause.Limit{Limit: 10, Offset: 20}, clause.Limit{Offset: 30}, clause.Limit{Offset: -10}},
 			"SELECT * FROM `users` LIMIT 10", nil,
 		},
 		{
-			[]clause.Interface{clause.Select{}, clause.From{}, clause.Limit{Limit: &limit10, Offset: 20}, clause.Limit{Offset: 30}, clause.Limit{Limit: &limitNeg10}},
+			[]clause.Interface{clause.Select{}, clause.From{}, clause.Limit{Limit: 10, Offset: 20}, clause.Limit{Offset: 30}, clause.Limit{Limit: -10}},
 			"SELECT * FROM `users` OFFSET 30", nil,
 		},
 		{
-			[]clause.Interface{clause.Select{}, clause.From{}, clause.Limit{Limit: &limit10, Offset: 20}, clause.Limit{Offset: 30}, clause.Limit{Limit: &limit50}},
+			[]clause.Interface{clause.Select{}, clause.From{}, clause.Limit{Limit: 10, Offset: 20}, clause.Limit{Offset: 30}, clause.Limit{Limit: 50}},
 			"SELECT * FROM `users` LIMIT 50 OFFSET 30", nil,
 		},
 	}

clause/on_conflict.go

@@ -16,27 +16,27 @@ func (OnConflict) Name() string {
 
 // Build build onConflict clause
 func (onConflict OnConflict) Build(builder Builder) {
+	if len(onConflict.Columns) > 0 {
+		builder.WriteByte('(')
+		for idx, column := range onConflict.Columns {
+			if idx > 0 {
+				builder.WriteByte(',')
+			}
+			builder.WriteQuoted(column)
+		}
+		builder.WriteString(`) `)
+	}
+
+	if len(onConflict.TargetWhere.Exprs) > 0 {
+		builder.WriteString(" WHERE ")
+		onConflict.TargetWhere.Build(builder)
+		builder.WriteByte(' ')
+	}
+
 	if onConflict.OnConstraint != "" {
 		builder.WriteString("ON CONSTRAINT ")
 		builder.WriteString(onConflict.OnConstraint)
 		builder.WriteByte(' ')
-	} else {
-		if len(onConflict.Columns) > 0 {
-			builder.WriteByte('(')
-			for idx, column := range onConflict.Columns {
-				if idx > 0 {
-					builder.WriteByte(',')
-				}
-				builder.WriteQuoted(column)
-			}
-			builder.WriteString(`) `)
-		}
-
-		if len(onConflict.TargetWhere.Exprs) > 0 {
-			builder.WriteString(" WHERE ")
-			onConflict.TargetWhere.Build(builder)
-			builder.WriteByte(' ')
-		}
 	}
 
 	if onConflict.DoNothing {

errors.go

@@ -21,8 +21,6 @@ var (
 	ErrPrimaryKeyRequired = errors.New("primary key required")
 	// ErrModelValueRequired model value required
 	ErrModelValueRequired = errors.New("model value required")
-	// ErrModelAccessibleFieldsRequired model accessible fields required
-	ErrModelAccessibleFieldsRequired = errors.New("model accessible fields required")
 	// ErrInvalidData unsupported data
 	ErrInvalidData = errors.New("unsupported data")
 	// ErrUnsupportedDriver unsupported driver

finisher_api.go

@@ -185,9 +185,7 @@ func (db *DB) FindInBatches(dest interface{}, batchSize int, fc func(tx *DB, bat
 	var totalSize int
 	if c, ok := tx.Statement.Clauses["LIMIT"]; ok {
 		if limit, ok := c.Expression.(clause.Limit); ok {
-			if limit.Limit != nil {
-				totalSize = *limit.Limit
-			}
+			totalSize = limit.Limit
 
 			if totalSize > 0 && batchSize > totalSize {
 				batchSize = totalSize
@@ -231,11 +229,7 @@ func (db *DB) FindInBatches(dest interface{}, batchSize int, fc func(tx *DB, bat
 			break
 		}
 
-		primaryValue, zero := result.Statement.Schema.PrioritizedPrimaryField.ValueOf(tx.Statement.Context, resultsValue.Index(resultsValue.Len()-1))
-		if zero {
-			tx.AddError(ErrPrimaryKeyRequired)
-			break
-		}
+		primaryValue, _ := result.Statement.Schema.PrioritizedPrimaryField.ValueOf(tx.Statement.Context, resultsValue.Index(resultsValue.Len()-1))
 		queryDB = tx.Clauses(clause.Gt{Column: clause.Column{Table: clause.CurrentTable, Name: clause.PrimaryKey}, Value: primaryValue})
 	}
 
@@ -294,16 +288,6 @@ func (db *DB) assignInterfacesToValue(values ...interface{}) {
 
 // FirstOrInit finds the first matching record, otherwise if not found initializes a new instance with given conds.
 // Each conds must be a struct or map.
-//
-// FirstOrInit never modifies the database. It is often used with Assign and Attrs.
-//
-//	// assign an email if the record is not found
-//	db.Where(User{Name: "non_existing"}).Attrs(User{Email: "fake@fake.org"}).FirstOrInit(&user)
-//	// user -> User{Name: "non_existing", Email: "fake@fake.org"}
-//
-//	// assign email regardless of if record is found
-//	db.Where(User{Name: "jinzhu"}).Assign(User{Email: "fake@fake.org"}).FirstOrInit(&user)
-//	// user -> User{Name: "jinzhu", Age: 20, Email: "fake@fake.org"}
 func (db *DB) FirstOrInit(dest interface{}, conds ...interface{}) (tx *DB) {
 	queryTx := db.Limit(1).Order(clause.OrderByColumn{
 		Column: clause.Column{Table: clause.CurrentTable, Name: clause.PrimaryKey},
@@ -331,65 +315,50 @@ func (db *DB) FirstOrInit(dest interface{}, conds ...interface{}) (tx *DB) {
 
 // FirstOrCreate finds the first matching record, otherwise if not found creates a new instance with given conds.
 // Each conds must be a struct or map.
-//
-// Using FirstOrCreate in conjunction with Assign will result in an update to the database even if the record exists.
-//
-//	// assign an email if the record is not found
-//	result := db.Where(User{Name: "non_existing"}).Attrs(User{Email: "fake@fake.org"}).FirstOrCreate(&user)
-//	// user -> User{Name: "non_existing", Email: "fake@fake.org"}
-//	// result.RowsAffected -> 1
-//
-//	// assign email regardless of if record is found
-//	result := db.Where(User{Name: "jinzhu"}).Assign(User{Email: "fake@fake.org"}).FirstOrCreate(&user)
-//	// user -> User{Name: "jinzhu", Age: 20, Email: "fake@fake.org"}
-//	// result.RowsAffected -> 1
 func (db *DB) FirstOrCreate(dest interface{}, conds ...interface{}) (tx *DB) {
 	tx = db.getInstance()
 	queryTx := db.Session(&Session{}).Limit(1).Order(clause.OrderByColumn{
 		Column: clause.Column{Table: clause.CurrentTable, Name: clause.PrimaryKey},
 	})
-
-	result := queryTx.Find(dest, conds...)
-	if result.Error != nil {
-		tx.Error = result.Error
-		return tx
-	}
-
-	if result.RowsAffected == 0 {
-		if c, ok := result.Statement.Clauses["WHERE"]; ok {
-			if where, ok := c.Expression.(clause.Where); ok {
-				result.assignInterfacesToValue(where.Exprs)
-			}
-		}
-
-		// initialize with attrs, conds
-		if len(db.Statement.attrs) > 0 {
-			result.assignInterfacesToValue(db.Statement.attrs...)
-		}
-
-		// initialize with attrs, conds
-		if len(db.Statement.assigns) > 0 {
-			result.assignInterfacesToValue(db.Statement.assigns...)
-		}
-
-		return tx.Create(dest)
-	} else if len(db.Statement.assigns) > 0 {
-		exprs := tx.Statement.BuildCondition(db.Statement.assigns[0], db.Statement.assigns[1:]...)
-		assigns := map[string]interface{}{}
-		for _, expr := range exprs {
-			if eq, ok := expr.(clause.Eq); ok {
-				switch column := eq.Column.(type) {
-				case string:
-					assigns[column] = eq.Value
-				case clause.Column:
-					assigns[column.Name] = eq.Value
+	if result := queryTx.Find(dest, conds...); result.Error == nil {
+		if result.RowsAffected == 0 {
+			if c, ok := result.Statement.Clauses["WHERE"]; ok {
+				if where, ok := c.Expression.(clause.Where); ok {
+					result.assignInterfacesToValue(where.Exprs)
 				}
 			}
+
+			// initialize with attrs, conds
+			if len(db.Statement.attrs) > 0 {
+				result.assignInterfacesToValue(db.Statement.attrs...)
+			}
+
+			// initialize with attrs, conds
+			if len(db.Statement.assigns) > 0 {
+				result.assignInterfacesToValue(db.Statement.assigns...)
+			}
+
+			return tx.Create(dest)
+		} else if len(db.Statement.assigns) > 0 {
+			exprs := tx.Statement.BuildCondition(db.Statement.assigns[0], db.Statement.assigns[1:]...)
+			assigns := map[string]interface{}{}
+			for _, expr := range exprs {
+				if eq, ok := expr.(clause.Eq); ok {
+					switch column := eq.Column.(type) {
+					case string:
+						assigns[column] = eq.Value
+					case clause.Column:
+						assigns[column.Name] = eq.Value
+					default:
+					}
+				}
+			}
+
+			return tx.Model(dest).Updates(assigns)
 		}
-
-		return tx.Model(dest).Updates(assigns)
+	} else {
+		tx.Error = result.Error
 	}
-
 	return tx
 }
 
@@ -490,7 +459,7 @@ func (db *DB) Count(count *int64) (tx *DB) {
 	tx.Statement.Dest = count
 	tx = tx.callbacks.Query().Execute(tx)
 
-	if tx.RowsAffected != 1 {
+	if _, ok := db.Statement.Clauses["GROUP BY"]; ok || tx.RowsAffected != 1 {
 		*count = tx.RowsAffected
 	}
 
@@ -543,9 +512,8 @@ func (db *DB) Scan(dest interface{}) (tx *DB) {
 }
 
 // Pluck queries a single column from a model, returning in the slice dest. E.g.:
-//
-//	var ages []int64
-//	db.Model(&users).Pluck("age", &ages)
+//     var ages []int64
+//     db.Model(&users).Pluck("age", &ages)
 func (db *DB) Pluck(column string, dest interface{}) (tx *DB) {
 	tx = db.getInstance()
 	if tx.Statement.Model != nil {

gorm.go

@@ -37,8 +37,6 @@ type Config struct {
 	DisableAutomaticPing bool
 	// DisableForeignKeyConstraintWhenMigrating
 	DisableForeignKeyConstraintWhenMigrating bool
-	// IgnoreRelationshipsWhenMigrating
-	IgnoreRelationshipsWhenMigrating bool
 	// DisableNestedTransaction disable nested transaction
 	DisableNestedTransaction bool
 	// AllowGlobalUpdate allow global update
@@ -181,7 +179,7 @@ func Open(dialector Dialector, opts ...Option) (db *DB, err error) {
 
 	preparedStmt := &PreparedStmtDB{
 		ConnPool:    db.ConnPool,
-		Stmts:       make(map[string]*Stmt),
+		Stmts:       map[string]Stmt{},
 		Mux:         &sync.RWMutex{},
 		PreparedSQL: make([]string, 0, 100),
 	}
@@ -250,18 +248,10 @@ func (db *DB) Session(config *Session) *DB {
 	if config.PrepareStmt {
 		if v, ok := db.cacheStore.Load(preparedStmtDBKey); ok {
 			preparedStmt := v.(*PreparedStmtDB)
-			switch t := tx.Statement.ConnPool.(type) {
-			case Tx:
-				tx.Statement.ConnPool = &PreparedStmtTX{
-					Tx:             t,
-					PreparedStmtDB: preparedStmt,
-				}
-			default:
-				tx.Statement.ConnPool = &PreparedStmtDB{
-					ConnPool: db.Config.ConnPool,
-					Mux:      preparedStmt.Mux,
-					Stmts:    preparedStmt.Stmts,
-				}
+			tx.Statement.ConnPool = &PreparedStmtDB{
+				ConnPool: db.Config.ConnPool,
+				Mux:      preparedStmt.Mux,
+				Stmts:    preparedStmt.Stmts,
 			}
 			txConfig.ConnPool = tx.Statement.ConnPool
 			txConfig.PrepareStmt = true
@@ -466,12 +456,12 @@ func (db *DB) Use(plugin Plugin) error {
 
 // ToSQL for generate SQL string.
 //
-//	db.ToSQL(func(tx *gorm.DB) *gorm.DB {
-//			return tx.Model(&User{}).Where(&User{Name: "foo", Age: 20})
-//				.Limit(10).Offset(5)
-//				.Order("name ASC")
-//				.First(&User{})
-//	})
+// db.ToSQL(func(tx *gorm.DB) *gorm.DB {
+// 		return tx.Model(&User{}).Where(&User{Name: "foo", Age: 20})
+// 			.Limit(10).Offset(5)
+//			.Order("name ASC")
+//			.First(&User{})
+// })
 func (db *DB) ToSQL(queryFn func(tx *DB) *DB) string {
 	tx := queryFn(db.Session(&Session{DryRun: true, SkipDefaultTransaction: true}))
 	stmt := tx.Statement

interfaces.go

@@ -26,10 +26,6 @@ type Plugin interface {
 	Initialize(*DB) error
 }
 
-type ParamsFilter interface {
-	ParamsFilter(ctx context.Context, sql string, params ...interface{}) (string, []interface{})
-}
-
 // ConnPool db conns pool interface
 type ConnPool interface {
 	PrepareContext(ctx context.Context, query string) (*sql.Stmt, error)

logger/logger.go

@@ -55,7 +55,6 @@ type Config struct {
 	SlowThreshold             time.Duration
 	Colorful                  bool
 	IgnoreRecordNotFoundError bool
-	ParameterizedQueries      bool
 	LogLevel                  LogLevel
 }
 
@@ -182,14 +181,6 @@ func (l logger) Trace(ctx context.Context, begin time.Time, fc func() (string, i
 	}
 }
 
-// Trace print sql message
-func (l logger) ParamsFilter(ctx context.Context, sql string, params ...interface{}) (string, []interface{}) {
-	if l.Config.ParameterizedQueries {
-		return sql, nil
-	}
-	return sql, params
-}
-
 type traceRecorder struct {
 	Interface
 	BeginAt      time.Time

migrator.go

@@ -68,7 +68,6 @@ type Migrator interface {
 	// Database
 	CurrentDatabase() string
 	FullDataTypeOf(*schema.Field) clause.Expr
-	GetTypeAliases(databaseTypeName string) []string
 
 	// Tables
 	CreateTable(dst ...interface{}) error

migrator/migrator.go

@@ -8,11 +8,9 @@ import (
 	"reflect"
 	"regexp"
 	"strings"
-	"time"
 
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
-	"gorm.io/gorm/logger"
 	"gorm.io/gorm/schema"
 )
 
@@ -32,16 +30,6 @@ type Config struct {
 	gorm.Dialector
 }
 
-type printSQLLogger struct {
-	logger.Interface
-}
-
-func (l *printSQLLogger) Trace(ctx context.Context, begin time.Time, fc func() (sql string, rowsAffected int64), err error) {
-	sql, _ := fc()
-	fmt.Println(sql + ";")
-	l.Interface.Trace(ctx, begin, fc, err)
-}
-
 // GormDataTypeInterface gorm data type interface
 type GormDataTypeInterface interface {
 	GormDBDataType(*gorm.DB, *schema.Field) string
@@ -104,26 +92,18 @@ func (m Migrator) FullDataTypeOf(field *schema.Field) (expr clause.Expr) {
 // AutoMigrate auto migrate values
 func (m Migrator) AutoMigrate(values ...interface{}) error {
 	for _, value := range m.ReorderModels(values, true) {
-		queryTx := m.DB.Session(&gorm.Session{})
-		execTx := queryTx
-		if m.DB.DryRun {
-			queryTx.DryRun = false
-			execTx = m.DB.Session(&gorm.Session{Logger: &printSQLLogger{Interface: m.DB.Logger}})
-		}
-		if !queryTx.Migrator().HasTable(value) {
-			if err := execTx.Migrator().CreateTable(value); err != nil {
+		tx := m.DB.Session(&gorm.Session{})
+		if !tx.Migrator().HasTable(value) {
+			if err := tx.Migrator().CreateTable(value); err != nil {
 				return err
 			}
 		} else {
 			if err := m.RunWithValue(value, func(stmt *gorm.Statement) (errr error) {
-				columnTypes, err := queryTx.Migrator().ColumnTypes(value)
+				columnTypes, err := m.DB.Migrator().ColumnTypes(value)
 				if err != nil {
 					return err
 				}
-				var (
-					parseIndexes          = stmt.Schema.ParseIndexes()
-					parseCheckConstraints = stmt.Schema.ParseCheckConstraints()
-				)
+
 				for _, dbName := range stmt.Schema.DBNames {
 					field := stmt.Schema.FieldsByDBName[dbName]
 					var foundColumn gorm.ColumnType
@@ -137,40 +117,37 @@ func (m Migrator) AutoMigrate(values ...interface{}) error {
 
 					if foundColumn == nil {
 						// not found, add column
-						if err := execTx.Migrator().AddColumn(value, dbName); err != nil {
+						if err := tx.Migrator().AddColumn(value, dbName); err != nil {
 							return err
 						}
-					} else if err := execTx.Migrator().MigrateColumn(value, field, foundColumn); err != nil {
+					} else if err := m.DB.Migrator().MigrateColumn(value, field, foundColumn); err != nil {
 						// found, smart migrate
 						return err
 					}
 				}
 
-				if !m.DB.DisableForeignKeyConstraintWhenMigrating && !m.DB.IgnoreRelationshipsWhenMigrating {
-					for _, rel := range stmt.Schema.Relationships.Relations {
-						if rel.Field.IgnoreMigration {
-							continue
-						}
+				for _, rel := range stmt.Schema.Relationships.Relations {
+					if !m.DB.Config.DisableForeignKeyConstraintWhenMigrating {
 						if constraint := rel.ParseConstraint(); constraint != nil &&
-							constraint.Schema == stmt.Schema && !queryTx.Migrator().HasConstraint(value, constraint.Name) {
-							if err := execTx.Migrator().CreateConstraint(value, constraint.Name); err != nil {
+							constraint.Schema == stmt.Schema && !tx.Migrator().HasConstraint(value, constraint.Name) {
+							if err := tx.Migrator().CreateConstraint(value, constraint.Name); err != nil {
 								return err
 							}
 						}
 					}
 				}
 
-				for _, chk := range parseCheckConstraints {
-					if !queryTx.Migrator().HasConstraint(value, chk.Name) {
-						if err := execTx.Migrator().CreateConstraint(value, chk.Name); err != nil {
+				for _, chk := range stmt.Schema.ParseCheckConstraints() {
+					if !tx.Migrator().HasConstraint(value, chk.Name) {
+						if err := tx.Migrator().CreateConstraint(value, chk.Name); err != nil {
 							return err
 						}
 					}
 				}
 
-				for _, idx := range parseIndexes {
-					if !queryTx.Migrator().HasIndex(value, idx.Name) {
-						if err := execTx.Migrator().CreateIndex(value, idx.Name); err != nil {
+				for _, idx := range stmt.Schema.ParseIndexes() {
+					if !tx.Migrator().HasIndex(value, idx.Name) {
+						if err := tx.Migrator().CreateIndex(value, idx.Name); err != nil {
 							return err
 						}
 					}
@@ -250,11 +227,8 @@ func (m Migrator) CreateTable(values ...interface{}) error {
 				}
 			}
 
-			if !m.DB.DisableForeignKeyConstraintWhenMigrating && !m.DB.IgnoreRelationshipsWhenMigrating {
-				for _, rel := range stmt.Schema.Relationships.Relations {
-					if rel.Field.IgnoreMigration {
-						continue
-					}
+			for _, rel := range stmt.Schema.Relationships.Relations {
+				if !m.DB.DisableForeignKeyConstraintWhenMigrating {
 					if constraint := rel.ParseConstraint(); constraint != nil {
 						if constraint.Schema == stmt.Schema {
 							sql, vars := buildConstraint(constraint)
@@ -432,50 +406,32 @@ func (m Migrator) MigrateColumn(value interface{}, field *schema.Field, columnTy
 	fullDataType := strings.TrimSpace(strings.ToLower(m.DB.Migrator().FullDataTypeOf(field).SQL))
 	realDataType := strings.ToLower(columnType.DatabaseTypeName())
 
-	var (
-		alterColumn bool
-		isSameType  = fullDataType == realDataType
-	)
+	alterColumn := false
 
-	if !field.PrimaryKey {
-		// check type
-		if !strings.HasPrefix(fullDataType, realDataType) {
-			// check type aliases
-			aliases := m.DB.Migrator().GetTypeAliases(realDataType)
-			for _, alias := range aliases {
-				if strings.HasPrefix(fullDataType, alias) {
-					isSameType = true
-					break
-				}
-			}
+	// check type
+	if !field.PrimaryKey && !strings.HasPrefix(fullDataType, realDataType) {
+		alterColumn = true
+	}
 
-			if !isSameType {
+	// check size
+	if length, ok := columnType.Length(); length != int64(field.Size) {
+		if length > 0 && field.Size > 0 {
+			alterColumn = true
+		} else {
+			// has size in data type and not equal
+			// Since the following code is frequently called in the for loop, reg optimization is needed here
+			matches2 := regFullDataType.FindAllStringSubmatch(fullDataType, -1)
+			if !field.PrimaryKey &&
+				(len(matches2) == 1 && matches2[0][1] != fmt.Sprint(length) && ok) {
 				alterColumn = true
 			}
 		}
 	}
 
-	if !isSameType {
-		// check size
-		if length, ok := columnType.Length(); length != int64(field.Size) {
-			if length > 0 && field.Size > 0 {
-				alterColumn = true
-			} else {
-				// has size in data type and not equal
-				// Since the following code is frequently called in the for loop, reg optimization is needed here
-				matches2 := regFullDataType.FindAllStringSubmatch(fullDataType, -1)
-				if !field.PrimaryKey &&
-					(len(matches2) == 1 && matches2[0][1] != fmt.Sprint(length) && ok) {
-					alterColumn = true
-				}
-			}
-		}
-
-		// check precision
-		if precision, _, ok := columnType.DecimalSize(); ok && int64(field.Precision) != precision {
-			if regexp.MustCompile(fmt.Sprintf("[^0-9]%d[^0-9]", field.Precision)).MatchString(m.DataTypeOf(field)) {
-				alterColumn = true
-			}
+	// check precision
+	if precision, _, ok := columnType.DecimalSize(); ok && int64(field.Precision) != precision {
+		if regexp.MustCompile(fmt.Sprintf("[^0-9]%d[^0-9]", field.Precision)).MatchString(m.DataTypeOf(field)) {
+			alterColumn = true
 		}
 	}
 
@@ -497,19 +453,17 @@ func (m Migrator) MigrateColumn(value interface{}, field *schema.Field, columnTy
 
 	// check default value
 	if !field.PrimaryKey {
-		currentDefaultNotNull := field.HasDefaultValue && (field.DefaultValueInterface != nil || !strings.EqualFold(field.DefaultValue, "NULL"))
 		dv, dvNotNull := columnType.DefaultValue()
-		if dvNotNull && !currentDefaultNotNull {
+		if dvNotNull && field.DefaultValueInterface == nil {
 			// defalut value -> null
 			alterColumn = true
-		} else if !dvNotNull && currentDefaultNotNull {
+		} else if !dvNotNull && field.DefaultValueInterface != nil {
 			// null -> default value
 			alterColumn = true
-		} else if (field.GORMDataType != schema.Time && dv != field.DefaultValue) ||
-			(field.GORMDataType == schema.Time && !strings.EqualFold(strings.TrimSuffix(dv, "()"), strings.TrimSuffix(field.DefaultValue, "()"))) {
+		} else if dv != field.DefaultValue {
 			// default value not equal
 			// not both null
-			if currentDefaultNotNull || dvNotNull {
+			if !(field.DefaultValueInterface == nil && !dvNotNull) {
 				alterColumn = true
 			}
 		}
@@ -524,7 +478,7 @@ func (m Migrator) MigrateColumn(value interface{}, field *schema.Field, columnTy
 	}
 
 	if alterColumn && !field.IgnoreMigration {
-		return m.DB.Migrator().AlterColumn(value, field.DBName)
+		return m.DB.Migrator().AlterColumn(value, field.Name)
 	}
 
 	return nil
@@ -828,31 +782,26 @@ func (m Migrator) ReorderModels(values []interface{}, autoAdd bool) (results []i
 		}
 		parsedSchemas[dep.Statement.Schema] = true
 
-		if !m.DB.IgnoreRelationshipsWhenMigrating {
-			for _, rel := range dep.Schema.Relationships.Relations {
-				if rel.Field.IgnoreMigration {
-					continue
-				}
-				if c := rel.ParseConstraint(); c != nil && c.Schema == dep.Statement.Schema && c.Schema != c.ReferenceSchema {
-					dep.Depends = append(dep.Depends, c.ReferenceSchema)
-				}
+		for _, rel := range dep.Schema.Relationships.Relations {
+			if c := rel.ParseConstraint(); c != nil && c.Schema == dep.Statement.Schema && c.Schema != c.ReferenceSchema {
+				dep.Depends = append(dep.Depends, c.ReferenceSchema)
+			}
 
-				if rel.Type == schema.HasOne || rel.Type == schema.HasMany {
-					beDependedOn[rel.FieldSchema] = true
-				}
+			if rel.Type == schema.HasOne || rel.Type == schema.HasMany {
+				beDependedOn[rel.FieldSchema] = true
+			}
 
-				if rel.JoinTable != nil {
-					// append join value
-					defer func(rel *schema.Relationship, joinValue interface{}) {
-						if !beDependedOn[rel.FieldSchema] {
-							dep.Depends = append(dep.Depends, rel.FieldSchema)
-						} else {
-							fieldValue := reflect.New(rel.FieldSchema.ModelType).Interface()
-							parseDependence(fieldValue, autoAdd)
-						}
-						parseDependence(joinValue, autoAdd)
-					}(rel, reflect.New(rel.JoinTable.ModelType).Interface())
-				}
+			if rel.JoinTable != nil {
+				// append join value
+				defer func(rel *schema.Relationship, joinValue interface{}) {
+					if !beDependedOn[rel.FieldSchema] {
+						dep.Depends = append(dep.Depends, rel.FieldSchema)
+					} else {
+						fieldValue := reflect.New(rel.FieldSchema.ModelType).Interface()
+						parseDependence(fieldValue, autoAdd)
+					}
+					parseDependence(joinValue, autoAdd)
+				}(rel, reflect.New(rel.JoinTable.ModelType).Interface())
 			}
 		}
 
@@ -914,8 +863,3 @@ func (m Migrator) CurrentTable(stmt *gorm.Statement) interface{} {
 func (m Migrator) GetIndexes(dst interface{}) ([]gorm.Index, error) {
 	return nil, errors.New("not support")
 }
-
-// GetTypeAliases return database type aliases
-func (m Migrator) GetTypeAliases(databaseTypeName string) []string {
-	return nil
-}

prepare_stmt.go

@@ -9,12 +9,10 @@ import (
 type Stmt struct {
 	*sql.Stmt
 	Transaction bool
-	prepared    chan struct{}
-	prepareErr  error
 }
 
 type PreparedStmtDB struct {
-	Stmts       map[string]*Stmt
+	Stmts       map[string]Stmt
 	PreparedSQL []string
 	Mux         *sync.RWMutex
 	ConnPool
@@ -44,72 +42,31 @@ func (db *PreparedStmtDB) Close() {
 	}
 }
 
-func (db *PreparedStmtDB) Reset() {
-	db.Mux.Lock()
-	defer db.Mux.Unlock()
-
-	for _, stmt := range db.Stmts {
-		go stmt.Close()
-	}
-	db.PreparedSQL = make([]string, 0, 100)
-	db.Stmts = make(map[string]*Stmt)
-}
-
 func (db *PreparedStmtDB) prepare(ctx context.Context, conn ConnPool, isTransaction bool, query string) (Stmt, error) {
 	db.Mux.RLock()
 	if stmt, ok := db.Stmts[query]; ok && (!stmt.Transaction || isTransaction) {
 		db.Mux.RUnlock()
-		// wait for other goroutines prepared
-		<-stmt.prepared
-		if stmt.prepareErr != nil {
-			return Stmt{}, stmt.prepareErr
-		}
-
-		return *stmt, nil
+		return stmt, nil
 	}
 	db.Mux.RUnlock()
 
 	db.Mux.Lock()
+	defer db.Mux.Unlock()
+
 	// double check
 	if stmt, ok := db.Stmts[query]; ok && (!stmt.Transaction || isTransaction) {
-		db.Mux.Unlock()
-		// wait for other goroutines prepared
-		<-stmt.prepared
-		if stmt.prepareErr != nil {
-			return Stmt{}, stmt.prepareErr
-		}
-
-		return *stmt, nil
+		return stmt, nil
+	} else if ok {
+		go stmt.Close()
 	}
 
-	// cache preparing stmt first
-	cacheStmt := Stmt{Transaction: isTransaction, prepared: make(chan struct{})}
-	db.Stmts[query] = &cacheStmt
-	db.Mux.Unlock()
-
-	// prepare completed
-	defer close(cacheStmt.prepared)
-
-	// Reason why cannot lock conn.PrepareContext
-	// suppose the maxopen is 1, g1 is creating record and g2 is querying record.
-	// 1. g1 begin tx, g1 is requeue because of waiting for the system call, now `db.ConnPool` db.numOpen == 1.
-	// 2. g2 select lock `conn.PrepareContext(ctx, query)`, now db.numOpen == db.maxOpen , wait for release.
-	// 3. g1 tx exec insert, wait for unlock `conn.PrepareContext(ctx, query)` to finish tx and release.
 	stmt, err := conn.PrepareContext(ctx, query)
-	if err != nil {
-		cacheStmt.prepareErr = err
-		db.Mux.Lock()
-		delete(db.Stmts, query)
-		db.Mux.Unlock()
-		return Stmt{}, err
+	if err == nil {
+		db.Stmts[query] = Stmt{Stmt: stmt, Transaction: isTransaction}
+		db.PreparedSQL = append(db.PreparedSQL, query)
 	}
 
-	db.Mux.Lock()
-	cacheStmt.Stmt = stmt
-	db.PreparedSQL = append(db.PreparedSQL, query)
-	db.Mux.Unlock()
-
-	return cacheStmt, nil
+	return db.Stmts[query], err
 }
 
 func (db *PreparedStmtDB) BeginTx(ctx context.Context, opt *sql.TxOptions) (ConnPool, error) {

scan.go

@@ -65,6 +65,7 @@ func (db *DB) scanIntoStruct(rows Rows, reflectValue reflect.Value, values []int
 
 	db.RowsAffected++
 	db.AddError(rows.Scan(values...))
+
 	joinedSchemaMap := make(map[*schema.Field]interface{})
 	for idx, field := range fields {
 		if field == nil {
@@ -162,10 +163,11 @@ func Scan(rows Rows, db *DB, mode ScanMode) {
 		}
 	default:
 		var (
-			fields       = make([]*schema.Field, len(columns))
-			joinFields   [][2]*schema.Field
-			sch          = db.Statement.Schema
-			reflectValue = db.Statement.ReflectValue
+			fields             = make([]*schema.Field, len(columns))
+			selectedColumnsMap = make(map[string]int, len(columns))
+			joinFields         [][2]*schema.Field
+			sch                = db.Statement.Schema
+			reflectValue       = db.Statement.ReflectValue
 		)
 
 		if reflectValue.Kind() == reflect.Interface {
@@ -198,24 +200,26 @@ func Scan(rows Rows, db *DB, mode ScanMode) {
 
 			// Not Pluck
 			if sch != nil {
-				matchedFieldCount := make(map[string]int, len(columns))
+				schFieldsCount := len(sch.Fields)
 				for idx, column := range columns {
 					if field := sch.LookUpField(column); field != nil && field.Readable {
-						fields[idx] = field
-						if count, ok := matchedFieldCount[column]; ok {
-							// handle duplicate fields
-							for _, selectField := range sch.Fields {
-								if selectField.DBName == column && selectField.Readable {
-									if count == 0 {
-										matchedFieldCount[column]++
+						if curIndex, ok := selectedColumnsMap[column]; ok {
+							fields[idx] = field // handle duplicate fields
+							offset := curIndex + 1
+							// handle sch inconsistent with database
+							// like Raw(`...`).Scan
+							if schFieldsCount > offset {
+								for fieldIndex, selectField := range sch.Fields[offset:] {
+									if selectField.DBName == column && selectField.Readable {
+										selectedColumnsMap[column] = curIndex + fieldIndex + 1
 										fields[idx] = selectField
 										break
 									}
-									count--
 								}
 							}
 						} else {
-							matchedFieldCount[column] = 1
+							fields[idx] = field
+							selectedColumnsMap[column] = idx
 						}
 					} else if names := strings.Split(column, "__"); len(names) > 1 {
 						if rel, ok := sch.Relationships.Relations[names[0]]; ok {
@@ -239,20 +243,12 @@ func Scan(rows Rows, db *DB, mode ScanMode) {
 
 		switch reflectValue.Kind() {
 		case reflect.Slice, reflect.Array:
-			var (
-				elem        reflect.Value
-				isArrayKind = reflectValue.Kind() == reflect.Array
-			)
+			var elem reflect.Value
+			recyclableStruct := reflect.New(reflectValueType)
 
 			if !update || reflectValue.Len() == 0 {
 				update = false
-				// if the slice cap is externally initialized, the externally initialized slice is directly used here
-				if reflectValue.Cap() == 0 {
-					db.Statement.ReflectValue.Set(reflect.MakeSlice(reflectValue.Type(), 0, 20))
-				} else if !isArrayKind {
-					reflectValue.SetLen(0)
-					db.Statement.ReflectValue.Set(reflectValue)
-				}
+				db.Statement.ReflectValue.Set(reflect.MakeSlice(reflectValue.Type(), 0, 20))
 			}
 
 			for initialized || rows.Next() {
@@ -273,21 +269,20 @@ func Scan(rows Rows, db *DB, mode ScanMode) {
 						}
 					}
 				} else {
-					elem = reflect.New(reflectValueType)
+					if isPtr && db.RowsAffected > 0 {
+						elem = reflect.New(reflectValueType)
+					} else {
+						elem = recyclableStruct
+					}
 				}
 
 				db.scanIntoStruct(rows, elem, values, fields, joinFields)
 
 				if !update {
-					if !isPtr {
-						elem = elem.Elem()
-					}
-					if isArrayKind {
-						if reflectValue.Len() >= int(db.RowsAffected) {
-							reflectValue.Index(int(db.RowsAffected - 1)).Set(elem)
-						}
-					} else {
+					if isPtr {
 						reflectValue = reflect.Append(reflectValue, elem)
+					} else {
+						reflectValue = reflect.Append(reflectValue, elem.Elem())
 					}
 				}
 			}

schema/index.go

@@ -65,11 +65,7 @@ func (schema *Schema) ParseIndexes() map[string]Index {
 			}
 		}
 	}
-	for _, index := range indexes {
-		if index.Class == "UNIQUE" && len(index.Fields) == 1 {
-			index.Fields[0].Field.Unique = true
-		}
-	}
+
 	return indexes
 }
 

schema/index_test.go

@@ -65,7 +65,7 @@ func TestParseIndex(t *testing.T) {
 		"idx_name": {
 			Name:   "idx_name",
 			Class:  "UNIQUE",
-			Fields: []schema.IndexOption{{Field: &schema.Field{Name: "Name2", Unique: true}}},
+			Fields: []schema.IndexOption{{Field: &schema.Field{Name: "Name2"}}},
 		},
 		"idx_user_indices_name3": {
 			Name:  "idx_user_indices_name3",
@@ -81,7 +81,7 @@ func TestParseIndex(t *testing.T) {
 		"idx_user_indices_name4": {
 			Name:   "idx_user_indices_name4",
 			Class:  "UNIQUE",
-			Fields: []schema.IndexOption{{Field: &schema.Field{Name: "Name4", Unique: true}}},
+			Fields: []schema.IndexOption{{Field: &schema.Field{Name: "Name4"}}},
 		},
 		"idx_user_indices_name5": {
 			Name:    "idx_user_indices_name5",
@@ -102,12 +102,12 @@ func TestParseIndex(t *testing.T) {
 		},
 		"idx_id": {
 			Name:   "idx_id",
-			Fields: []schema.IndexOption{{Field: &schema.Field{Name: "MemberNumber"}}, {Field: &schema.Field{Name: "OID", Unique: true}}},
+			Fields: []schema.IndexOption{{Field: &schema.Field{Name: "MemberNumber"}}, {Field: &schema.Field{Name: "OID"}}},
 		},
 		"idx_oid": {
 			Name:   "idx_oid",
 			Class:  "UNIQUE",
-			Fields: []schema.IndexOption{{Field: &schema.Field{Name: "OID", Unique: true}}},
+			Fields: []schema.IndexOption{{Field: &schema.Field{Name: "OID"}}},
 		},
 		"type": {
 			Name:   "type",
@@ -168,9 +168,6 @@ func TestParseIndex(t *testing.T) {
 			if rf.Field.Name != ef.Field.Name {
 				t.Fatalf("index field should equal, expects %v, got %v", rf.Field.Name, ef.Field.Name)
 			}
-			if rf.Field.Unique != ef.Field.Unique {
-				t.Fatalf("index field '%s' should equal, expects %v, got %v", rf.Field.Name, rf.Field.Unique, ef.Field.Unique)
-			}
 
 			for _, name := range []string{"Expression", "Sort", "Collate", "Length"} {
 				if reflect.ValueOf(ef).FieldByName(name).Interface() != reflect.ValueOf(rf).FieldByName(name).Interface() {

schema/relationship.go

@@ -403,30 +403,33 @@ func (schema *Schema) guessRelation(relation *Relationship, field *Field, cgl gu
 	case guessBelongs:
 		primarySchema, foreignSchema = relation.FieldSchema, schema
 	case guessEmbeddedBelongs:
-		if field.OwnerSchema == nil {
+		if field.OwnerSchema != nil {
+			primarySchema, foreignSchema = relation.FieldSchema, field.OwnerSchema
+		} else {
 			reguessOrErr()
 			return
 		}
-		primarySchema, foreignSchema = relation.FieldSchema, field.OwnerSchema
 	case guessHas:
 	case guessEmbeddedHas:
-		if field.OwnerSchema == nil {
+		if field.OwnerSchema != nil {
+			primarySchema, foreignSchema = field.OwnerSchema, relation.FieldSchema
+		} else {
 			reguessOrErr()
 			return
 		}
-		primarySchema, foreignSchema = field.OwnerSchema, relation.FieldSchema
 	}
 
 	if len(relation.foreignKeys) > 0 {
 		for _, foreignKey := range relation.foreignKeys {
-			f := foreignSchema.LookUpField(foreignKey)
-			if f == nil {
+			if f := foreignSchema.LookUpField(foreignKey); f != nil {
+				foreignFields = append(foreignFields, f)
+			} else {
 				reguessOrErr()
 				return
 			}
-			foreignFields = append(foreignFields, f)
 		}
 	} else {
+		var primaryFields []*Field
 		var primarySchemaName = primarySchema.Name
 		if primarySchemaName == "" {
 			primarySchemaName = relation.FieldSchema.Name
@@ -463,11 +466,10 @@ func (schema *Schema) guessRelation(relation *Relationship, field *Field, cgl gu
 		}
 	}
 
-	switch {
-	case len(foreignFields) == 0:
+	if len(foreignFields) == 0 {
 		reguessOrErr()
 		return
-	case len(relation.primaryKeys) > 0:
+	} else if len(relation.primaryKeys) > 0 {
 		for idx, primaryKey := range relation.primaryKeys {
 			if f := primarySchema.LookUpField(primaryKey); f != nil {
 				if len(primaryFields) < idx+1 {
@@ -481,7 +483,7 @@ func (schema *Schema) guessRelation(relation *Relationship, field *Field, cgl gu
 				return
 			}
 		}
-	case len(primaryFields) == 0:
+	} else if len(primaryFields) == 0 {
 		if len(foreignFields) == 1 && primarySchema.PrioritizedPrimaryField != nil {
 			primaryFields = append(primaryFields, primarySchema.PrioritizedPrimaryField)
 		} else if len(primarySchema.PrimaryFields) == len(foreignFields) {

schema/schema.go

@@ -71,10 +71,6 @@ type Tabler interface {
 	TableName() string
 }
 
-type TablerWithNamer interface {
-	TableName(Namer) string
-}
-
 // Parse get data type from dialector
 func Parse(dest interface{}, cacheStore *sync.Map, namer Namer) (*Schema, error) {
 	return ParseWithSpecialTableName(dest, cacheStore, namer, "")
@@ -129,9 +125,6 @@ func ParseWithSpecialTableName(dest interface{}, cacheStore *sync.Map, namer Nam
 	if tabler, ok := modelValue.Interface().(Tabler); ok {
 		tableName = tabler.TableName()
 	}
-	if tabler, ok := modelValue.Interface().(TablerWithNamer); ok {
-		tableName = tabler.TableName(namer)
-	}
 	if en, ok := namer.(embeddedNamer); ok {
 		tableName = en.Table
 	}
@@ -230,7 +223,7 @@ func ParseWithSpecialTableName(dest interface{}, cacheStore *sync.Map, namer Nam
 	}
 
 	for _, field := range schema.Fields {
-		if field.DataType != "" && field.HasDefaultValue && field.DefaultValueInterface == nil {
+		if field.HasDefaultValue && field.DefaultValueInterface == nil {
 			schema.FieldsWithDefaultDBValue = append(schema.FieldsWithDefaultDBValue, field)
 		}
 	}

schema/serializer.go

@@ -100,12 +100,6 @@ func (JSONSerializer) Scan(ctx context.Context, field *Field, dst reflect.Value,
 // Value implements serializer interface
 func (JSONSerializer) Value(ctx context.Context, field *Field, dst reflect.Value, fieldValue interface{}) (interface{}, error) {
 	result, err := json.Marshal(fieldValue)
-	if string(result) == "null" {
-		if field.TagSettings["NOT NULL"] != "" {
-			return "", nil
-		}
-		return nil, err
-	}
 	return string(result), err
 }
 

soft_delete.go

@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"reflect"
 
-	"github.com/jinzhu/now"
 	"gorm.io/gorm/clause"
 	"gorm.io/gorm/schema"
 )
@@ -46,21 +45,11 @@ func (n *DeletedAt) UnmarshalJSON(b []byte) error {
 }
 
 func (DeletedAt) QueryClauses(f *schema.Field) []clause.Interface {
-	return []clause.Interface{SoftDeleteQueryClause{Field: f, ZeroValue: parseZeroValueTag(f)}}
-}
-
-func parseZeroValueTag(f *schema.Field) sql.NullString {
-	if v, ok := f.TagSettings["ZEROVALUE"]; ok {
-		if _, err := now.Parse(v); err == nil {
-			return sql.NullString{String: v, Valid: true}
-		}
-	}
-	return sql.NullString{Valid: false}
+	return []clause.Interface{SoftDeleteQueryClause{Field: f}}
 }
 
 type SoftDeleteQueryClause struct {
-	ZeroValue sql.NullString
-	Field     *schema.Field
+	Field *schema.Field
 }
 
 func (sd SoftDeleteQueryClause) Name() string {
@@ -89,19 +78,18 @@ func (sd SoftDeleteQueryClause) ModifyStatement(stmt *Statement) {
 		}
 
 		stmt.AddClause(clause.Where{Exprs: []clause.Expression{
-			clause.Eq{Column: clause.Column{Table: clause.CurrentTable, Name: sd.Field.DBName}, Value: sd.ZeroValue},
+			clause.Eq{Column: clause.Column{Table: clause.CurrentTable, Name: sd.Field.DBName}, Value: nil},
 		}})
 		stmt.Clauses["soft_delete_enabled"] = clause.Clause{}
 	}
 }
 
 func (DeletedAt) UpdateClauses(f *schema.Field) []clause.Interface {
-	return []clause.Interface{SoftDeleteUpdateClause{Field: f, ZeroValue: parseZeroValueTag(f)}}
+	return []clause.Interface{SoftDeleteUpdateClause{Field: f}}
 }
 
 type SoftDeleteUpdateClause struct {
-	ZeroValue sql.NullString
-	Field     *schema.Field
+	Field *schema.Field
 }
 
 func (sd SoftDeleteUpdateClause) Name() string {
@@ -121,12 +109,11 @@ func (sd SoftDeleteUpdateClause) ModifyStatement(stmt *Statement) {
 }
 
 func (DeletedAt) DeleteClauses(f *schema.Field) []clause.Interface {
-	return []clause.Interface{SoftDeleteDeleteClause{Field: f, ZeroValue: parseZeroValueTag(f)}}
+	return []clause.Interface{SoftDeleteDeleteClause{Field: f}}
 }
 
 type SoftDeleteDeleteClause struct {
-	ZeroValue sql.NullString
-	Field     *schema.Field
+	Field *schema.Field
 }
 
 func (sd SoftDeleteDeleteClause) Name() string {

statement.go

@@ -49,12 +49,9 @@ type Statement struct {
 }
 
 type join struct {
-	Name     string
-	Conds    []interface{}
-	On       *clause.Where
-	Selects  []string
-	Omits    []string
-	JoinType clause.JoinType
+	Name  string
+	Conds []interface{}
+	On    *clause.Where
 }
 
 // StatementModifier statement modifier interface
@@ -120,8 +117,6 @@ func (stmt *Statement) QuoteTo(writer clause.Writer, field interface{}) {
 				write(v.Raw, stmt.Schema.PrioritizedPrimaryField.DBName)
 			} else if len(stmt.Schema.DBNames) > 0 {
 				write(v.Raw, stmt.Schema.DBNames[0])
-			} else {
-				stmt.DB.AddError(ErrModelAccessibleFieldsRequired) //nolint:typecheck,errcheck
 			}
 		} else {
 			write(v.Raw, v.Name)
@@ -184,10 +179,6 @@ func (stmt *Statement) AddVar(writer clause.Writer, vars ...interface{}) {
 			} else {
 				stmt.AddVar(writer, v.GormValue(stmt.Context, stmt.DB))
 			}
-		case clause.Interface:
-			c := clause.Clause{Name: v.Name()}
-			v.MergeClause(&c)
-			c.Build(stmt)
 		case clause.Expression:
 			v.Build(stmt)
 		case driver.Valuer:
@@ -313,9 +304,6 @@ func (stmt *Statement) BuildCondition(query interface{}, args ...interface{}) []
 	conds := make([]clause.Expression, 0, 4)
 	args = append([]interface{}{query}, args...)
 	for idx, arg := range args {
-		if arg == nil {
-			continue
-		}
 		if valuer, ok := arg.(driver.Valuer); ok {
 			arg, _ = valuer.Value()
 		}
@@ -552,9 +540,8 @@ func (stmt *Statement) clone() *Statement {
 }
 
 // SetColumn set column's value
-//
-//	stmt.SetColumn("Name", "jinzhu") // Hooks Method
-//	stmt.SetColumn("Name", "jinzhu", true) // Callbacks Method
+//   stmt.SetColumn("Name", "jinzhu") // Hooks Method
+//   stmt.SetColumn("Name", "jinzhu", true) // Callbacks Method
 func (stmt *Statement) SetColumn(name string, value interface{}, fromCallbacks ...bool) {
 	if v, ok := stmt.Dest.(map[string]interface{}); ok {
 		v[name] = value
@@ -670,41 +657,47 @@ func (stmt *Statement) SelectAndOmitColumns(requireCreate, requireUpdate bool) (
 	results := map[string]bool{}
 	notRestricted := false
 
-	processColumn := func(column string, result bool) {
+	// select columns
+	for _, column := range stmt.Selects {
 		if stmt.Schema == nil {
-			results[column] = result
+			results[column] = true
 		} else if column == "*" {
-			notRestricted = result
+			notRestricted = true
 			for _, dbName := range stmt.Schema.DBNames {
-				results[dbName] = result
+				results[dbName] = true
 			}
 		} else if column == clause.Associations {
 			for _, rel := range stmt.Schema.Relationships.Relations {
-				results[rel.Name] = result
+				results[rel.Name] = true
 			}
 		} else if field := stmt.Schema.LookUpField(column); field != nil && field.DBName != "" {
-			results[field.DBName] = result
+			results[field.DBName] = true
 		} else if matches := nameMatcher.FindStringSubmatch(column); len(matches) == 3 && (matches[1] == stmt.Table || matches[1] == "") {
-			if matches[2] == "*" {
-				for _, dbName := range stmt.Schema.DBNames {
-					results[dbName] = result
-				}
-			} else {
-				results[matches[2]] = result
-			}
+			results[matches[2]] = true
 		} else {
-			results[column] = result
+			results[column] = true
 		}
 	}
 
-	// select columns
-	for _, column := range stmt.Selects {
-		processColumn(column, true)
-	}
-
 	// omit columns
-	for _, column := range stmt.Omits {
-		processColumn(column, false)
+	for _, omit := range stmt.Omits {
+		if stmt.Schema == nil {
+			results[omit] = false
+		} else if omit == "*" {
+			for _, dbName := range stmt.Schema.DBNames {
+				results[dbName] = false
+			}
+		} else if omit == clause.Associations {
+			for _, rel := range stmt.Schema.Relationships.Relations {
+				results[rel.Name] = false
+			}
+		} else if field := stmt.Schema.LookUpField(omit); field != nil && field.DBName != "" {
+			results[field.DBName] = false
+		} else if matches := nameMatcher.FindStringSubmatch(omit); len(matches) == 2 {
+			results[matches[1]] = false
+		} else {
+			results[omit] = false
+		}
 	}
 
 	if stmt.Schema != nil {

statement_test.go

@@ -35,13 +35,6 @@ func TestWhereCloneCorruption(t *testing.T) {
 	}
 }
 
-func TestNilCondition(t *testing.T) {
-	s := new(Statement)
-	if len(s.BuildCondition(nil)) != 0 {
-		t.Errorf("Nil condition should be empty")
-	}
-}
-
 func TestNameMatcher(t *testing.T) {
 	for k, v := range map[string][]string{
 		"table.name":         {"table", "name"},

tests/associations_belongs_to_test.go

@@ -3,7 +3,6 @@ package tests_test
 import (
 	"testing"
 
-	"gorm.io/gorm"
 	. "gorm.io/gorm/utils/tests"
 )
 
@@ -138,7 +137,6 @@ func TestBelongsToAssociation(t *testing.T) {
 	unexistCompanyID := company.ID + 9999999
 	user = User{Name: "invalid-user-with-invalid-belongs-to-foreign-key", CompanyID: &unexistCompanyID}
 	if err := DB.Create(&user).Error; err == nil {
-		tidbSkip(t, "not support the foreign key feature")
 		t.Errorf("should have gotten foreign key violation error")
 	}
 }
@@ -226,28 +224,3 @@ func TestBelongsToAssociationForSlice(t *testing.T) {
 	AssertAssociationCount(t, users[0], "Company", 0, "After Delete")
 	AssertAssociationCount(t, users[1], "Company", 1, "After other user Delete")
 }
-
-func TestBelongsToDefaultValue(t *testing.T) {
-	type Org struct {
-		ID string
-	}
-	type BelongsToUser struct {
-		OrgID string
-		Org   Org `gorm:"default:NULL"`
-	}
-
-	tx := DB.Session(&gorm.Session{})
-	tx.Config.DisableForeignKeyConstraintWhenMigrating = true
-	AssertEqual(t, DB.Config.DisableForeignKeyConstraintWhenMigrating, false)
-
-	tx.Migrator().DropTable(&BelongsToUser{}, &Org{})
-	tx.AutoMigrate(&BelongsToUser{}, &Org{})
-
-	user := &BelongsToUser{
-		Org: Org{
-			ID: "BelongsToUser_Org_1",
-		},
-	}
-	err := DB.Create(&user).Error
-	AssertEqual(t, err, nil)
-}

tests/associations_many2many_test.go

@@ -95,8 +95,6 @@ func TestMany2ManyAssociation(t *testing.T) {
 }
 
 func TestMany2ManyOmitAssociations(t *testing.T) {
-	tidbSkip(t, "not support the foreign key feature")
-
 	user := *GetUser("many2many_omit_associations", Config{Languages: 2})
 
 	if err := DB.Omit("Languages.*").Create(&user).Error; err == nil {

tests/associations_test.go

@@ -71,8 +71,6 @@ func TestAssociationNotNullClear(t *testing.T) {
 }
 
 func TestForeignKeyConstraints(t *testing.T) {
-	tidbSkip(t, "not support the foreign key feature")
-
 	type Profile struct {
 		ID       uint
 		Name     string
@@ -128,8 +126,6 @@ func TestForeignKeyConstraints(t *testing.T) {
 }
 
 func TestForeignKeyConstraintsBelongsTo(t *testing.T) {
-	tidbSkip(t, "not support the foreign key feature")
-
 	type Profile struct {
 		ID    uint
 		Name  string
@@ -352,45 +348,3 @@ func TestAssociationEmptyQueryClause(t *testing.T) {
 		AssertEqual(t, len(orgs), 0)
 	}
 }
-
-type AssociationEmptyUser struct {
-	ID   uint
-	Name string
-	Pets []AssociationEmptyPet
-}
-
-type AssociationEmptyPet struct {
-	AssociationEmptyUserID *uint  `gorm:"uniqueIndex:uniq_user_id_name"`
-	Name                   string `gorm:"uniqueIndex:uniq_user_id_name;size:256"`
-}
-
-func TestAssociationEmptyPrimaryKey(t *testing.T) {
-	if DB.Dialector.Name() != "mysql" {
-		t.Skip()
-	}
-	DB.Migrator().DropTable(&AssociationEmptyUser{}, &AssociationEmptyPet{})
-	DB.AutoMigrate(&AssociationEmptyUser{}, &AssociationEmptyPet{})
-
-	id := uint(100)
-	user := AssociationEmptyUser{
-		ID:   id,
-		Name: "jinzhu",
-		Pets: []AssociationEmptyPet{
-			{AssociationEmptyUserID: &id, Name: "bar"},
-			{AssociationEmptyUserID: &id, Name: "foo"},
-		},
-	}
-
-	err := DB.Session(&gorm.Session{FullSaveAssociations: true}).Create(&user).Error
-	if err != nil {
-		t.Fatalf("Failed to create, got error: %v", err)
-	}
-
-	var result AssociationEmptyUser
-	err = DB.Preload("Pets").First(&result, &id).Error
-	if err != nil {
-		t.Fatalf("Failed to find, got error: %v", err)
-	}
-
-	AssertEqual(t, result, user)
-}

tests/callbacks_test.go

@@ -113,9 +113,6 @@ func TestCallbacks(t *testing.T) {
 
 	for idx, data := range datas {
 		db, err := gorm.Open(nil, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
 		callbacks := db.Callback()
 
 		for _, c := range data.callbacks {

tests/connpool_test.go

@@ -116,7 +116,7 @@ func TestConnPoolWrapper(t *testing.T) {
 		}
 	}()
 
-	db, err := gorm.Open(mysql.New(mysql.Config{Conn: conn, DisableWithReturning: true}))
+	db, err := gorm.Open(mysql.New(mysql.Config{Conn: conn}))
 	if err != nil {
 		t.Fatalf("Should open db success, but got %v", err)
 	}

tests/count_test.go

@@ -141,7 +141,7 @@ func TestCount(t *testing.T) {
 	}
 	DB.Create(sameUsers)
 
-	if err := DB.Model(&User{}).Where("name = ?", "count-4").Group("name").Count(&count11).Error; err != nil || count11 != int64(len(sameUsers)) {
+	if err := DB.Model(&User{}).Where("name = ?", "count-4").Group("name").Count(&count11).Error; err != nil || count11 != 1 {
 		t.Fatalf("Count should be 3, but got count: %v err %v", count11, err)
 	}
 

tests/docker-compose.yml

@@ -29,8 +29,3 @@ services:
       - MSSQL_DB=gorm
       - MSSQL_USER=gorm
       - MSSQL_PASSWORD=LoremIpsum86
-  tidb:
-    image: 'pingcap/tidb:v6.5.0'
-    ports:
-      - 9940:4000
-    command: /tidb-server -store unistore -path "" -lease 0s > tidb.log 2>&1 &

tests/embedded_struct_test.go

@@ -36,7 +36,7 @@ func TestEmbeddedStruct(t *testing.T) {
 
 	type EngadgetPost struct {
 		BasePost BasePost `gorm:"Embedded"`
-		Author   *Author  `gorm:"Embedded;EmbeddedPrefix:author_"` // Embedded struct
+		Author   Author   `gorm:"Embedded;EmbeddedPrefix:author_"` // Embedded struct
 		ImageUrl string
 	}
 
@@ -74,27 +74,13 @@ func TestEmbeddedStruct(t *testing.T) {
 		t.Errorf("embedded struct's value should be scanned correctly")
 	}
 
-	DB.Save(&EngadgetPost{BasePost: BasePost{Title: "engadget_news"}, Author: &Author{Name: "Edward"}})
-	DB.Save(&EngadgetPost{BasePost: BasePost{Title: "engadget_article"}, Author: &Author{Name: "George"}})
+	DB.Save(&EngadgetPost{BasePost: BasePost{Title: "engadget_news"}})
 	var egNews EngadgetPost
 	if err := DB.First(&egNews, "title = ?", "engadget_news").Error; err != nil {
 		t.Errorf("no error should happen when query with embedded struct, but got %v", err)
 	} else if egNews.BasePost.Title != "engadget_news" {
 		t.Errorf("embedded struct's value should be scanned correctly")
 	}
-
-	var egPosts []EngadgetPost
-	if err := DB.Order("author_name asc").Find(&egPosts).Error; err != nil {
-		t.Fatalf("no error should happen when query with embedded struct, but got %v", err)
-	}
-	expectAuthors := []string{"Edward", "George"}
-	for i, post := range egPosts {
-		t.Log(i, post.Author)
-		if want := expectAuthors[i]; post.Author.Name != want {
-			t.Errorf("expected author %s got %s", want, post.Author.Name)
-		}
-	}
-
 }
 
 func TestEmbeddedPointerTypeStruct(t *testing.T) {

tests/go.mod

@@ -3,16 +3,18 @@ module gorm.io/gorm/tests
 go 1.16
 
 require (
+	github.com/denisenkom/go-mssqldb v0.12.2 // indirect
+	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/google/uuid v1.3.0
 	github.com/jinzhu/now v1.1.5
 	github.com/lib/pq v1.10.7
-	github.com/mattn/go-sqlite3 v1.14.16 // indirect
-	golang.org/x/crypto v0.5.0 // indirect
-	gorm.io/driver/mysql v1.4.6
-	gorm.io/driver/postgres v1.4.6
-	gorm.io/driver/sqlite v1.4.4
-	gorm.io/driver/sqlserver v1.4.2
-	gorm.io/gorm v1.24.5
+	github.com/mattn/go-sqlite3 v1.14.15 // indirect
+	golang.org/x/crypto v0.0.0-20220919173607-35f4265a4bc0 // indirect
+	gorm.io/driver/mysql v1.3.6
+	gorm.io/driver/postgres v1.3.10
+	gorm.io/driver/sqlite v1.3.6
+	gorm.io/driver/sqlserver v1.3.2
+	gorm.io/gorm v1.23.9
 )
 
 replace gorm.io/gorm => ../

tests/helper_test.go

@@ -1,7 +1,6 @@
 package tests_test
 
 import (
-	"os"
 	"sort"
 	"strconv"
 	"strings"
@@ -236,13 +235,3 @@ func CheckUser(t *testing.T, user User, expect User) {
 		}
 	})
 }
-
-func tidbSkip(t *testing.T, reason string) {
-	if isTiDB() {
-		t.Skipf("This test case skipped, because of TiDB '%s'", reason)
-	}
-}
-
-func isTiDB() bool {
-	return os.Getenv("GORM_DIALECT") == "tidb"
-}

tests/joins_test.go

@@ -229,99 +229,3 @@ func TestJoinWithSoftDeleted(t *testing.T) {
 		t.Fatalf("joins NamedPet and Account should not empty:%v", user2)
 	}
 }
-
-func TestInnerJoins(t *testing.T) {
-	user := *GetUser("inner-joins-1", Config{Company: true, Manager: true, Account: true, NamedPet: false})
-
-	DB.Create(&user)
-
-	var user2 User
-	var err error
-	err = DB.InnerJoins("Company").InnerJoins("Manager").InnerJoins("Account").First(&user2, "users.name = ?", user.Name).Error
-	AssertEqual(t, err, nil)
-	CheckUser(t, user2, user)
-
-	// inner join and NamedPet is nil
-	err = DB.InnerJoins("NamedPet").InnerJoins("Company").InnerJoins("Manager").InnerJoins("Account").First(&user2, "users.name = ?", user.Name).Error
-	AssertEqual(t, err, gorm.ErrRecordNotFound)
-
-	// mixed inner join and left join
-	var user3 User
-	err = DB.Joins("NamedPet").InnerJoins("Company").InnerJoins("Manager").InnerJoins("Account").First(&user3, "users.name = ?", user.Name).Error
-	AssertEqual(t, err, nil)
-	CheckUser(t, user3, user)
-}
-
-func TestJoinWithSameColumnName(t *testing.T) {
-	user := GetUser("TestJoinWithSameColumnName", Config{
-		Languages: 1,
-		Pets:      1,
-	})
-	DB.Create(user)
-	type UserSpeak struct {
-		UserID       uint
-		LanguageCode string
-	}
-	type Result struct {
-		User
-		UserSpeak
-		Language
-		Pet
-	}
-
-	results := make([]Result, 0, 1)
-	DB.Select("users.*, user_speaks.*,  languages.*, pets.*").Table("users").Joins("JOIN user_speaks ON user_speaks.user_id = users.id").
-		Joins("JOIN languages ON languages.code = user_speaks.language_code").
-		Joins("LEFT OUTER JOIN pets ON pets.user_id = users.id").Find(&results)
-
-	if len(results) == 0 {
-		t.Fatalf("no record find")
-	} else if results[0].Pet.UserID == nil || *(results[0].Pet.UserID) != user.ID {
-		t.Fatalf("wrong user id in pet")
-	} else if results[0].Pet.Name != user.Pets[0].Name {
-		t.Fatalf("wrong pet name")
-	}
-}
-
-func TestJoinArgsWithDB(t *testing.T) {
-	user := *GetUser("joins-args-db", Config{Pets: 2})
-	DB.Save(&user)
-
-	// test where
-	var user1 User
-	onQuery := DB.Where(&Pet{Name: "joins-args-db_pet_2"})
-	if err := DB.Joins("NamedPet", onQuery).Where("users.name = ?", user.Name).First(&user1).Error; err != nil {
-		t.Fatalf("Failed to load with joins on, got error: %v", err)
-	}
-
-	AssertEqual(t, user1.NamedPet.Name, "joins-args-db_pet_2")
-
-	// test where and omit
-	onQuery2 := DB.Where(&Pet{Name: "joins-args-db_pet_2"}).Omit("Name")
-	var user2 User
-	if err := DB.Joins("NamedPet", onQuery2).Where("users.name = ?", user.Name).First(&user2).Error; err != nil {
-		t.Fatalf("Failed to load with joins on, got error: %v", err)
-	}
-	AssertEqual(t, user2.NamedPet.ID, user1.NamedPet.ID)
-	AssertEqual(t, user2.NamedPet.Name, "")
-
-	// test where and select
-	onQuery3 := DB.Where(&Pet{Name: "joins-args-db_pet_2"}).Select("Name")
-	var user3 User
-	if err := DB.Joins("NamedPet", onQuery3).Where("users.name = ?", user.Name).First(&user3).Error; err != nil {
-		t.Fatalf("Failed to load with joins on, got error: %v", err)
-	}
-	AssertEqual(t, user3.NamedPet.ID, 0)
-	AssertEqual(t, user3.NamedPet.Name, "joins-args-db_pet_2")
-
-	// test select
-	onQuery4 := DB.Select("ID")
-	var user4 User
-	if err := DB.Joins("NamedPet", onQuery4).Where("users.name = ?", user.Name).First(&user4).Error; err != nil {
-		t.Fatalf("Failed to load with joins on, got error: %v", err)
-	}
-	if user4.NamedPet.ID == 0 {
-		t.Fatal("Pet ID can not be empty")
-	}
-	AssertEqual(t, user4.NamedPet.Name, "")
-}

tests/migrate_test.go

@@ -1,10 +1,8 @@
 package tests_test
 
 import (
-	"context"
 	"fmt"
 	"math/rand"
-	"os"
 	"reflect"
 	"strings"
 	"testing"
@@ -12,7 +10,6 @@ import (
 
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
 	"gorm.io/gorm/schema"
 	. "gorm.io/gorm/utils/tests"
 )
@@ -28,7 +25,7 @@ func TestMigrate(t *testing.T) {
 	}
 
 	if err := DB.AutoMigrate(allModels...); err != nil {
-		t.Fatalf("Failed to auto migrate, got error %v", err)
+		t.Fatalf("Failed to auto migrate, but got error %v", err)
 	}
 
 	if tables, err := DB.Migrator().GetTables(); err != nil {
@@ -75,44 +72,6 @@ func TestMigrate(t *testing.T) {
 			t.Fatalf("Failed to find index for many2many for %v %v", indexes[0], indexes[1])
 		}
 	}
-
-}
-
-func TestAutoMigrateInt8PG(t *testing.T) {
-	if DB.Dialector.Name() != "postgres" {
-		return
-	}
-
-	type Smallint int8
-
-	type MigrateInt struct {
-		Int8 Smallint
-	}
-
-	tracer := Tracer{
-		Logger: DB.Config.Logger,
-		Test: func(ctx context.Context, begin time.Time, fc func() (sql string, rowsAffected int64), err error) {
-			sql, _ := fc()
-			if strings.HasPrefix(sql, "ALTER TABLE \"migrate_ints\" ALTER COLUMN \"int8\" TYPE smallint") {
-				t.Fatalf("shouldn't execute ALTER COLUMN TYPE if such type is already existed in DB schema: sql: %s", sql)
-			}
-		},
-	}
-
-	DB.Migrator().DropTable(&MigrateInt{})
-
-	// The first AutoMigrate to make table with field with correct type
-	if err := DB.AutoMigrate(&MigrateInt{}); err != nil {
-		t.Fatalf("Failed to auto migrate: error: %v", err)
-	}
-
-	// make new session to set custom logger tracer
-	session := DB.Session(&gorm.Session{Logger: tracer})
-
-	// The second AutoMigrate to catch an error
-	if err := session.AutoMigrate(&MigrateInt{}); err != nil {
-		t.Fatalf("Failed to auto migrate: error: %v", err)
-	}
 }
 
 func TestAutoMigrateSelfReferential(t *testing.T) {
@@ -374,137 +333,7 @@ func TestMigrateIndexes(t *testing.T) {
 	}
 }
 
-func TestTiDBMigrateColumns(t *testing.T) {
-	if !isTiDB() {
-		t.Skip()
-	}
-
-	// TiDB can't change column constraint and has auto_random feature
-	type ColumnStruct struct {
-		ID    int `gorm:"primarykey;default:auto_random()"`
-		Name  string
-		Age   int    `gorm:"default:18;comment:my age"`
-		Code  string `gorm:"unique;comment:my code;"`
-		Code2 string
-		Code3 string `gorm:"unique"`
-	}
-
-	DB.Migrator().DropTable(&ColumnStruct{})
-
-	if err := DB.AutoMigrate(&ColumnStruct{}); err != nil {
-		t.Errorf("Failed to migrate, got %v", err)
-	}
-
-	type ColumnStruct2 struct {
-		ID    int    `gorm:"primarykey;default:auto_random()"`
-		Name  string `gorm:"size:100"`
-		Code  string `gorm:"unique;comment:my code2;default:hello"`
-		Code2 string `gorm:"comment:my code2;default:hello"`
-	}
-
-	if err := DB.Table("column_structs").Migrator().AlterColumn(&ColumnStruct{}, "Name"); err != nil {
-		t.Fatalf("no error should happened when alter column, but got %v", err)
-	}
-
-	if err := DB.Table("column_structs").AutoMigrate(&ColumnStruct2{}); err != nil {
-		t.Fatalf("no error should happened when auto migrate column, but got %v", err)
-	}
-
-	if columnTypes, err := DB.Migrator().ColumnTypes(&ColumnStruct{}); err != nil {
-		t.Fatalf("no error should returns for ColumnTypes")
-	} else {
-		stmt := &gorm.Statement{DB: DB}
-		stmt.Parse(&ColumnStruct2{})
-
-		for _, columnType := range columnTypes {
-			switch columnType.Name() {
-			case "id":
-				if v, ok := columnType.PrimaryKey(); !ok || !v {
-					t.Fatalf("column id primary key should be correct, name: %v, column: %#v", columnType.Name(), columnType)
-				}
-			case "name":
-				dataType := DB.Dialector.DataTypeOf(stmt.Schema.LookUpField(columnType.Name()))
-				if !strings.Contains(strings.ToUpper(dataType), strings.ToUpper(columnType.DatabaseTypeName())) {
-					t.Fatalf("column name type should be correct, name: %v, length: %v, expects: %v, column: %#v", columnType.Name(), columnType.DatabaseTypeName(), dataType, columnType)
-				}
-				if length, ok := columnType.Length(); !ok || length != 100 {
-					t.Fatalf("column name length should be correct, name: %v, length: %v, expects: %v, column: %#v", columnType.Name(), length, 100, columnType)
-				}
-			case "age":
-				if v, ok := columnType.DefaultValue(); !ok || v != "18" {
-					t.Fatalf("column age default value should be correct, name: %v, column: %#v", columnType.Name(), columnType)
-				}
-				if v, ok := columnType.Comment(); !ok || v != "my age" {
-					t.Fatalf("column age comment should be correct, name: %v, column: %#v", columnType.Name(), columnType)
-				}
-			case "code":
-				if v, ok := columnType.Unique(); !ok || !v {
-					t.Fatalf("column code unique should be correct, name: %v, column: %#v", columnType.Name(), columnType)
-				}
-				if v, ok := columnType.DefaultValue(); !ok || v != "hello" {
-					t.Fatalf("column code default value should be correct, name: %v, column: %#v, default value: %v", columnType.Name(), columnType, v)
-				}
-				if v, ok := columnType.Comment(); !ok || v != "my code2" {
-					t.Fatalf("column code comment should be correct, name: %v, column: %#v", columnType.Name(), columnType)
-				}
-			case "code2":
-				// Code2 string `gorm:"comment:my code2;default:hello"`
-				if v, ok := columnType.DefaultValue(); !ok || v != "hello" {
-					t.Fatalf("column code default value should be correct, name: %v, column: %#v, default value: %v", columnType.Name(), columnType, v)
-				}
-				if v, ok := columnType.Comment(); !ok || v != "my code2" {
-					t.Fatalf("column code comment should be correct, name: %v, column: %#v", columnType.Name(), columnType)
-				}
-			}
-		}
-	}
-
-	type NewColumnStruct struct {
-		gorm.Model
-		Name    string
-		NewName string
-	}
-
-	if err := DB.Table("column_structs").Migrator().AddColumn(&NewColumnStruct{}, "NewName"); err != nil {
-		t.Fatalf("Failed to add column, got %v", err)
-	}
-
-	if !DB.Table("column_structs").Migrator().HasColumn(&NewColumnStruct{}, "NewName") {
-		t.Fatalf("Failed to find added column")
-	}
-
-	if err := DB.Table("column_structs").Migrator().DropColumn(&NewColumnStruct{}, "NewName"); err != nil {
-		t.Fatalf("Failed to add column, got %v", err)
-	}
-
-	if DB.Table("column_structs").Migrator().HasColumn(&NewColumnStruct{}, "NewName") {
-		t.Fatalf("Found deleted column")
-	}
-
-	if err := DB.Table("column_structs").Migrator().AddColumn(&NewColumnStruct{}, "NewName"); err != nil {
-		t.Fatalf("Failed to add column, got %v", err)
-	}
-
-	if err := DB.Table("column_structs").Migrator().RenameColumn(&NewColumnStruct{}, "NewName", "new_new_name"); err != nil {
-		t.Fatalf("Failed to add column, got %v", err)
-	}
-
-	if !DB.Table("column_structs").Migrator().HasColumn(&NewColumnStruct{}, "new_new_name") {
-		t.Fatalf("Failed to found renamed column")
-	}
-
-	if err := DB.Table("column_structs").Migrator().DropColumn(&NewColumnStruct{}, "new_new_name"); err != nil {
-		t.Fatalf("Failed to add column, got %v", err)
-	}
-
-	if DB.Table("column_structs").Migrator().HasColumn(&NewColumnStruct{}, "new_new_name") {
-		t.Fatalf("Found deleted column")
-	}
-}
-
 func TestMigrateColumns(t *testing.T) {
-	tidbSkip(t, "use another test case")
-
 	sqlite := DB.Dialector.Name() == "sqlite"
 	sqlserver := DB.Dialector.Name() == "sqlserver"
 
@@ -571,7 +400,7 @@ func TestMigrateColumns(t *testing.T) {
 					t.Fatalf("column code unique should be correct, name: %v, column: %#v", columnType.Name(), columnType)
 				}
 				if v, ok := columnType.DefaultValue(); !sqlserver && (!ok || v != "hello") {
-					t.Fatalf("column code default value should be correct, name: %v, column: %#v, default value: %v", columnType.Name(), columnType, v)
+					t.Fatalf("column code default value should be correct, name: %v, column: %#v", columnType.Name(), columnType)
 				}
 				if v, ok := columnType.Comment(); !sqlite && !sqlserver && (!ok || v != "my code2") {
 					t.Fatalf("column code comment should be correct, name: %v, column: %#v", columnType.Name(), columnType)
@@ -886,32 +715,6 @@ func TestPrimarykeyID(t *testing.T) {
 	}
 }
 
-func TestCurrentTimestamp(t *testing.T) {
-	if DB.Dialector.Name() != "mysql" {
-		return
-	}
-	type CurrentTimestampTest struct {
-		ID     string     `gorm:"primary_key"`
-		TimeAt *time.Time `gorm:"type:datetime;not null;default:CURRENT_TIMESTAMP;unique"`
-	}
-	var err error
-	err = DB.Migrator().DropTable(&CurrentTimestampTest{})
-	if err != nil {
-		t.Errorf("DropTable err:%v", err)
-	}
-	err = DB.AutoMigrate(&CurrentTimestampTest{})
-	if err != nil {
-		t.Fatalf("AutoMigrate err:%v", err)
-	}
-
-	err = DB.AutoMigrate(&CurrentTimestampTest{})
-	if err != nil {
-		t.Fatalf("AutoMigrate err:%v", err)
-	}
-	AssertEqual(t, true, DB.Migrator().HasIndex(&CurrentTimestampTest{}, "time_at"))
-	AssertEqual(t, false, DB.Migrator().HasIndex(&CurrentTimestampTest{}, "time_at_2"))
-}
-
 func TestUniqueColumn(t *testing.T) {
 	if DB.Dialector.Name() != "mysql" {
 		return
@@ -983,8 +786,6 @@ func TestUniqueColumn(t *testing.T) {
 	AssertEqual(t, "", value)
 	AssertEqual(t, false, ok)
 
-	tidbSkip(t, "can't change column constraint")
-
 	// null -> empty string
 	err = DB.Table("unique_tests").AutoMigrate(&UniqueTest3{})
 	if err != nil {
@@ -1049,7 +850,7 @@ func findColumnType(dest interface{}, columnName string) (
 	return
 }
 
-func TestInvalidCachedPlanSimpleProtocol(t *testing.T) {
+func TestInvalidCachedPlan(t *testing.T) {
 	if DB.Dialector.Name() != "postgres" {
 		return
 	}
@@ -1084,101 +885,6 @@ func TestInvalidCachedPlanSimpleProtocol(t *testing.T) {
 	}
 }
 
-func TestInvalidCachedPlanPrepareStmt(t *testing.T) {
-	if DB.Dialector.Name() != "postgres" {
-		return
-	}
-
-	db, err := gorm.Open(postgres.Open(postgresDSN), &gorm.Config{PrepareStmt: true})
-	if err != nil {
-		t.Errorf("Open err:%v", err)
-	}
-	if debug := os.Getenv("DEBUG"); debug == "true" {
-		db.Logger = db.Logger.LogMode(logger.Info)
-	} else if debug == "false" {
-		db.Logger = db.Logger.LogMode(logger.Silent)
-	}
-
-	type Object1 struct {
-		ID uint
-	}
-	type Object2 struct {
-		ID     uint
-		Field1 int `gorm:"type:int8"`
-	}
-	type Object3 struct {
-		ID     uint
-		Field1 int `gorm:"type:int4"`
-	}
-	type Object4 struct {
-		ID     uint
-		Field2 int
-	}
-	db.Migrator().DropTable("objects")
-
-	err = db.Table("objects").AutoMigrate(&Object1{})
-	if err != nil {
-		t.Errorf("AutoMigrate err:%v", err)
-	}
-	err = db.Table("objects").Create(&Object1{}).Error
-	if err != nil {
-		t.Errorf("create err:%v", err)
-	}
-
-	// AddColumn
-	err = db.Table("objects").AutoMigrate(&Object2{})
-	if err != nil {
-		t.Errorf("AutoMigrate err:%v", err)
-	}
-
-	err = db.Table("objects").Take(&Object2{}).Error
-	if err != nil {
-		t.Errorf("take err:%v", err)
-	}
-
-	// AlterColumn
-	err = db.Table("objects").AutoMigrate(&Object3{})
-	if err != nil {
-		t.Errorf("AutoMigrate err:%v", err)
-	}
-
-	err = db.Table("objects").Take(&Object3{}).Error
-	if err != nil {
-		t.Errorf("take err:%v", err)
-	}
-
-	// AddColumn
-	err = db.Table("objects").AutoMigrate(&Object4{})
-	if err != nil {
-		t.Errorf("AutoMigrate err:%v", err)
-	}
-
-	err = db.Table("objects").Take(&Object4{}).Error
-	if err != nil {
-		t.Errorf("take err:%v", err)
-	}
-
-	db.Table("objects").Migrator().RenameColumn(&Object4{}, "field2", "field3")
-	if err != nil {
-		t.Errorf("RenameColumn err:%v", err)
-	}
-
-	err = db.Table("objects").Take(&Object4{}).Error
-	if err != nil {
-		t.Errorf("take err:%v", err)
-	}
-
-	db.Table("objects").Migrator().DropColumn(&Object4{}, "field3")
-	if err != nil {
-		t.Errorf("RenameColumn err:%v", err)
-	}
-
-	err = db.Table("objects").Take(&Object4{}).Error
-	if err != nil {
-		t.Errorf("take err:%v", err)
-	}
-}
-
 func TestDifferentTypeWithoutDeclaredLength(t *testing.T) {
 	type DiffType struct {
 		ID   uint
@@ -1253,247 +959,3 @@ func TestMigrateArrayTypeModel(t *testing.T) {
 	AssertEqual(t, nil, err)
 	AssertEqual(t, "integer[]", ct.DatabaseTypeName())
 }
-
-type mockMigrator struct {
-	gorm.Migrator
-}
-
-func (mm mockMigrator) AlterColumn(dst interface{}, field string) error {
-	err := mm.Migrator.AlterColumn(dst, field)
-	if err != nil {
-		return err
-	}
-	return fmt.Errorf("trigger alter column error, field: %s", field)
-}
-
-func TestMigrateDonotAlterColumn(t *testing.T) {
-	var wrapMockMigrator = func(m gorm.Migrator) mockMigrator {
-		return mockMigrator{
-			Migrator: m,
-		}
-	}
-	m := DB.Migrator()
-	mockM := wrapMockMigrator(m)
-
-	type NotTriggerUpdate struct {
-		ID  uint
-		F1  uint16
-		F2  uint32
-		F3  int
-		F4  int64
-		F5  string
-		F6  float32
-		F7  float64
-		F8  time.Time
-		F9  bool
-		F10 []byte
-	}
-
-	var err error
-	err = mockM.DropTable(&NotTriggerUpdate{})
-	AssertEqual(t, err, nil)
-	err = mockM.AutoMigrate(&NotTriggerUpdate{})
-	AssertEqual(t, err, nil)
-	err = mockM.AutoMigrate(&NotTriggerUpdate{})
-	AssertEqual(t, err, nil)
-}
-
-func TestMigrateSameEmbeddedFieldName(t *testing.T) {
-	type UserStat struct {
-		GroundDestroyCount int
-	}
-
-	type GameUser struct {
-		gorm.Model
-		StatAb UserStat `gorm:"embedded;embeddedPrefix:stat_ab_"`
-	}
-
-	type UserStat1 struct {
-		GroundDestroyCount string
-	}
-
-	type GroundRate struct {
-		GroundDestroyCount int
-	}
-
-	type GameUser1 struct {
-		gorm.Model
-		StatAb       UserStat1  `gorm:"embedded;embeddedPrefix:stat_ab_"`
-		GroundRateRb GroundRate `gorm:"embedded;embeddedPrefix:rate_ground_rb_"`
-	}
-
-	DB.Migrator().DropTable(&GameUser{})
-	err := DB.AutoMigrate(&GameUser{})
-	AssertEqual(t, nil, err)
-
-	err = DB.Table("game_users").AutoMigrate(&GameUser1{})
-	AssertEqual(t, nil, err)
-
-	_, err = findColumnType(&GameUser{}, "stat_ab_ground_destory_count")
-	AssertEqual(t, nil, err)
-
-	_, err = findColumnType(&GameUser{}, "rate_ground_rb_ground_destory_count")
-	AssertEqual(t, nil, err)
-}
-
-func TestMigrateDefaultNullString(t *testing.T) {
-	if DB.Dialector.Name() == "sqlserver" {
-		// sqlserver driver treats NULL and 'NULL' the same
-		t.Skip("skip sqlserver")
-	}
-
-	type NullModel struct {
-		ID      uint
-		Content string `gorm:"default:null"`
-	}
-
-	type NullStringModel struct {
-		ID      uint
-		Content string `gorm:"default:'null'"`
-	}
-
-	tableName := "null_string_model"
-
-	DB.Migrator().DropTable(tableName)
-
-	err := DB.Table(tableName).AutoMigrate(&NullModel{})
-	AssertEqual(t, err, nil)
-
-	// default null -> 'null'
-	err = DB.Table(tableName).AutoMigrate(&NullStringModel{})
-	AssertEqual(t, err, nil)
-
-	columnType, err := findColumnType(tableName, "content")
-	AssertEqual(t, err, nil)
-
-	defVal, ok := columnType.DefaultValue()
-	AssertEqual(t, defVal, "null")
-	AssertEqual(t, ok, true)
-
-	// default 'null' -> 'null'
-	session := DB.Session(&gorm.Session{Logger: Tracer{
-		Logger: DB.Config.Logger,
-		Test: func(ctx context.Context, begin time.Time, fc func() (sql string, rowsAffected int64), err error) {
-			sql, _ := fc()
-			if strings.HasPrefix(sql, "ALTER TABLE") {
-				t.Errorf("shouldn't execute: sql=%s", sql)
-			}
-		},
-	}})
-	err = session.Table(tableName).AutoMigrate(&NullStringModel{})
-	AssertEqual(t, err, nil)
-
-	columnType, err = findColumnType(tableName, "content")
-	AssertEqual(t, err, nil)
-
-	defVal, ok = columnType.DefaultValue()
-	AssertEqual(t, defVal, "null")
-	AssertEqual(t, ok, true)
-
-	// default 'null' -> null
-	err = DB.Table(tableName).AutoMigrate(&NullModel{})
-	AssertEqual(t, err, nil)
-
-	columnType, err = findColumnType(tableName, "content")
-	AssertEqual(t, err, nil)
-
-	defVal, ok = columnType.DefaultValue()
-	AssertEqual(t, defVal, "")
-	AssertEqual(t, ok, false)
-}
-
-func TestMigrateMySQLWithCustomizedTypes(t *testing.T) {
-	if DB.Dialector.Name() != "mysql" {
-		t.Skip()
-	}
-
-	type MyTable struct {
-		Def string `gorm:"size:512;index:idx_def,unique"`
-		Abc string `gorm:"size:65000000"`
-	}
-
-	DB.Migrator().DropTable("my_tables")
-
-	sql := "CREATE TABLE `my_tables` (`def` varchar(512),`abc` longtext,UNIQUE INDEX `idx_def` (`def`))"
-	if err := DB.Exec(sql).Error; err != nil {
-		t.Errorf("Failed, got error: %v", err)
-	}
-
-	session := DB.Session(&gorm.Session{Logger: Tracer{
-		Logger: DB.Config.Logger,
-		Test: func(ctx context.Context, begin time.Time, fc func() (sql string, rowsAffected int64), err error) {
-			sql, _ := fc()
-			if strings.HasPrefix(sql, "ALTER TABLE") {
-				t.Errorf("shouldn't execute: sql=%s", sql)
-			}
-		},
-	}})
-
-	if err := session.AutoMigrate(&MyTable{}); err != nil {
-		t.Errorf("Failed, got error: %v", err)
-	}
-}
-
-func TestMigrateIgnoreRelations(t *testing.T) {
-	type RelationModel1 struct {
-		ID uint
-	}
-	type RelationModel2 struct {
-		ID uint
-	}
-	type RelationModel3 struct {
-		ID               uint
-		RelationModel1ID uint
-		RelationModel1   *RelationModel1
-		RelationModel2ID uint
-		RelationModel2   *RelationModel2 `gorm:"-:migration"`
-	}
-
-	var err error
-	_ = DB.Migrator().DropTable(&RelationModel1{}, &RelationModel2{}, &RelationModel3{})
-
-	tx := DB.Session(&gorm.Session{})
-	tx.IgnoreRelationshipsWhenMigrating = true
-
-	err = tx.AutoMigrate(&RelationModel3{})
-	if err != nil {
-		t.Errorf("AutoMigrate err:%v", err)
-	}
-
-	// RelationModel3 should be existed
-	_, err = findColumnType(&RelationModel3{}, "id")
-	AssertEqual(t, nil, err)
-
-	// RelationModel1 should not be existed
-	_, err = findColumnType(&RelationModel1{}, "id")
-	if err == nil {
-		t.Errorf("RelationModel1 should not be migrated")
-	}
-
-	// RelationModel2 should not be existed
-	_, err = findColumnType(&RelationModel2{}, "id")
-	if err == nil {
-		t.Errorf("RelationModel2 should not be migrated")
-	}
-
-	tx.IgnoreRelationshipsWhenMigrating = false
-
-	err = tx.AutoMigrate(&RelationModel3{})
-	if err != nil {
-		t.Errorf("AutoMigrate err:%v", err)
-	}
-
-	// RelationModel3 should be existed
-	_, err = findColumnType(&RelationModel3{}, "id")
-	AssertEqual(t, nil, err)
-
-	// RelationModel1 should be existed
-	_, err = findColumnType(&RelationModel1{}, "id")
-	AssertEqual(t, nil, err)
-
-	// RelationModel2 should not be existed
-	_, err = findColumnType(&RelationModel2{}, "id")
-	if err == nil {
-		t.Errorf("RelationModel2 should not be migrated")
-	}
-}

tests/postgres_test.go

@@ -7,60 +7,8 @@ import (
 	"github.com/google/uuid"
 	"github.com/lib/pq"
 	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
-	. "gorm.io/gorm/utils/tests"
 )
 
-func TestPostgresReturningIDWhichHasStringType(t *testing.T) {
-	if DB.Dialector.Name() != "postgres" {
-		t.Skip()
-	}
-
-	type Yasuo struct {
-		ID        string `gorm:"default:gen_random_uuid()"`
-		Name      string
-		CreatedAt time.Time `gorm:"type:TIMESTAMP WITHOUT TIME ZONE"`
-		UpdatedAt time.Time `gorm:"type:TIMESTAMP WITHOUT TIME ZONE;default:current_timestamp"`
-	}
-
-	if err := DB.Exec("CREATE EXTENSION IF NOT EXISTS pgcrypto;").Error; err != nil {
-		t.Errorf("Failed to create extension pgcrypto, got error %v", err)
-	}
-
-	DB.Migrator().DropTable(&Yasuo{})
-
-	if err := DB.AutoMigrate(&Yasuo{}); err != nil {
-		t.Fatalf("Failed to migrate for uuid default value, got error: %v", err)
-	}
-
-	yasuo := Yasuo{Name: "jinzhu"}
-	if err := DB.Create(&yasuo).Error; err != nil {
-		t.Fatalf("should be able to create data, but got %v", err)
-	}
-
-	if yasuo.ID == "" {
-		t.Fatal("should be able to has ID, but got zero value")
-	}
-
-	var result Yasuo
-	if err := DB.First(&result, "id = ?", yasuo.ID).Error; err != nil || yasuo.Name != "jinzhu" {
-		t.Errorf("No error should happen, but got %v", err)
-	}
-
-	if err := DB.Where("id = $1", yasuo.ID).First(&Yasuo{}).Error; err != nil || yasuo.Name != "jinzhu" {
-		t.Errorf("No error should happen, but got %v", err)
-	}
-
-	yasuo.Name = "jinzhu1"
-	if err := DB.Save(&yasuo).Error; err != nil {
-		t.Errorf("Failed to update date, got error %v", err)
-	}
-
-	if err := DB.First(&result, "id = ?", yasuo.ID).Error; err != nil || yasuo.Name != "jinzhu1" {
-		t.Errorf("No error should happen, but got %v", err)
-	}
-}
-
 func TestPostgres(t *testing.T) {
 	if DB.Dialector.Name() != "postgres" {
 		t.Skip()
@@ -112,45 +60,6 @@ func TestPostgres(t *testing.T) {
 	if err := DB.First(&result, "id = ?", harumph.ID).Error; err != nil || harumph.Name != "jinzhu1" {
 		t.Errorf("No error should happen, but got %v", err)
 	}
-
-	DB.Migrator().DropTable("log_usage")
-
-	if err := DB.Exec(`
-CREATE TABLE public.log_usage (
-    log_id bigint NOT NULL
-);
-
-ALTER TABLE public.log_usage ALTER COLUMN log_id ADD GENERATED BY DEFAULT AS IDENTITY (
-    SEQUENCE NAME public.log_usage_log_id_seq
-    START WITH 1
-    INCREMENT BY 1
-    NO MINVALUE
-    NO MAXVALUE
-    CACHE 1
-);
-	`).Error; err != nil {
-		t.Fatalf("failed to create table, got error %v", err)
-	}
-
-	columns, err := DB.Migrator().ColumnTypes("log_usage")
-	if err != nil {
-		t.Fatalf("failed to get columns, got error %v", err)
-	}
-
-	hasLogID := false
-	for _, column := range columns {
-		if column.Name() == "log_id" {
-			hasLogID = true
-			autoIncrement, ok := column.AutoIncrement()
-			if !ok || !autoIncrement {
-				t.Fatalf("column log_id should be auto incrementment")
-			}
-		}
-	}
-
-	if !hasLogID {
-		t.Fatalf("failed to found column log_id")
-	}
 }
 
 type Post struct {
@@ -189,68 +98,3 @@ func TestMany2ManyWithDefaultValueUUID(t *testing.T) {
 		t.Errorf("Failed, got error: %v", err)
 	}
 }
-
-func TestPostgresOnConstraint(t *testing.T) {
-	if DB.Dialector.Name() != "postgres" {
-		t.Skip()
-	}
-
-	type Thing struct {
-		gorm.Model
-		SomeID  string
-		OtherID string
-		Data    string
-	}
-
-	DB.Migrator().DropTable(&Thing{})
-	DB.Migrator().CreateTable(&Thing{})
-	if err := DB.Exec("ALTER TABLE things ADD CONSTRAINT some_id_other_id_unique UNIQUE (some_id, other_id)").Error; err != nil {
-		t.Error(err)
-	}
-
-	thing := Thing{
-		SomeID:  "1234",
-		OtherID: "1234",
-		Data:    "something",
-	}
-
-	DB.Create(&thing)
-
-	thing2 := Thing{
-		SomeID:  "1234",
-		OtherID: "1234",
-		Data:    "something else",
-	}
-
-	result := DB.Clauses(clause.OnConflict{
-		OnConstraint: "some_id_other_id_unique",
-		UpdateAll:    true,
-	}).Create(&thing2)
-	if result.Error != nil {
-		t.Errorf("creating second thing: %v", result.Error)
-	}
-
-	var things []Thing
-	if err := DB.Find(&things).Error; err != nil {
-		t.Errorf("Failed, got error: %v", err)
-	}
-
-	if len(things) > 1 {
-		t.Errorf("expected 1 thing got more")
-	}
-}
-
-type CompanyNew struct {
-	ID   int
-	Name int
-}
-
-func TestAlterColumnDataType(t *testing.T) {
-	DB.AutoMigrate(Company{})
-
-	if err := DB.Table("companies").Migrator().AlterColumn(CompanyNew{}, "name"); err != nil {
-		t.Fatalf("failed to alter column from string to int, got error %v", err)
-	}
-
-	DB.AutoMigrate(Company{})
-}

tests/prepared_stmt_test.go

@@ -2,8 +2,6 @@ package tests_test
 
 import (
 	"context"
-	"errors"
-	"sync"
 	"testing"
 	"time"
 
@@ -90,107 +88,3 @@ func TestPreparedStmtFromTransaction(t *testing.T) {
 	}
 	tx2.Commit()
 }
-
-func TestPreparedStmtDeadlock(t *testing.T) {
-	tx, err := OpenTestConnection()
-	AssertEqual(t, err, nil)
-
-	sqlDB, _ := tx.DB()
-	sqlDB.SetMaxOpenConns(1)
-
-	tx = tx.Session(&gorm.Session{PrepareStmt: true})
-
-	wg := sync.WaitGroup{}
-	for i := 0; i < 100; i++ {
-		wg.Add(1)
-		go func() {
-			user := User{Name: "jinzhu"}
-			tx.Create(&user)
-
-			var result User
-			tx.First(&result)
-			wg.Done()
-		}()
-	}
-	wg.Wait()
-
-	conn, ok := tx.ConnPool.(*gorm.PreparedStmtDB)
-	AssertEqual(t, ok, true)
-	AssertEqual(t, len(conn.Stmts), 2)
-	for _, stmt := range conn.Stmts {
-		if stmt == nil {
-			t.Fatalf("stmt cannot bee nil")
-		}
-	}
-
-	AssertEqual(t, sqlDB.Stats().InUse, 0)
-}
-
-func TestPreparedStmtError(t *testing.T) {
-	tx, err := OpenTestConnection()
-	AssertEqual(t, err, nil)
-
-	sqlDB, _ := tx.DB()
-	sqlDB.SetMaxOpenConns(1)
-
-	tx = tx.Session(&gorm.Session{PrepareStmt: true})
-
-	wg := sync.WaitGroup{}
-	for i := 0; i < 10; i++ {
-		wg.Add(1)
-		go func() {
-			// err prepare
-			tag := Tag{Locale: "zh"}
-			tx.Table("users").Find(&tag)
-			wg.Done()
-		}()
-	}
-	wg.Wait()
-
-	conn, ok := tx.ConnPool.(*gorm.PreparedStmtDB)
-	AssertEqual(t, ok, true)
-	AssertEqual(t, len(conn.Stmts), 0)
-	AssertEqual(t, sqlDB.Stats().InUse, 0)
-}
-
-func TestPreparedStmtInTransaction(t *testing.T) {
-	user := User{Name: "jinzhu"}
-
-	if err := DB.Transaction(func(tx *gorm.DB) error {
-		tx.Session(&gorm.Session{PrepareStmt: true}).Create(&user)
-		return errors.New("test")
-	}); err == nil {
-		t.Error(err)
-	}
-
-	var result User
-	if err := DB.First(&result, user.ID).Error; err == nil {
-		t.Errorf("Failed, got error: %v", err)
-	}
-}
-
-func TestPreparedStmtReset(t *testing.T) {
-	tx := DB.Session(&gorm.Session{PrepareStmt: true})
-
-	user := *GetUser("prepared_stmt_reset", Config{})
-	tx = tx.Create(&user)
-
-	pdb, ok := tx.ConnPool.(*gorm.PreparedStmtDB)
-	if !ok {
-		t.Fatalf("should assign PreparedStatement Manager back to database when using PrepareStmt mode")
-	}
-
-	pdb.Mux.Lock()
-	if len(pdb.Stmts) == 0 {
-		pdb.Mux.Unlock()
-		t.Fatalf("prepared stmt can not be empty")
-	}
-	pdb.Mux.Unlock()
-
-	pdb.Reset()
-	pdb.Mux.Lock()
-	defer pdb.Mux.Unlock()
-	if len(pdb.Stmts) != 0 {
-		t.Fatalf("prepared stmt should be empty")
-	}
-}

tests/query_test.go

@@ -216,30 +216,6 @@ func TestFind(t *testing.T) {
 		}
 	}
 
-	// test array
-	var models2 [3]User
-	if err := DB.Where("name in (?)", []string{"find"}).Find(&models2).Error; err != nil || len(models2) != 3 {
-		t.Errorf("errors happened when query find with in clause: %v, length: %v", err, len(models2))
-	} else {
-		for idx, user := range users {
-			t.Run("FindWithInClause#"+strconv.Itoa(idx+1), func(t *testing.T) {
-				CheckUser(t, models2[idx], user)
-			})
-		}
-	}
-
-	// test smaller array
-	var models3 [2]User
-	if err := DB.Where("name in (?)", []string{"find"}).Find(&models3).Error; err != nil || len(models3) != 2 {
-		t.Errorf("errors happened when query find with in clause: %v, length: %v", err, len(models3))
-	} else {
-		for idx, user := range users[:2] {
-			t.Run("FindWithInClause#"+strconv.Itoa(idx+1), func(t *testing.T) {
-				CheckUser(t, models3[idx], user)
-			})
-		}
-	}
-
 	var none []User
 	if err := DB.Where("name in (?)", []string{}).Find(&none).Error; err != nil || len(none) != 0 {
 		t.Errorf("errors happened when query find with in clause and zero length parameter: %v, length: %v", err, len(none))
@@ -408,13 +384,6 @@ func TestFindInBatchesWithError(t *testing.T) {
 	if totalBatch != 0 {
 		t.Fatalf("incorrect total batch, expected: %v, got: %v", 0, totalBatch)
 	}
-
-	if result := DB.Omit("id").Where("name = ?", users[0].Name).FindInBatches(&results, 2, func(tx *gorm.DB, batch int) error {
-		totalBatch += batch
-		return nil
-	}); result.Error != gorm.ErrPrimaryKeyRequired {
-		t.Fatal("expected errors to have occurred, but nothing happened")
-	}
 }
 
 func TestFillSmallerStruct(t *testing.T) {
@@ -1366,17 +1335,3 @@ func TestQueryResetNullValue(t *testing.T) {
 	AssertEqual(t, q1, qs[0])
 	AssertEqual(t, q2, qs[1])
 }
-
-func TestQueryError(t *testing.T) {
-	type P struct{}
-	var p1 P
-	err := DB.Take(&p1, 1).Error
-	AssertEqual(t, err, gorm.ErrModelAccessibleFieldsRequired)
-
-	var p2 interface{}
-
-	err = DB.Table("ps").Clauses(clause.Eq{Column: clause.Column{
-		Table: clause.CurrentTable, Name: clause.PrimaryKey,
-	}, Value: 1}).Scan(&p2).Error
-	AssertEqual(t, err, gorm.ErrModelValueRequired)
-}

tests/serializer_test.go

@@ -18,8 +18,6 @@ type SerializerStruct struct {
 	gorm.Model
 	Name                   []byte                 `gorm:"json"`
 	Roles                  Roles                  `gorm:"serializer:json"`
-	Roles2                 *Roles                 `gorm:"serializer:json"`
-	Roles3                 *Roles                 `gorm:"serializer:json;not null"`
 	Contracts              map[string]interface{} `gorm:"serializer:json"`
 	JobInfo                Job                    `gorm:"type:bytes;serializer:gob"`
 	CreatedTime            int64                  `gorm:"serializer:unixtime;type:time"` // store time in db, use int as field type
@@ -110,7 +108,7 @@ func TestSerializer(t *testing.T) {
 	}
 
 	var result SerializerStruct
-	if err := DB.Where("roles2 IS NULL AND roles3 = ?", "").First(&result, data.ID).Error; err != nil {
+	if err := DB.First(&result, data.ID).Error; err != nil {
 		t.Fatalf("failed to query data, got error %v", err)
 	}
 

tests/soft_delete_test.go

@@ -7,7 +7,6 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/jinzhu/now"
 	"gorm.io/gorm"
 	. "gorm.io/gorm/utils/tests"
 )
@@ -40,11 +39,6 @@ func TestSoftDelete(t *testing.T) {
 		t.Fatalf("invalid sql generated, got %v", sql)
 	}
 
-	sql = DB.Session(&gorm.Session{DryRun: true}).Table("user u").Select("name").Find(&User{}).Statement.SQL.String()
-	if !regexp.MustCompile(`SELECT .name. FROM user u WHERE .u.\..deleted_at. IS NULL`).MatchString(sql) {
-		t.Errorf("Table with escape character, got %v", sql)
-	}
-
 	if DB.First(&User{}, "name = ?", user.Name).Error == nil {
 		t.Errorf("Can't find a soft deleted record")
 	}
@@ -99,71 +93,3 @@ func TestDeletedAtOneOr(t *testing.T) {
 		t.Fatalf("invalid sql generated, got %v", actualSQL)
 	}
 }
-
-func TestSoftDeleteZeroValue(t *testing.T) {
-	type SoftDeleteBook struct {
-		ID        uint
-		Name      string
-		Pages     uint
-		DeletedAt gorm.DeletedAt `gorm:"zeroValue:'1970-01-01 00:00:01'"`
-	}
-	DB.Migrator().DropTable(&SoftDeleteBook{})
-	if err := DB.AutoMigrate(&SoftDeleteBook{}); err != nil {
-		t.Fatalf("failed to auto migrate soft delete table")
-	}
-
-	book := SoftDeleteBook{Name: "jinzhu", Pages: 10}
-	DB.Save(&book)
-
-	var count int64
-	if DB.Model(&SoftDeleteBook{}).Where("name = ?", book.Name).Count(&count).Error != nil || count != 1 {
-		t.Errorf("Count soft deleted record, expects: %v, got: %v", 1, count)
-	}
-
-	var pages uint
-	if DB.Model(&SoftDeleteBook{}).Select("pages").Where("name = ?", book.Name).Scan(&pages).Error != nil || pages != book.Pages {
-		t.Errorf("Pages soft deleted record, expects: %v, got: %v", 0, pages)
-	}
-
-	if err := DB.Delete(&book).Error; err != nil {
-		t.Fatalf("No error should happen when soft delete user, but got %v", err)
-	}
-
-	zeroTime, _ := now.Parse("1970-01-01 00:00:01")
-	if book.DeletedAt.Time.Equal(zeroTime) {
-		t.Errorf("book's deleted at should not be zero, DeletedAt: %v", book.DeletedAt)
-	}
-
-	if DB.First(&SoftDeleteBook{}, "name = ?", book.Name).Error == nil {
-		t.Errorf("Can't find a soft deleted record")
-	}
-
-	count = 0
-	if DB.Model(&SoftDeleteBook{}).Where("name = ?", book.Name).Count(&count).Error != nil || count != 0 {
-		t.Errorf("Count soft deleted record, expects: %v, got: %v", 0, count)
-	}
-
-	pages = 0
-	if err := DB.Model(&SoftDeleteBook{}).Select("pages").Where("name = ?", book.Name).Scan(&pages).Error; err != nil || pages != 0 {
-		t.Fatalf("Age soft deleted record, expects: %v, got: %v, err %v", 0, pages, err)
-	}
-
-	if err := DB.Unscoped().First(&SoftDeleteBook{}, "name = ?", book.Name).Error; err != nil {
-		t.Errorf("Should find soft deleted record with Unscoped, but got err %s", err)
-	}
-
-	count = 0
-	if DB.Unscoped().Model(&SoftDeleteBook{}).Where("name = ?", book.Name).Count(&count).Error != nil || count != 1 {
-		t.Errorf("Count soft deleted record, expects: %v, count: %v", 1, count)
-	}
-
-	pages = 0
-	if DB.Unscoped().Model(&SoftDeleteBook{}).Select("pages").Where("name = ?", book.Name).Scan(&pages).Error != nil || pages != book.Pages {
-		t.Errorf("Age soft deleted record, expects: %v, got: %v", 0, pages)
-	}
-
-	DB.Unscoped().Delete(&book)
-	if err := DB.Unscoped().First(&SoftDeleteBook{}, "name = ?", book.Name).Error; !errors.Is(err, gorm.ErrRecordNotFound) {
-		t.Errorf("Can't find permanently deleted record")
-	}
-}

tests/sql_builder_test.go

@@ -29,7 +29,7 @@ func TestRow(t *testing.T) {
 	}
 
 	table := "gorm.users"
-	if DB.Dialector.Name() != "mysql" || isTiDB() {
+	if DB.Dialector.Name() != "mysql" {
 		table = "users" // other databases doesn't support select with `database.table`
 	}
 
@@ -367,7 +367,7 @@ func TestToSQL(t *testing.T) {
 		t.Skip("Skip SQL Server for this test, because it too difference with other dialects.")
 	}
 
-	date, _ := time.ParseInLocation("2006-01-02", "2021-10-18", time.Local)
+	date, _ := time.Parse("2006-01-02", "2021-10-18")
 
 	// find
 	sql := DB.ToSQL(func(tx *gorm.DB) *gorm.DB {
@@ -445,14 +445,6 @@ func TestToSQL(t *testing.T) {
 	if DB.Statement.DryRun || DB.DryRun {
 		t.Fatal("Failed expect DB.DryRun and DB.Statement.ToSQL to be false")
 	}
-
-	// UpdateColumns
-	sql = DB.ToSQL(func(tx *gorm.DB) *gorm.DB {
-		return tx.Raw("SELECT * FROM users ?", clause.OrderBy{
-			Columns: []clause.OrderByColumn{{Column: clause.Column{Name: "id", Raw: true}, Desc: true}},
-		})
-	})
-	assertEqualSQL(t, `SELECT * FROM users ORDER BY id DESC`, sql)
 }
 
 // assertEqualSQL for assert that the sql is equal, this method will ignore quote, and dialect specials.

tests/table_test.go

@@ -5,8 +5,6 @@ import (
 	"testing"
 
 	"gorm.io/gorm"
-	"gorm.io/gorm/schema"
-	"gorm.io/gorm/utils/tests"
 	. "gorm.io/gorm/utils/tests"
 )
 
@@ -147,27 +145,3 @@ func TestTableWithAllFields(t *testing.T) {
 
 	AssertEqual(t, r.Statement.Vars, []interface{}{2, 4, 1, 3})
 }
-
-type UserWithTableNamer struct {
-	gorm.Model
-	Name string
-}
-
-func (UserWithTableNamer) TableName(namer schema.Namer) string {
-	return namer.TableName("user")
-}
-
-func TestTableWithNamer(t *testing.T) {
-	var db, _ = gorm.Open(tests.DummyDialector{}, &gorm.Config{
-		NamingStrategy: schema.NamingStrategy{
-			TablePrefix: "t_",
-		}})
-
-	sql := db.ToSQL(func(tx *gorm.DB) *gorm.DB {
-		return tx.Model(&UserWithTableNamer{}).Find(&UserWithTableNamer{})
-	})
-
-	if !regexp.MustCompile("SELECT \\* FROM `t_users`").MatchString(sql) {
-		t.Errorf("Table with namer, got %v", sql)
-	}
-}

tests/tests_all.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-dialects=("sqlite" "mysql" "postgres" "sqlserver" "tidb")
+dialects=("sqlite" "mysql" "postgres" "sqlserver")
 
 if [[ $(pwd) == *"gorm/tests"* ]]; then
   cd ..

tests/tests_test.go

@@ -21,7 +21,6 @@ var (
 	mysqlDSN     = "gorm:gorm@tcp(localhost:9910)/gorm?charset=utf8&parseTime=True&loc=Local"
 	postgresDSN  = "user=gorm password=gorm dbname=gorm host=localhost port=9920 sslmode=disable TimeZone=Asia/Shanghai"
 	sqlserverDSN = "sqlserver://gorm:LoremIpsum86@localhost:9930?database=gorm"
-	tidbDSN      = "root:@tcp(localhost:9940)/test?charset=utf8&parseTime=True&loc=Local"
 )
 
 func init() {
@@ -81,12 +80,6 @@ func OpenTestConnection() (db *gorm.DB, err error) {
 			dbDSN = sqlserverDSN
 		}
 		db, err = gorm.Open(sqlserver.Open(dbDSN), &gorm.Config{})
-	case "tidb":
-		log.Println("testing tidb...")
-		if dbDSN == "" {
-			dbDSN = tidbDSN
-		}
-		db, err = gorm.Open(mysql.Open(dbDSN), &gorm.Config{})
 	default:
 		log.Println("testing sqlite3...")
 		db, err = gorm.Open(sqlite.Open(filepath.Join(os.TempDir(), "gorm.db")), &gorm.Config{})

tests/tracer_test.go

@@ -1,34 +0,0 @@
-package tests_test
-
-import (
-	"context"
-	"time"
-
-	"gorm.io/gorm/logger"
-)
-
-type Tracer struct {
-	Logger logger.Interface
-	Test   func(ctx context.Context, begin time.Time, fc func() (sql string, rowsAffected int64), err error)
-}
-
-func (S Tracer) LogMode(level logger.LogLevel) logger.Interface {
-	return S.Logger.LogMode(level)
-}
-
-func (S Tracer) Info(ctx context.Context, s string, i ...interface{}) {
-	S.Logger.Info(ctx, s, i...)
-}
-
-func (S Tracer) Warn(ctx context.Context, s string, i ...interface{}) {
-	S.Logger.Warn(ctx, s, i...)
-}
-
-func (S Tracer) Error(ctx context.Context, s string, i ...interface{}) {
-	S.Logger.Error(ctx, s, i...)
-}
-
-func (S Tracer) Trace(ctx context.Context, begin time.Time, fc func() (sql string, rowsAffected int64), err error) {
-	S.Logger.Trace(ctx, begin, fc, err)
-	S.Test(ctx, begin, fc, err)
-}

tests/transaction_test.go

@@ -102,7 +102,7 @@ func TestTransactionWithBlock(t *testing.T) {
 		return errors.New("the error message")
 	})
 
-	if err != nil && err.Error() != "the error message" {
+	if err.Error() != "the error message" {
 		t.Fatalf("Transaction return error will equal the block returns error")
 	}
 

utils/tests/dummy_dialecter.go

@@ -2,7 +2,6 @@ package tests
 
 import (
 	"gorm.io/gorm"
-	"gorm.io/gorm/callbacks"
 	"gorm.io/gorm/clause"
 	"gorm.io/gorm/logger"
 	"gorm.io/gorm/schema"
@@ -14,14 +13,7 @@ func (DummyDialector) Name() string {
 	return "dummy"
 }
 
-func (DummyDialector) Initialize(db *gorm.DB) error {
-	callbacks.RegisterDefaultCallbacks(db, &callbacks.Config{
-		CreateClauses:        []string{"INSERT", "VALUES", "ON CONFLICT", "RETURNING"},
-		UpdateClauses:        []string{"UPDATE", "SET", "WHERE", "RETURNING"},
-		DeleteClauses:        []string{"DELETE", "FROM", "WHERE", "RETURNING"},
-		LastInsertIDReversed: true,
-	})
-
+func (DummyDialector) Initialize(*gorm.DB) error {
 	return nil
 }
 

utils/utils.go

@@ -3,8 +3,8 @@ package utils
 import (
 	"database/sql/driver"
 	"fmt"
-	"path/filepath"
 	"reflect"
+	"regexp"
 	"runtime"
 	"strconv"
 	"strings"
@@ -16,18 +16,7 @@ var gormSourceDir string
 func init() {
 	_, file, _, _ := runtime.Caller(0)
 	// compatible solution to get gorm source directory with various operating systems
-	gormSourceDir = sourceDir(file)
-}
-
-func sourceDir(file string) string {
-	dir := filepath.Dir(file)
-	dir = filepath.Dir(dir)
-
-	s := filepath.Dir(dir)
-	if filepath.Base(s) != "gorm.io" {
-		s = dir
-	}
-	return filepath.ToSlash(s) + "/"
+	gormSourceDir = regexp.MustCompile(`utils.utils\.go`).ReplaceAllString(file, "")
 }
 
 // FileWithLineNum return the file name and line number of the current file

utils/utils_test.go

@@ -1,13 +1,8 @@
 package utils
 
 import (
-	"database/sql"
-	"database/sql/driver"
-	"errors"
-	"math"
 	"strings"
 	"testing"
-	"time"
 )
 
 func TestIsValidDBNameChar(t *testing.T) {
@@ -18,29 +13,6 @@ func TestIsValidDBNameChar(t *testing.T) {
 	}
 }
 
-func TestCheckTruth(t *testing.T) {
-	checkTruthTests := []struct {
-		v   string
-		out bool
-	}{
-		{"123", true},
-		{"true", true},
-		{"", false},
-		{"false", false},
-		{"False", false},
-		{"FALSE", false},
-		{"\u0046alse", false},
-	}
-
-	for _, test := range checkTruthTests {
-		t.Run(test.v, func(t *testing.T) {
-			if out := CheckTruth(test.v); out != test.out {
-				t.Errorf("CheckTruth(%s) want: %t, got: %t", test.v, test.out, out)
-			}
-		})
-	}
-}
-
 func TestToStringKey(t *testing.T) {
 	cases := []struct {
 		values []interface{}
@@ -57,81 +29,3 @@ func TestToStringKey(t *testing.T) {
 		}
 	}
 }
-
-func TestContains(t *testing.T) {
-	containsTests := []struct {
-		name  string
-		elems []string
-		elem  string
-		out   bool
-	}{
-		{"exists", []string{"1", "2", "3"}, "1", true},
-		{"not exists", []string{"1", "2", "3"}, "4", false},
-	}
-	for _, test := range containsTests {
-		t.Run(test.name, func(t *testing.T) {
-			if out := Contains(test.elems, test.elem); test.out != out {
-				t.Errorf("Contains(%v, %s) want: %t, got: %t", test.elems, test.elem, test.out, out)
-			}
-		})
-	}
-}
-
-type ModifyAt sql.NullTime
-
-// Value return a Unix time.
-func (n ModifyAt) Value() (driver.Value, error) {
-	if !n.Valid {
-		return nil, nil
-	}
-	return n.Time.Unix(), nil
-}
-
-func TestAssertEqual(t *testing.T) {
-	now := time.Now()
-	assertEqualTests := []struct {
-		name     string
-		src, dst interface{}
-		out      bool
-	}{
-		{"error equal", errors.New("1"), errors.New("1"), true},
-		{"error not equal", errors.New("1"), errors.New("2"), false},
-		{"driver.Valuer equal", ModifyAt{Time: now, Valid: true}, ModifyAt{Time: now, Valid: true}, true},
-		{"driver.Valuer not equal", ModifyAt{Time: now, Valid: true}, ModifyAt{Time: now.Add(time.Second), Valid: true}, false},
-	}
-	for _, test := range assertEqualTests {
-		t.Run(test.name, func(t *testing.T) {
-			if out := AssertEqual(test.src, test.dst); test.out != out {
-				t.Errorf("AssertEqual(%v, %v) want: %t, got: %t", test.src, test.dst, test.out, out)
-			}
-		})
-	}
-}
-
-func TestToString(t *testing.T) {
-	tests := []struct {
-		name string
-		in   interface{}
-		out  string
-	}{
-		{"int", math.MaxInt64, "9223372036854775807"},
-		{"int8", int8(math.MaxInt8), "127"},
-		{"int16", int16(math.MaxInt16), "32767"},
-		{"int32", int32(math.MaxInt32), "2147483647"},
-		{"int64", int64(math.MaxInt64), "9223372036854775807"},
-		{"uint", uint(math.MaxUint64), "18446744073709551615"},
-		{"uint8", uint8(math.MaxUint8), "255"},
-		{"uint16", uint16(math.MaxUint16), "65535"},
-		{"uint32", uint32(math.MaxUint32), "4294967295"},
-		{"uint64", uint64(math.MaxUint64), "18446744073709551615"},
-		{"string", "abc", "abc"},
-		{"other", true, ""},
-	}
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			if out := ToString(test.in); test.out != out {
-				t.Fatalf("ToString(%v) want: %s, got: %s", test.in, test.out, out)
-			}
-		})
-	}
-}

utils/utils_unix_test.go

@@ -1,38 +0,0 @@
-//go:build unix
-// +build unix
-
-package utils
-
-import (
-	"testing"
-)
-
-func TestSourceDir(t *testing.T) {
-	cases := []struct {
-		file string
-		want string
-	}{
-		{
-			file: "/Users/name/go/pkg/mod/gorm.io/gorm@v1.2.3/utils/utils.go",
-			want: "/Users/name/go/pkg/mod/gorm.io/",
-		},
-		{
-			file: "/go/work/proj/gorm/utils/utils.go",
-			want: "/go/work/proj/gorm/",
-		},
-		{
-			file: "/go/work/proj/gorm_alias/utils/utils.go",
-			want: "/go/work/proj/gorm_alias/",
-		},
-		{
-			file: "/go/work/proj/my.gorm.io/gorm@v1.2.3/utils/utils.go",
-			want: "/go/work/proj/my.gorm.io/gorm@v1.2.3/",
-		},
-	}
-	for _, c := range cases {
-		s := sourceDir(c.file)
-		if s != c.want {
-			t.Fatalf("%s: expected %s, got %s", c.file, c.want, s)
-		}
-	}
-}

utils/utils_windows_test.go

@@ -1,35 +0,0 @@
-package utils
-
-import (
-	"testing"
-)
-
-func TestSourceDir(t *testing.T) {
-	cases := []struct {
-		file string
-		want string
-	}{
-		{
-			file: `C:/Users/name/go/pkg/mod/gorm.io/gorm@v1.2.3/utils/utils.go`,
-			want: `C:/Users/name/go/pkg/mod/gorm.io/`,
-		},
-		{
-			file: `C:/go/work/proj/gorm/utils/utils.go`,
-			want: `C:/go/work/proj/gorm/`,
-		},
-		{
-			file: `C:/go/work/proj/gorm_alias/utils/utils.go`,
-			want: `C:/go/work/proj/gorm_alias/`,
-		},
-		{
-			file: `C:/go/work/proj/my.gorm.io/gorm@v1.2.3/utils/utils.go`,
-			want: `C:/go/work/proj/my.gorm.io/gorm@v1.2.3/`,
-		},
-	}
-	for _, c := range cases {
-		s := sourceDir(c.file)
-		if s != c.want {
-			t.Fatalf("%s: expected %s, got %s", c.file, c.want, s)
-		}
-	}
-}