From 5a1ea00943ebbfd4df5fbaa41e50cafe8d78f5c2 Mon Sep 17 00:00:00 2001 From: boojack Date: Fri, 1 Jul 2022 20:26:56 +0800 Subject: [PATCH] fix: create migration_history table --- store/db/db.go | 4 ++-- store/db/table.go | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/store/db/db.go b/store/db/db.go index 69bf3b6d7..f88dc1b05 100644 --- a/store/db/db.go +++ b/store/db/db.go @@ -137,12 +137,12 @@ func (db *DB) executeFile(FS embed.FS, name string) error { // compareMigrationHistory compares migration history data func (db *DB) compareMigrationHistory() error { - table, err := findTable(db, "migration_history") + table, err := findTable(db.Db, "migration_history") if err != nil { return err } if table == nil { - if err := createTable(db, ` + if err := createTable(db.Db, ` CREATE TABLE migration_history ( version TEXT NOT NULL PRIMARY KEY, created_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now')) diff --git a/store/db/table.go b/store/db/table.go index ba70eb6cf..a32549dc3 100644 --- a/store/db/table.go +++ b/store/db/table.go @@ -1,7 +1,7 @@ package db import ( - "fmt" + "database/sql" "strings" ) @@ -10,13 +10,13 @@ type Table struct { SQL string } -func findTable(db *DB, tableName string) (*Table, error) { +func findTable(db *sql.DB, tableName string) (*Table, error) { where, args := []string{"1 = 1"}, []interface{}{} where, args = append(where, "type = ?"), append(args, "table") where, args = append(where, "name = ?"), append(args, tableName) - rows, err := db.Db.Query(` + rows, err := db.Query(` SELECT tbl_name, sql @@ -53,13 +53,13 @@ func findTable(db *DB, tableName string) (*Table, error) { } } -func createTable(db *DB, sql string) error { - result, err := db.Db.Exec(sql) - - rows, _ := result.RowsAffected() - if rows == 0 { - return fmt.Errorf("failed to create table with %s", sql) +func createTable(db *sql.DB, sql string) error { + result, err := db.Exec(sql) + if err != nil { + return err } + _, err = result.RowsAffected() + return err }