Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix issue #2338 #2444

Merged
merged 1 commit into from
Feb 14, 2023
Merged

fix issue #2338 #2444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions contrib/drivers/clickhouse/clickhouse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,11 @@ func (d *Driver) TableFields(
ctx context.Context, table string, schema ...string,
) (fields map[string]*gdb.TableField, err error) {
var (
result gdb.Result
link gdb.Link
useSchema = gutil.GetOrDefaultStr(d.GetSchema(), schema...)
result gdb.Result
link gdb.Link
usedSchema = gutil.GetOrDefaultStr(d.GetSchema(), schema...)
)
if link, err = d.SlaveLink(useSchema); err != nil {
if link, err = d.SlaveLink(usedSchema); err != nil {
return nil, err
}
var (
Expand Down
6 changes: 5 additions & 1 deletion contrib/drivers/dm/dm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ type Driver struct {
*gdb.Core
}

const (
quoteChar = `"`
)

func init() {
var (
err error
Expand Down Expand Up @@ -92,7 +96,7 @@ func (d *Driver) Open(config *gdb.ConfigNode) (db *sql.DB, err error) {
}

func (d *Driver) GetChars() (charLeft string, charRight string) {
return `"`, `"`
return quoteChar, quoteChar
}

func (d *Driver) Tables(ctx context.Context, schema ...string) (tables []string, err error) {
Expand Down
14 changes: 9 additions & 5 deletions contrib/drivers/mssql/mssql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ type Driver struct {
*gdb.Core
}

const (
quoteChar = `"`
)

func init() {
if err := gdb.Register(`mssql`, New()); err != nil {
panic(err)
Expand Down Expand Up @@ -95,7 +99,7 @@ func (d *Driver) Open(config *gdb.ConfigNode) (db *sql.DB, err error) {

// GetChars returns the security char for this type of database.
func (d *Driver) GetChars() (charLeft string, charRight string) {
return `"`, `"`
return quoteChar, quoteChar
}

// DoFilter deals with the sql string before commits it to underlying sql driver.
Expand Down Expand Up @@ -237,11 +241,11 @@ func (d *Driver) Tables(ctx context.Context, schema ...string) (tables []string,
// Also see DriverMysql.TableFields.
func (d *Driver) TableFields(ctx context.Context, table string, schema ...string) (fields map[string]*gdb.TableField, err error) {
var (
result gdb.Result
link gdb.Link
useSchema = gutil.GetOrDefaultStr(d.GetSchema(), schema...)
result gdb.Result
link gdb.Link
usedSchema = gutil.GetOrDefaultStr(d.GetSchema(), schema...)
)
if link, err = d.SlaveLink(useSchema); err != nil {
if link, err = d.SlaveLink(usedSchema); err != nil {
return nil, err
}
structureSql := fmt.Sprintf(`
Expand Down
14 changes: 9 additions & 5 deletions contrib/drivers/mysql/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ type Driver struct {
*gdb.Core
}

const (
quoteChar = "`"
)

func init() {
var (
err error
Expand Down Expand Up @@ -98,7 +102,7 @@ func (d *Driver) Open(config *gdb.ConfigNode) (db *sql.DB, err error) {

// GetChars returns the security char for this type of database.
func (d *Driver) GetChars() (charLeft string, charRight string) {
return "`", "`"
return quoteChar, quoteChar
}

// DoFilter handles the sql before posts it to database.
Expand Down Expand Up @@ -142,11 +146,11 @@ func (d *Driver) TableFields(
ctx context.Context, table string, schema ...string,
) (fields map[string]*gdb.TableField, err error) {
var (
result gdb.Result
link gdb.Link
useSchema = gutil.GetOrDefaultStr(d.GetSchema(), schema...)
result gdb.Result
link gdb.Link
usedSchema = gutil.GetOrDefaultStr(d.GetSchema(), schema...)
)
if link, err = d.SlaveLink(useSchema); err != nil {
if link, err = d.SlaveLink(usedSchema); err != nil {
return nil, err
}
result, err = d.DoSelect(
Expand Down
111 changes: 111 additions & 0 deletions contrib/drivers/mysql/mysql_issue_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,3 +522,114 @@ func Test_Issue2356(t *testing.T) {
t.AssertEQ(one["id"].Val(), uint64(18446744073709551615))
})
}

// https://github.com/gogf/gf/issues/2338
func Test_Issue2338(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
table1 := "demo_" + guid.S()
table2 := "demo_" + guid.S()
if _, err := db.Schema(TestSchema1).Exec(ctx, fmt.Sprintf(`
CREATE TABLE %s (
id int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'User ID',
nickname varchar(45) DEFAULT NULL COMMENT 'User Nickname',
create_at datetime DEFAULT NULL COMMENT 'Created Time',
update_at datetime DEFAULT NULL COMMENT 'Updated Time',
PRIMARY KEY (id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
`, table1,
)); err != nil {
t.AssertNil(err)
}
if _, err := db.Schema(TestSchema2).Exec(ctx, fmt.Sprintf(`
CREATE TABLE %s (
id int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'User ID',
nickname varchar(45) DEFAULT NULL COMMENT 'User Nickname',
create_at datetime DEFAULT NULL COMMENT 'Created Time',
update_at datetime DEFAULT NULL COMMENT 'Updated Time',
PRIMARY KEY (id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
`, table2,
)); err != nil {
t.AssertNil(err)
}
defer dropTableWithDb(db.Schema(TestSchema1), table1)
defer dropTableWithDb(db.Schema(TestSchema2), table2)

var err error
_, err = db.Schema(TestSchema1).Model(table1).Insert(g.Map{
"id": 1,
"nickname": "name_1",
})
t.AssertNil(err)

_, err = db.Schema(TestSchema2).Model(table2).Insert(g.Map{
"id": 1,
"nickname": "name_2",
})
t.AssertNil(err)

tableName1 := fmt.Sprintf(`%s.%s`, TestSchema1, table1)
tableName2 := fmt.Sprintf(`%s.%s`, TestSchema2, table2)
all, err := db.Model(tableName1).As(`a`).
LeftJoin(tableName2+" b", `a.id=b.id`).
Fields(`a.id`, `b.nickname`).All()
t.AssertNil(err)
t.Assert(len(all), 1)
t.Assert(all[0]["nickname"], "name_2")
})

gtest.C(t, func(t *gtest.T) {
table1 := "demo_" + guid.S()
table2 := "demo_" + guid.S()
if _, err := db.Schema(TestSchema1).Exec(ctx, fmt.Sprintf(`
CREATE TABLE %s (
id int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'User ID',
nickname varchar(45) DEFAULT NULL COMMENT 'User Nickname',
create_at datetime DEFAULT NULL COMMENT 'Created Time',
update_at datetime DEFAULT NULL COMMENT 'Updated Time',
deleted_at datetime DEFAULT NULL COMMENT 'Deleted Time',
PRIMARY KEY (id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
`, table1,
)); err != nil {
t.AssertNil(err)
}
if _, err := db.Schema(TestSchema2).Exec(ctx, fmt.Sprintf(`
CREATE TABLE %s (
id int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'User ID',
nickname varchar(45) DEFAULT NULL COMMENT 'User Nickname',
create_at datetime DEFAULT NULL COMMENT 'Created Time',
update_at datetime DEFAULT NULL COMMENT 'Updated Time',
deleted_at datetime DEFAULT NULL COMMENT 'Deleted Time',
PRIMARY KEY (id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
`, table2,
)); err != nil {
t.AssertNil(err)
}
defer dropTableWithDb(db.Schema(TestSchema1), table1)
defer dropTableWithDb(db.Schema(TestSchema2), table2)

var err error
_, err = db.Schema(TestSchema1).Model(table1).Insert(g.Map{
"id": 1,
"nickname": "name_1",
})
t.AssertNil(err)

_, err = db.Schema(TestSchema2).Model(table2).Insert(g.Map{
"id": 1,
"nickname": "name_2",
})
t.AssertNil(err)

tableName1 := fmt.Sprintf(`%s.%s`, TestSchema1, table1)
tableName2 := fmt.Sprintf(`%s.%s`, TestSchema2, table2)
all, err := db.Model(tableName1).As(`a`).
LeftJoin(tableName2+" b", `a.id=b.id`).
Fields(`a.id`, `b.nickname`).All()
t.AssertNil(err)
t.Assert(len(all), 1)
t.Assert(all[0]["nickname"], "name_2")
})
}
10 changes: 7 additions & 3 deletions contrib/drivers/oracle/oracle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ type Driver struct {
*gdb.Core
}

const (
quoteChar = `"`
)

func init() {
if err := gdb.Register(`oracle`, New()); err != nil {
panic(err)
Expand Down Expand Up @@ -106,7 +110,7 @@ func (d *Driver) Open(config *gdb.ConfigNode) (db *sql.DB, err error) {

// GetChars returns the security char for this type of database.
func (d *Driver) GetChars() (charLeft string, charRight string) {
return `"`, `"`
return quoteChar, quoteChar
}

// DoFilter deals with the sql string before commits it to underlying sql driver.
Expand Down Expand Up @@ -217,7 +221,7 @@ func (d *Driver) TableFields(
var (
result gdb.Result
link gdb.Link
useSchema = gutil.GetOrDefaultStr(d.GetSchema(), schema...)
usedSchema = gutil.GetOrDefaultStr(d.GetSchema(), schema...)
structureSql = fmt.Sprintf(`
SELECT
COLUMN_NAME AS FIELD,
Expand All @@ -230,7 +234,7 @@ FROM USER_TAB_COLUMNS WHERE TABLE_NAME = '%s' ORDER BY COLUMN_ID`,
strings.ToUpper(table),
)
)
if link, err = d.SlaveLink(useSchema); err != nil {
if link, err = d.SlaveLink(usedSchema); err != nil {
return nil, err
}
structureSql, _ = gregex.ReplaceString(`[\n\r\s]+`, " ", gstr.Trim(structureSql))
Expand Down
7 changes: 4 additions & 3 deletions contrib/drivers/pgsql/pgsql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ type Driver struct {
const (
internalPrimaryKeyInCtx gctx.StrKey = "primary_key"
defaultSchema = "public"
quoteChar = `"`
)

func init() {
Expand Down Expand Up @@ -113,7 +114,7 @@ func (d *Driver) Open(config *gdb.ConfigNode) (db *sql.DB, err error) {

// GetChars returns the security char for this type of database.
func (d *Driver) GetChars() (charLeft string, charRight string) {
return `"`, `"`
return quoteChar, quoteChar
}

// CheckLocalTypeForField checks and returns corresponding local golang type for given db type.
Expand Down Expand Up @@ -270,7 +271,7 @@ func (d *Driver) TableFields(ctx context.Context, table string, schema ...string
var (
result gdb.Result
link gdb.Link
useSchema = gutil.GetOrDefaultStr(d.GetSchema(), schema...)
usedSchema = gutil.GetOrDefaultStr(d.GetSchema(), schema...)
structureSql = fmt.Sprintf(`
SELECT a.attname AS field, t.typname AS type,a.attnotnull as null,
(case when d.contype is not null then 'pri' else '' end) as key
Expand All @@ -288,7 +289,7 @@ ORDER BY a.attnum`,
table,
)
)
if link, err = d.SlaveLink(useSchema); err != nil {
if link, err = d.SlaveLink(usedSchema); err != nil {
return nil, err
}
structureSql, _ = gregex.ReplaceString(`[\n\r\s]+`, " ", gstr.Trim(structureSql))
Expand Down
14 changes: 9 additions & 5 deletions contrib/drivers/sqlite/sqlite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ type Driver struct {
*gdb.Core
}

const (
quoteChar = "`"
)

func init() {
if err := gdb.Register(`sqlite`, New()); err != nil {
panic(err)
Expand Down Expand Up @@ -105,7 +109,7 @@ func (d *Driver) Open(config *gdb.ConfigNode) (db *sql.DB, err error) {

// GetChars returns the security char for this type of database.
func (d *Driver) GetChars() (charLeft string, charRight string) {
return "`", "`"
return quoteChar, quoteChar
}

// DoFilter deals with the sql string before commits it to underlying sql driver.
Expand Down Expand Up @@ -141,11 +145,11 @@ func (d *Driver) TableFields(
ctx context.Context, table string, schema ...string,
) (fields map[string]*gdb.TableField, err error) {
var (
result gdb.Result
link gdb.Link
useSchema = gutil.GetOrDefaultStr(d.GetSchema(), schema...)
result gdb.Result
link gdb.Link
usedSchema = gutil.GetOrDefaultStr(d.GetSchema(), schema...)
)
if link, err = d.SlaveLink(useSchema); err != nil {
if link, err = d.SlaveLink(usedSchema); err != nil {
return nil, err
}
result, err = d.DoSelect(ctx, link, fmt.Sprintf(`PRAGMA TABLE_INFO(%s)`, table))
Expand Down
12 changes: 10 additions & 2 deletions database/gdb/gdb_core.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,21 @@ func (c *Core) Close(ctx context.Context) (err error) {
// Master creates and returns a connection from master node if master-slave configured.
// It returns the default connection if master-slave not configured.
func (c *Core) Master(schema ...string) (*sql.DB, error) {
return c.getSqlDb(true, gutil.GetOrDefaultStr(c.schema, schema...))
var (
usedSchema = gutil.GetOrDefaultStr(c.schema, schema...)
charL, charR = c.db.GetChars()
)
return c.getSqlDb(true, gstr.Trim(usedSchema, charL+charR))
}

// Slave creates and returns a connection from slave node if master-slave configured.
// It returns the default connection if master-slave not configured.
func (c *Core) Slave(schema ...string) (*sql.DB, error) {
return c.getSqlDb(false, gutil.GetOrDefaultStr(c.schema, schema...))
var (
usedSchema = gutil.GetOrDefaultStr(c.schema, schema...)
charL, charR = c.db.GetChars()
)
return c.getSqlDb(false, gstr.Trim(usedSchema, charL+charR))
}

// GetAll queries and returns data records from database.
Expand Down
2 changes: 1 addition & 1 deletion database/gdb/gdb_model_delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func (m *Model) Delete(where ...interface{}) (result sql.Result, err error) {
}
}()
var (
fieldNameDelete = m.getSoftFieldNameDeleted()
fieldNameDelete = m.getSoftFieldNameDeleted("", m.tablesInit)
conditionWhere, conditionExtra, conditionArgs = m.formatCondition(ctx, false, false)
)
// Soft deleting.
Expand Down
4 changes: 2 additions & 2 deletions database/gdb/gdb_model_insert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,8 @@ func (m *Model) doInsertWithOption(ctx context.Context, insertOption int) (resul
var (
list List
nowString = gtime.Now().String()
fieldNameCreate = m.getSoftFieldNameCreated()
fieldNameUpdate = m.getSoftFieldNameUpdated()
fieldNameCreate = m.getSoftFieldNameCreated("", m.tablesInit)
fieldNameUpdate = m.getSoftFieldNameUpdated("", m.tablesInit)
)
newData, err := m.filterDataForInsertOrUpdate(m.data)
if err != nil {
Expand Down
Loading