Compare commits

...

23 Commits

Author SHA1 Message Date
835ff3923c Use case-insensitive comparison for primary key detection in pgsql driver
Co-authored-by: gqcn <26347176+gqcn@users.noreply.github.com>
2025-12-08 11:24:26 +00:00
3bd9621986 Initial plan 2025-12-08 11:19:34 +00:00
ffb3aacb5b Update contrib/drivers/mssql/mssql_do_insert.go
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-12-08 19:18:21 +08:00
141b5c1778 Update contrib/drivers/mssql/mssql_z_unit_basic_test.go
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-12-08 19:18:10 +08:00
73b91ed763 Update contrib/drivers/mssql/mssql_do_insert.go
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-12-08 19:17:55 +08:00
36d63354e7 Update contrib/drivers/dm/dm_do_insert.go
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-12-08 19:17:41 +08:00
f6a7fd23f1 fix(gendao): Added support for UUID types (#4548)
`gf gen
dao`生成`entity`时支持数据库`uuid`类型字段生成`github.com/google/uuid`的`uuid.UUID`类型字段
2025-12-08 16:48:59 +08:00
17906e31cb up 2025-12-08 16:36:04 +08:00
bfe31a4be7 merge 2025-12-08 16:32:23 +08:00
5f664f331a up 2025-12-08 16:28:34 +08:00
4080452ead fix(contrib/drivers/pgsql): Fixed table field call issue in primary key acquisition logic (#4546)
`pgsql driver`中`getPrimaryKeys`未使用现有缓存,导致每次`insert`都会重新查询表字段
2025-12-08 16:27:17 +08:00
67a8a28a18 Update contrib/drivers/pgsql/pgsql_do_insert.go
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-12-08 15:01:01 +08:00
d8fa0a7922 Update contrib/drivers/pgsql/pgsql_do_insert.go
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-12-08 15:00:52 +08:00
b7cd39a8b8 up 2025-12-08 14:56:21 +08:00
01cd4a3384 up 2025-12-08 14:55:19 +08:00
111f8b3264 Update contrib/drivers/pgsql/pgsql_z_unit_upsert_test.go
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-12-08 14:54:48 +08:00
ba44475765 Update contrib/drivers/pgsql/pgsql_do_insert.go
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-12-08 14:54:26 +08:00
99536c8bef up 2025-12-08 14:37:35 +08:00
91e3f1eab1 Merge branch 'master' of github.com:gogf/gf into feat/gdb-pgsql-replace 2025-12-08 11:40:45 +08:00
ffe65d9d4a merge master 2025-12-04 20:41:28 +08:00
8723999afc up 2025-12-04 20:33:08 +08:00
0d122d6fee up 2025-12-04 17:33:57 +08:00
63c2bb7c86 feat(contrib/drivers/dm): add Replace/InsertIgnore support for dm 2025-12-04 17:29:39 +08:00
18 changed files with 355 additions and 124 deletions

View File

@ -54,7 +54,7 @@ jobs:
# Service containers to run with `code-test`
services:
# Etcd service.
# docker run -d --name etcd -p 2379:2379 -e ALLOW_NONE_AUTHENTICATION=yes bitnamilegacy/etcd:3.4.24
# docker run -p 2379:2379 -e ALLOW_NONE_AUTHENTICATION=yes bitnamilegacy/etcd:3.4.24
etcd:
image: bitnamilegacy/etcd:3.4.24
env:
@ -75,7 +75,7 @@ jobs:
- 6379:6379
# MySQL backend server.
# docker run -d --name mysql \
# docker run \
# -p 3306:3306 \
# -e MYSQL_DATABASE=test \
# -e MYSQL_ROOT_PASSWORD=12345678 \
@ -89,7 +89,7 @@ jobs:
- 3306:3306
# MariaDb backend server.
# docker run -d --name mariadb \
# docker run \
# -p 3307:3306 \
# -e MYSQL_DATABASE=test \
# -e MYSQL_ROOT_PASSWORD=12345678 \
@ -103,7 +103,7 @@ jobs:
- 3307:3306
# PostgreSQL backend server.
# docker run -d --name postgres \
# docker run \
# -p 5432:5432 \
# -e POSTGRES_PASSWORD=12345678 \
# -e POSTGRES_USER=postgres \
@ -150,7 +150,7 @@ jobs:
--health-retries 10
# ClickHouse backend server.
# docker run -d --name clickhouse \
# docker run \
# -p 9000:9000 -p 8123:8123 -p 9001:9001 \
# clickhouse/clickhouse-server:24.11.1.2557-alpine
clickhouse-server:
@ -161,7 +161,7 @@ jobs:
- 9001:9001
# Polaris backend server.
# docker run -d --name polaris \
# docker run \
# -p 8090:8090 -p 8091:8091 -p 8093:8093 -p 9090:9090 -p 9091:9091 \
# polarismesh/polaris-standalone:v1.17.2
polaris:

View File

@ -104,6 +104,10 @@ var (
"smallmoney": {
Type: "float64",
},
"uuid": {
Type: "uuid.UUID",
Import: "github.com/google/uuid",
},
}
// tablewriter Options

View File

@ -69,10 +69,6 @@ import _ "github.com/gogf/gf/contrib/drivers/sqlitecgo/v2"
import _ "github.com/gogf/gf/contrib/drivers/pgsql/v2"
```
Note:
- It does not support `Replace` features.
### SQL Server
```go
@ -81,7 +77,6 @@ import _ "github.com/gogf/gf/contrib/drivers/mssql/v2"
Note:
- It does not support `Replace` features.
- It supports server version >= `SQL Server2005`
- It ONLY supports datetime2 and datetimeoffset types for auto handling created_at/updated_at/deleted_at columns, because datetime type does not support microseconds precision when column value is passed as string.

View File

@ -16,6 +16,7 @@ import (
)
// DoInsert inserts or updates data for given table.
// The list parameter must contain at least one record, which was previously validated.
func (d *Driver) DoInsert(
ctx context.Context, link gdb.Link, table string, list gdb.List, option gdb.DoInsertOption,
) (result sql.Result, err error) {

View File

@ -20,6 +20,7 @@ import (
)
// DoInsert inserts or updates data for given table.
// The list parameter must contain at least one record, which was previously validated.
func (d *Driver) DoInsert(
ctx context.Context, link gdb.Link, table string, list gdb.List, option gdb.DoInsertOption,
) (result sql.Result, err error) {
@ -60,16 +61,12 @@ func (d *Driver) doInsertIgnore(ctx context.Context,
// When withUpdate is false, it performs insert ignore (insert only when no conflict).
func (d *Driver) doMergeInsert(
ctx context.Context,
link gdb.Link,
table string,
list gdb.List,
option gdb.DoInsertOption,
withUpdate bool,
link gdb.Link, table string, list gdb.List, option gdb.DoInsertOption, withUpdate bool,
) (result sql.Result, err error) {
// If OnConflict is not specified, automatically get the primary key of the table
conflictKeys := option.OnConflict
if len(conflictKeys) == 0 {
conflictKeys, err = d.getPrimaryKeys(ctx, table)
primaryKeys, err := d.Core.GetPrimaryKeys(ctx, table)
if err != nil {
return nil, gerror.WrapCode(
gcode.CodeInternalError,
@ -77,29 +74,33 @@ func (d *Driver) doMergeInsert(
`failed to get primary keys for table`,
)
}
if len(conflictKeys) == 0 {
return nil, gerror.NewCode(
foundPrimaryKey := false
for _, primaryKey := range primaryKeys {
for dataKey := range list[0] {
if strings.EqualFold(dataKey, primaryKey) {
foundPrimaryKey = true
break
}
}
if foundPrimaryKey {
break
}
}
if !foundPrimaryKey {
return nil, gerror.NewCodef(
gcode.CodeMissingParameter,
`Please specify conflict columns or ensure the table has a primary key`,
`Replace/Save/InsertIgnore operation requires conflict detection: `+
`either specify OnConflict() columns or ensure table '%s' has a primary key in the data`,
table,
)
}
}
if len(list) == 0 {
opName := "Save"
if !withUpdate {
opName = "InsertIgnore"
}
return nil, gerror.NewCodef(
gcode.CodeInvalidRequest, `%s operation list is empty by dm driver`, opName,
)
conflictKeys = primaryKeys
}
var (
one = list[0]
oneLen = len(one)
charL, charR = d.GetChars()
one = list[0]
oneLen = len(one)
charL, charR = d.GetChars()
conflictKeySet = gset.New(false)
// queryHolders: Handle data with Holder that need to be merged
@ -155,24 +156,6 @@ func (d *Driver) doMergeInsert(
return batchResult, nil
}
// getPrimaryKeys retrieves the primary key field names of the table as a slice of strings.
// This method extracts primary key information from TableFields.
func (d *Driver) getPrimaryKeys(ctx context.Context, table string) ([]string, error) {
tableFields, err := d.TableFields(ctx, table)
if err != nil {
return nil, err
}
var primaryKeys []string
for _, field := range tableFields {
if field.Key == "PRI" {
primaryKeys = append(primaryKeys, field.Name)
}
}
return primaryKeys, nil
}
// parseSqlForMerge generates MERGE statement for DM database.
// When updateValues is empty, it only inserts (INSERT IGNORE behavior).
// When updateValues is provided, it performs upsert (INSERT or UPDATE).

View File

@ -167,8 +167,8 @@ func (r *InsertResult) RowsAffected() (int64, error) {
}
// GetInsertOutputSql gen get last_insert_id code
func (m *Driver) GetInsertOutputSql(ctx context.Context, table string) string {
fds, errFd := m.GetDB().TableFields(ctx, table)
func (d *Driver) GetInsertOutputSql(ctx context.Context, table string) string {
fds, errFd := d.GetDB().TableFields(ctx, table)
if errFd != nil {
return ""
}

View File

@ -20,17 +20,51 @@ import (
)
// DoInsert inserts or updates data for given table.
func (d *Driver) DoInsert(ctx context.Context, link gdb.Link, table string, list gdb.List, option gdb.DoInsertOption) (result sql.Result, err error) {
// The list parameter must contain at least one record, which was previously validated.
func (d *Driver) DoInsert(
ctx context.Context, link gdb.Link, table string, list gdb.List, option gdb.DoInsertOption,
) (result sql.Result, err error) {
switch option.InsertOption {
case gdb.InsertOptionSave:
case
gdb.InsertOptionSave,
gdb.InsertOptionReplace:
// MSSQL does not support REPLACE INTO syntax.
// Convert Replace to Save operation, using MERGE statement.
// Auto-detect primary keys if OnConflict is not specified.
if len(option.OnConflict) == 0 {
primaryKeys, err := d.Core.GetPrimaryKeys(ctx, table)
if err != nil {
return nil, gerror.WrapCode(
gcode.CodeInternalError,
err,
`failed to get primary keys for Save/Replace operation`,
)
}
foundPrimaryKey := false
for _, primaryKey := range primaryKeys {
for dataKey := range list[0] {
if strings.EqualFold(dataKey, primaryKey) {
foundPrimaryKey = true
break
}
}
if foundPrimaryKey {
break
}
}
if !foundPrimaryKey {
return nil, gerror.NewCodef(
gcode.CodeMissingParameter,
`Save/Replace operation requires conflict detection: `+
`either specify OnConflict() columns or ensure table '%s' has a primary key in the data`,
table,
)
}
option.OnConflict = primaryKeys
}
// Convert to Save operation
return d.doSave(ctx, link, table, list, option)
case gdb.InsertOptionReplace:
return nil, gerror.NewCode(
gcode.CodeNotSupported,
`Replace operation is not supported by mssql driver`,
)
default:
return d.Core.DoInsert(ctx, link, table, list, option)
}
@ -40,23 +74,10 @@ func (d *Driver) DoInsert(ctx context.Context, link gdb.Link, table string, list
func (d *Driver) doSave(ctx context.Context,
link gdb.Link, table string, list gdb.List, option gdb.DoInsertOption,
) (result sql.Result, err error) {
if len(option.OnConflict) == 0 {
return nil, gerror.NewCode(
gcode.CodeMissingParameter, `Please specify conflict columns`,
)
}
if len(list) == 0 {
return nil, gerror.NewCode(
gcode.CodeInvalidRequest, `Save operation list is empty by mssql driver`,
)
}
var (
one = list[0]
oneLen = len(one)
charL, charR = d.GetChars()
one = list[0]
oneLen = len(one)
charL, charR = d.GetChars()
conflictKeys = option.OnConflict
conflictKeySet = gset.New(false)
@ -127,7 +148,10 @@ func parseSqlForUpsert(table string,
insertValueStr = strings.Join(insertValues, ",")
updateValueStr = strings.Join(updateValues, ",")
duplicateKeyStr string
pattern = gstr.Trim(`MERGE INTO %s T1 USING (VALUES(%s)) T2 (%s) ON (%s) WHEN NOT MATCHED THEN INSERT(%s) VALUES (%s) WHEN MATCHED THEN UPDATE SET %s;`)
pattern = gstr.Trim(
`MERGE INTO %s T1 USING (VALUES(%s)) T2 (%s) ON (%s) WHEN NOT MATCHED ` +
`THEN INSERT(%s) VALUES (%s) WHEN MATCHED THEN UPDATE SET %s;`,
)
)
for index, keys := range duplicateKey {

View File

@ -138,15 +138,17 @@ func TestDoInsert(t *testing.T) {
i := 10
data := g.Map{
"id": i,
// "id": i,
"passport": fmt.Sprintf(`t%d`, i),
"password": fmt.Sprintf(`p%d`, i),
"nickname": fmt.Sprintf(`T%d`, i),
"create_time": gtime.Now(),
}
// Save without OnConflict should fail (missing conflict columns)
_, err := db.Save(context.Background(), "t_user", data, 10)
gtest.AssertNE(err, nil)
// Replace should fail because primary key 'id' is not in the data
_, err = db.Replace(context.Background(), "t_user", data, 10)
gtest.AssertNE(err, nil)
})

View File

@ -2658,14 +2658,53 @@ func Test_Model_Replace(t *testing.T) {
defer dropTable(table)
gtest.C(t, func(t *gtest.T) {
_, err := db.Model(table).Data(g.Map{
// Insert initial record
result, err := db.Model(table).Data(g.Map{
"id": 1,
"passport": "t1",
"password": "pass1",
"nickname": "T1",
"create_time": "2018-10-24 10:00:00",
}).Insert()
t.AssertNil(err)
n, _ := result.RowsAffected()
t.Assert(n, 1)
// Replace with new data (should update existing record using MERGE)
result, err = db.Model(table).Data(g.Map{
"id": 1,
"passport": "t11",
"password": "25d55ad283aa400af464c76d713c07ad",
"nickname": "T11",
"create_time": "2018-10-24 10:00:00",
}).Replace()
t.Assert(err, "Replace operation is not supported by mssql driver")
t.AssertNil(err)
n, _ = result.RowsAffected()
t.Assert(n, 1)
// Verify the data was replaced
one, err := db.Model(table).WherePri(1).One()
t.AssertNil(err)
t.Assert(one["PASSPORT"].String(), "t11")
t.Assert(one["NICKNAME"].String(), "T11")
// Replace with non-existing record (should insert new record)
result, err = db.Model(table).Data(g.Map{
"id": 2,
"passport": "t222",
"password": "pass2",
"nickname": "T222",
"create_time": "2018-10-24 11:00:00",
}).Replace()
t.AssertNil(err)
n, _ = result.RowsAffected()
t.Assert(n, 1) // MERGE reports: 1 for insert
// Verify the new record was inserted
one, err = db.Model(table).WherePri(2).One()
t.AssertNil(err)
t.Assert(one["PASSPORT"].String(), "t222")
t.Assert(one["NICKNAME"].String(), "T222")
})
}

View File

@ -21,6 +21,7 @@ import (
)
// DoInsert inserts or updates data for given table.
// The list parameter must contain at least one record, which was previously validated.
func (d *Driver) DoInsert(
ctx context.Context, link gdb.Link, table string, list gdb.List, option gdb.DoInsertOption,
) (result sql.Result, err error) {
@ -33,6 +34,7 @@ func (d *Driver) DoInsert(
gcode.CodeNotSupported,
`Replace operation is not supported by oracle driver`,
)
default:
}
var (
keys []string
@ -93,7 +95,7 @@ func (d *Driver) DoInsert(
return batchResult, nil
}
// doSave support upsert for Oracle
// doSave support upsert for Oracle.
func (d *Driver) doSave(ctx context.Context,
link gdb.Link, table string, list gdb.List, option gdb.DoInsertOption,
) (result sql.Result, err error) {
@ -103,17 +105,10 @@ func (d *Driver) doSave(ctx context.Context,
)
}
if len(list) == 0 {
return nil, gerror.NewCode(
gcode.CodeInvalidRequest, `Save operation list is empty by oracle driver`,
)
}
var (
one = list[0]
oneLen = len(one)
charL, charR = d.GetChars()
one = list[0]
oneLen = len(one)
charL, charR = d.GetChars()
conflictKeys = option.OnConflict
conflictKeySet = gset.New(false)

View File

@ -9,32 +9,73 @@ package pgsql
import (
"context"
"database/sql"
"strings"
"github.com/gogf/gf/v2/database/gdb"
"github.com/gogf/gf/v2/errors/gcode"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/text/gstr"
)
// DoInsert inserts or updates data for given table.
func (d *Driver) DoInsert(ctx context.Context, link gdb.Link, table string, list gdb.List, option gdb.DoInsertOption) (result sql.Result, err error) {
// The list parameter must contain at least one record, which was previously validated.
func (d *Driver) DoInsert(
ctx context.Context,
link gdb.Link, table string, list gdb.List, option gdb.DoInsertOption,
) (result sql.Result, err error) {
switch option.InsertOption {
case gdb.InsertOptionReplace:
return nil, gerror.NewCode(
gcode.CodeNotSupported,
`Replace operation is not supported by pgsql driver`,
)
case
gdb.InsertOptionSave,
gdb.InsertOptionReplace:
// PostgreSQL does not support REPLACE INTO syntax, use Save (ON CONFLICT ... DO UPDATE) instead.
// Automatically detect primary keys if OnConflict is not specified.
if len(option.OnConflict) == 0 {
primaryKeys, err := d.Core.GetPrimaryKeys(ctx, table)
if err != nil {
return nil, gerror.WrapCode(
gcode.CodeInternalError,
err,
`failed to get primary keys for Save/Replace operation`,
)
}
foundPrimaryKey := false
for _, conflictKey := range primaryKeys {
for dataKey := range list[0] {
if strings.EqualFold(dataKey, conflictKey) {
foundPrimaryKey = true
break
}
}
if foundPrimaryKey {
break
}
}
if !foundPrimaryKey {
return nil, gerror.NewCodef(
gcode.CodeMissingParameter,
`Replace/Save operation requires conflict detection: `+
`either specify OnConflict() columns or ensure table '%s' has a primary key in the data`,
table,
)
}
option.OnConflict = primaryKeys
}
// Treat Replace as Save operation
option.InsertOption = gdb.InsertOptionSave
case gdb.InsertOptionDefault:
tableFields, err := d.GetCore().GetDB().TableFields(ctx, table)
if err == nil {
for _, field := range tableFields {
if field.Key == "pri" {
if gstr.Equal(field.Key, "pri") {
pkField := *field
ctx = context.WithValue(ctx, internalPrimaryKeyInCtx, pkField)
break
}
}
}
default:
}
return d.Core.DoInsert(ctx, link, table, list, option)
}

View File

@ -80,10 +80,22 @@ func (d *Driver) TableFields(ctx context.Context, table string, schema ...string
}
continue
}
var (
fieldType string
dataType = m["type"].String()
dataLength = m["length"].Int()
)
if dataLength > 0 {
fieldType = fmt.Sprintf("%s(%d)", dataType, dataLength)
} else {
fieldType = dataType
}
fields[name] = &gdb.TableField{
Index: index,
Name: name,
Type: m["type"].String(),
Type: fieldType,
Null: !m["null"].Bool(),
Key: m["key"].String(),
Default: m["default_value"].Val(),

View File

@ -90,7 +90,7 @@ func Test_DB_Save(t *testing.T) {
"create_time": gtime.Now().String(),
}
_, err := db.Save(ctx, "t_user", data, 10)
gtest.AssertNE(err, nil)
gtest.AssertNil(err)
})
}
@ -99,6 +99,7 @@ func Test_DB_Replace(t *testing.T) {
createTable("t_user")
defer dropTable("t_user")
// Insert initial record
i := 10
data := g.Map{
"id": i,
@ -107,8 +108,26 @@ func Test_DB_Replace(t *testing.T) {
"nickname": fmt.Sprintf(`T%d`, i),
"create_time": gtime.Now().String(),
}
_, err := db.Replace(ctx, "t_user", data, 10)
gtest.AssertNE(err, nil)
_, err := db.Insert(ctx, "t_user", data)
gtest.AssertNil(err)
// Replace with new data
data2 := g.Map{
"id": i,
"passport": fmt.Sprintf(`t%d_new`, i),
"password": fmt.Sprintf(`p%d_new`, i),
"nickname": fmt.Sprintf(`T%d_new`, i),
"create_time": gtime.Now().String(),
}
_, err = db.Replace(ctx, "t_user", data2)
gtest.AssertNil(err)
// Verify the data was replaced
one, err := db.GetOne(ctx, fmt.Sprintf("SELECT * FROM t_user WHERE id=?"), i)
gtest.AssertNil(err)
gtest.Assert(one["passport"].String(), fmt.Sprintf(`t%d_new`, i))
gtest.Assert(one["password"].String(), fmt.Sprintf(`p%d_new`, i))
gtest.Assert(one["nickname"].String(), fmt.Sprintf(`T%d_new`, i))
})
}
@ -304,10 +323,10 @@ func Test_DB_TableFields(t *testing.T) {
var expect = map[string][]any{
// []string: Index Type Null Key Default Comment
// id is bigserial so the default is a pgsql function
"id": {0, "int8", false, "pri", fmt.Sprintf("nextval('%s_id_seq'::regclass)", table), ""},
"passport": {1, "varchar", false, "", nil, ""},
"password": {2, "varchar", false, "", nil, ""},
"nickname": {3, "varchar", false, "", nil, ""},
"id": {0, "int8(64)", false, "pri", fmt.Sprintf("nextval('%s_id_seq'::regclass)", table), ""},
"passport": {1, "varchar(45)", false, "", nil, ""},
"password": {2, "varchar(32)", false, "", nil, ""},
"nickname": {3, "varchar(45)", false, "", nil, ""},
"create_time": {4, "timestamp", false, "", nil, ""},
}
@ -410,13 +429,13 @@ func Test_DB_TableFields_DuplicateConstraints(t *testing.T) {
t.AssertNE(fields["id"], nil)
t.Assert(fields["id"].Key, "pri")
t.Assert(fields["id"].Name, "id")
t.Assert(fields["id"].Type, "int8")
t.Assert(fields["id"].Type, "int8(64)")
// Verify email field has unique constraint
t.AssertNE(fields["email"], nil)
t.Assert(fields["email"].Key, "uni")
t.Assert(fields["email"].Name, "email")
t.Assert(fields["email"].Type, "varchar")
t.Assert(fields["email"].Type, "varchar(100)")
// Verify username field has no constraint
t.AssertNE(fields["username"], nil)

View File

@ -73,18 +73,18 @@ func Test_TableFields_Types(t *testing.T) {
t.AssertNil(err)
// Test integer type names
t.Assert(fields["col_int2"].Type, "int2")
t.Assert(fields["col_int4"].Type, "int4")
t.Assert(fields["col_int8"].Type, "int8")
t.Assert(fields["col_int2"].Type, "int2(16)")
t.Assert(fields["col_int4"].Type, "int4(32)")
t.Assert(fields["col_int8"].Type, "int8(64)")
// Test float type names
t.Assert(fields["col_float4"].Type, "float4")
t.Assert(fields["col_float8"].Type, "float8")
t.Assert(fields["col_numeric"].Type, "numeric")
t.Assert(fields["col_float4"].Type, "float4(24)")
t.Assert(fields["col_float8"].Type, "float8(53)")
t.Assert(fields["col_numeric"].Type, "numeric(10)")
// Test character type names
t.Assert(fields["col_char"].Type, "bpchar")
t.Assert(fields["col_varchar"].Type, "varchar")
t.Assert(fields["col_char"].Type, "bpchar(10)")
t.Assert(fields["col_varchar"].Type, "varchar(100)")
t.Assert(fields["col_text"].Type, "text")
// Test boolean type name

View File

@ -334,14 +334,53 @@ func Test_Model_Replace(t *testing.T) {
defer dropTable(table)
gtest.C(t, func(t *gtest.T) {
_, err := db.Model(table).Data(g.Map{
// Insert initial record
result, err := db.Model(table).Data(g.Map{
"id": 1,
"passport": "t1",
"password": "pass1",
"nickname": "T1",
"create_time": "2018-10-24 10:00:00",
}).Insert()
t.AssertNil(err)
n, _ := result.RowsAffected()
t.Assert(n, 1)
// Replace with new data
result, err = db.Model(table).Data(g.Map{
"id": 1,
"passport": "t11",
"password": "25d55ad283aa400af464c76d713c07ad",
"nickname": "T11",
"create_time": "2018-10-24 10:00:00",
}).Replace()
t.Assert(err, "Replace operation is not supported by pgsql driver")
t.AssertNil(err)
n, _ = result.RowsAffected()
t.Assert(n, 1)
// Verify the data was replaced
one, err := db.Model(table).Where("id", 1).One()
t.AssertNil(err)
t.Assert(one["passport"].String(), "t11")
t.Assert(one["password"].String(), "25d55ad283aa400af464c76d713c07ad")
t.Assert(one["nickname"].String(), "T11")
// Replace with new ID (insert new record)
result, err = db.Model(table).Data(g.Map{
"id": 2,
"passport": "t22",
"password": "pass22",
"nickname": "T22",
"create_time": "2018-10-24 11:00:00",
}).Replace()
t.AssertNil(err)
n, _ = result.RowsAffected()
t.Assert(n, 1)
// Verify new record was inserted
count, err := db.Model(table).Count()
t.AssertNil(err)
t.Assert(count, 2)
})
}
@ -757,3 +796,50 @@ func Test_ConvertSliceFloat64(t *testing.T) {
})
}
}
func Test_Model_InsertIgnore(t *testing.T) {
table := createTable()
defer dropTable(table)
gtest.C(t, func(t *gtest.T) {
user := db.Model(table)
result, err := user.Data(g.Map{
"id": 1,
"uid": 1,
"passport": "t1",
"password": "25d55ad283aa400af464c76d713c07ad",
"nickname": "name_1",
"create_time": gtime.Now().String(),
}).Insert()
t.AssertNil(err)
n, _ := result.RowsAffected()
t.Assert(n, 1)
result, err = db.Model(table).Data(g.Map{
"id": 1,
"uid": 1,
"passport": "t1",
"password": "25d55ad283aa400af464c76d713c07ad",
"nickname": "name_1",
"create_time": gtime.Now().String(),
}).Insert()
t.AssertNE(err, nil)
result, err = db.Model(table).Data(g.Map{
"id": 1,
"uid": 1,
"passport": "t2",
"password": "25d55ad283aa400af464c76d713c07ad",
"nickname": "name_2",
"create_time": gtime.Now().String(),
}).InsertIgnore()
t.AssertNil(err)
n, _ = result.RowsAffected()
t.Assert(n, 0)
value, err := db.Model(table).Fields("passport").WherePri(1).Value()
t.AssertNil(err)
t.Assert(value.String(), "t1")
})
}

View File

@ -219,10 +219,10 @@ func Test_FormatUpsert_NoOnConflict(t *testing.T) {
}).Insert()
t.AssertNil(err)
// Try Save without OnConflict - should fail for pgsql
// PostgreSQL requires OnConflict() for Save() operations, unlike MySQL
// Try Save without OnConflict and without primary key in data - should fail
// because driver cannot auto-detect conflict columns when primary key is missing
_, err = db.Model(table).Data(g.Map{
"id": 1,
// "id": 1,
"passport": "no_conflict_user",
"password": "newpwd",
"nickname": "newnick",

View File

@ -10,6 +10,7 @@ package gdb
import (
"context"
"fmt"
"strings"
"github.com/gogf/gf/v2/errors/gcode"
"github.com/gogf/gf/v2/errors/gerror"
@ -251,3 +252,22 @@ func (c *Core) guessPrimaryTableName(tableStr string) string {
}
return guessedTableName
}
// GetPrimaryKeys retrieves and returns the primary key field names of the specified table.
// This method extracts primary key information from TableFields.
// The parameter `schema` is optional, if not specified it uses the default schema.
func (c *Core) GetPrimaryKeys(ctx context.Context, table string, schema ...string) ([]string, error) {
tableFields, err := c.db.TableFields(ctx, table, schema...)
if err != nil {
return nil, err
}
var primaryKeys []string
for _, field := range tableFields {
if strings.EqualFold(field.Key, "pri") {
primaryKeys = append(primaryKeys, field.Name)
}
}
return primaryKeys, nil
}

View File

@ -109,7 +109,17 @@ func (d *DriverWrapperDB) TableFields(
// InsertOptionReplace: if there's unique/primary key in the data, it deletes it from table and inserts a new one;
// InsertOptionSave: if there's unique/primary key in the data, it updates it or else inserts a new one;
// InsertOptionIgnore: if there's unique/primary key in the data, it ignores the inserting;
func (d *DriverWrapperDB) DoInsert(ctx context.Context, link Link, table string, list List, option DoInsertOption) (result sql.Result, err error) {
func (d *DriverWrapperDB) DoInsert(
ctx context.Context, link Link, table string, list List, option DoInsertOption,
) (result sql.Result, err error) {
if len(list) == 0 {
return nil, gerror.NewCodef(
gcode.CodeInvalidRequest,
`data list is empty for %s operation`,
GetInsertOperationByOption(option.InsertOption),
)
}
// Convert data type before commit it to underlying db driver.
for i, item := range list {
list[i], err = d.GetCore().ConvertDataForRecord(ctx, item, table)