Skip to content

Commit 1a00fe4

Browse files
committed
fix(postgres): inserting new option error
1 parent 2a817bb commit 1a00fe4

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

db/sql/SqlDb.go

+7-3
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,13 @@ func (d *SqlDb) insert(primaryKeyColumnName string, query string, args ...interf
123123

124124
switch d.sql.Dialect.(type) {
125125
case gorp.PostgresDialect:
126-
query += " returning " + primaryKeyColumnName
127-
128-
err := d.sql.QueryRow(d.PrepareQuery(query), args...).Scan(&insertId)
126+
var err error
127+
if primaryKeyColumnName != "" {
128+
query += " returning " + primaryKeyColumnName
129+
err = d.sql.QueryRow(d.PrepareQuery(query), args...).Scan(&insertId)
130+
} else {
131+
_, err = d.sql.Exec(d.PrepareQuery(query), args...)
132+
}
129133

130134
if err != nil {
131135
return 0, err

db/sql/option.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ func (d *SqlDb) SetOption(key string, value string) error {
1212

1313
if errors.Is(err, db.ErrNotFound) {
1414
_, err = d.insert(
15-
"key",
15+
"", // don't provide because it is not auto-generated
1616
"insert into `option` (`key`, `value`) values (?, ?)",
1717
key, value)
1818
} else if err == nil {

0 commit comments

Comments
 (0)