Skip to content

fix: remove extra ignore keywords for mysql on duplicate key expression #435

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

Open
autowp wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: remove extra ignore keywords for mysql on duplicate key expression #435

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
3 changes: 2 additions & 1 deletion sqlgen/insert_sql_generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ func (isg *insertSQLGenerator) Generate(

// Adds the correct fragment to being an INSERT statement
func (isg *insertSQLGenerator) InsertBeginSQL(b sb.SQLBuilder, o exp.ConflictExpression) {
if isg.DialectOptions().SupportsInsertIgnoreSyntax && o != nil {
_, isNotDoNothingConflictExpression := o.(exp.ConflictUpdateExpression)
if isg.DialectOptions().SupportsInsertIgnoreSyntax && o != nil && !isNotDoNothingConflictExpression {
b.Write(isg.DialectOptions().InsertIgnoreClause)
} else {
b.Write(isg.DialectOptions().InsertClause)
Expand Down
28 changes: 22 additions & 6 deletions sqlgen/insert_sql_generator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,33 +333,33 @@ func (igs *insertSQLGeneratorSuite) TestGenerate_onConflict() {

insertTestCase{
clause: icDu,
sql: `insert ignore into "test" ("a") VALUES ('a1') on conflict (test) do update set "a"='b'`,
sql: `INSERT INTO "test" ("a") VALUES ('a1') on conflict (test) do update set "a"='b'`,
},
insertTestCase{
clause: icDu,
sql: `insert ignore into "test" ("a") VALUES (?) on conflict (test) do update set "a"=?`,
sql: `INSERT INTO "test" ("a") VALUES (?) on conflict (test) do update set "a"=?`,
isPrepared: true,
args: []interface{}{"a1", "b"},
},

insertTestCase{
clause: icDoc,
sql: `insert ignore into "test" ("a") VALUES ('a1') on conflict on constraint test do update set "a"='b'`,
sql: `INSERT INTO "test" ("a") VALUES ('a1') on conflict on constraint test do update set "a"='b'`,
},
insertTestCase{
clause: icDoc,
sql: `insert ignore into "test" ("a") VALUES (?) on conflict on constraint test do update set "a"=?`,
sql: `INSERT INTO "test" ("a") VALUES (?) on conflict on constraint test do update set "a"=?`,
isPrepared: true,
args: []interface{}{"a1", "b"},
},

insertTestCase{
clause: icDuw,
sql: `insert ignore into "test" ("a") VALUES ('a1') on conflict (test) do update set "a"='b' WHERE ("foo" IS TRUE)`,
sql: `INSERT INTO "test" ("a") VALUES ('a1') on conflict (test) do update set "a"='b' WHERE ("foo" IS TRUE)`,
},
insertTestCase{
clause: icDuw,
sql: `insert ignore into "test" ("a") VALUES (?) on conflict (test) do update set "a"=? WHERE ("foo" IS TRUE)`,
sql: `INSERT INTO "test" ("a") VALUES (?) on conflict (test) do update set "a"=? WHERE ("foo" IS TRUE)`,
isPrepared: true,
args: []interface{}{"a1", "b"},
},
Expand All @@ -378,6 +378,22 @@ func (igs *insertSQLGeneratorSuite) TestGenerate_onConflict() {
insertTestCase{clause: icDuw, err: expectedErr},
insertTestCase{clause: icDuw, err: expectedErr, isPrepared: true},
)

opts.InsertIgnoreClause = []byte("INSERT IGNORE INTO")
opts.ConflictFragment = []byte("")
opts.ConflictDoUpdateFragment = []byte(" ON DUPLICATE KEY UPDATE ")
opts.ConflictDoNothingFragment = []byte("")
opts.SupportsConflictTarget = false
igs.assertCases(
sqlgen.NewInsertSQLGenerator("test", opts),
insertTestCase{clause: icDn, sql: `INSERT IGNORE INTO "test" ("a") VALUES ('a1')`},
insertTestCase{
clause: icDu,
sql: `INSERT INTO "test" ("a") VALUES (?) ON DUPLICATE KEY UPDATE "a"=?`,
isPrepared: true,
args: []interface{}{"a1", "b"},
},
)
}

func (igs *insertSQLGeneratorSuite) TestGenerate_withCommonTables() {
Expand Down