Skip to content

Commit 5e25e89

Browse files
committed
feat(be): sqlite support, options
1 parent e619b4f commit 5e25e89

File tree

2 files changed

+5
-24
lines changed

2 files changed

+5
-24
lines changed

db/sql/SqlDb.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,27 +128,23 @@ func (d *SqlDb) PrepareQuery(query string) string {
128128
}
129129

130130
func (d *SqlDb) insert(primaryKeyColumnName string, query string, args ...any) (int, error) {
131-
return d.insertBy(d.sql, primaryKeyColumnName, query, args...)
132-
}
133-
134-
func (d *SqlDb) insertBy(executor gorp.SqlExecutor, primaryKeyColumnName string, query string, args ...any) (int, error) {
135131
var insertId int64
136132

137133
switch d.sql.Dialect.(type) {
138134
case gorp.PostgresDialect:
139135
var err error
140136
if primaryKeyColumnName != "" {
141137
query += " returning " + primaryKeyColumnName
142-
err = executor.QueryRow(d.PrepareQuery(query), args...).Scan(&insertId)
138+
err = d.sql.QueryRow(d.PrepareQuery(query), args...).Scan(&insertId)
143139
} else {
144-
_, err = executor.Exec(d.PrepareQuery(query), args...)
140+
_, err = d.sql.Exec(d.PrepareQuery(query), args...)
145141
}
146142

147143
if err != nil {
148144
return 0, err
149145
}
150146
default:
151-
res, err := executor.Exec(d.PrepareQuery(query), args...)
147+
res, err := d.sql.Exec(d.PrepareQuery(query), args...)
152148
if err != nil {
153149
return 0, err
154150
}

util/config.go

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,23 +1017,8 @@ func (d *DbConfig) GetConnectionString(includeDbName bool) (connectionString str
10171017
}
10181018
connectionString += mapToQueryString(d.Options)
10191019
case DbDriverSQLite:
1020-
connectionString = fmt.Sprintf("file:%s?_busy_timeout=5000&_journal_mode=WAL&_synchronous=NORMAL", dbHost)
1021-
1022-
//if includeDbName {
1023-
// connectionString = fmt.Sprintf(
1024-
// "postgres://%s:%s@%s/%s",
1025-
// dbUser,
1026-
// url.QueryEscape(dbPass),
1027-
// dbHost,
1028-
// dbName)
1029-
//} else {
1030-
// connectionString = fmt.Sprintf(
1031-
// "postgres://%s:%s@%s/postgres",
1032-
// dbUser,
1033-
// url.QueryEscape(dbPass),
1034-
// dbHost)
1035-
//}
1036-
//connectionString += mapToQueryString(d.Options)
1020+
connectionString = "file:" + dbHost
1021+
connectionString += mapToQueryString(d.Options)
10371022
default:
10381023
err = fmt.Errorf("unsupported database driver: %s", d.Dialect)
10391024
}

0 commit comments

Comments
 (0)