fix and enable TestIssue51, updates #51

This commit is contained in:
Dan Peterson
2021-04-30 16:30:26 -03:00
parent a3a619dcd2
commit ca47b106c9

View File

@@ -1392,10 +1392,6 @@ func testBindingError(t *testing.T, query func(db *sql.DB, query string, args ..
// https://gitlab.com/cznic/sqlite/-/issues/51 // https://gitlab.com/cznic/sqlite/-/issues/51
func TestIssue51(t *testing.T) { func TestIssue51(t *testing.T) {
// Temporarily disable this test until it becomes clear where the error comes from.
// See https://gitlab.com/cznic/sqlite/-/issues/51#note_554190594.
return
;
fn := filepath.Join(tempDir, "test_issue51.db") fn := filepath.Join(tempDir, "test_issue51.db")
db, err := sql.Open(driverName, fn) db, err := sql.Open(driverName, fn)
if err != nil { if err != nil {
@@ -1404,7 +1400,7 @@ func TestIssue51(t *testing.T) {
if _, err := db.Exec(` if _, err := db.Exec(`
CREATE TABLE fileHash ( CREATE TABLE fileHash (
"hash" TEXT NOT NULL PRIMARY KEY, "hash" TEXT NOT NULL PRIMARY KEY,
"filename" TEXT, "filename" TEXT,
"lastChecked" INTEGER "lastChecked" INTEGER
);`); err != nil { );`); err != nil {
@@ -1448,13 +1444,11 @@ func saveHash(dbFile string, hash string, fileName string) (err error) {
query := `INSERT OR REPLACE INTO fileHash(hash, fileName, lastChecked) query := `INSERT OR REPLACE INTO fileHash(hash, fileName, lastChecked)
VALUES(?, ?, ?);` VALUES(?, ?, ?);`
if _, err = executeSQL(db, query, rows, err := executeSQL(db, query, hash, fileName, time.Now().Unix())
hash, if err != nil {
fileName,
time.Now().Unix(),
); err != nil {
return fmt.Errorf("error saving hash to database: %v", err) return fmt.Errorf("error saving hash to database: %v", err)
} }
defer rows.Close()
return nil return nil
} }
@@ -1464,6 +1458,7 @@ func executeSQL(db *sql.DB, query string, values ...interface{}) (*sql.Rows, err
if err != nil { if err != nil {
return nil, fmt.Errorf("could not prepare statement: %v", err) return nil, fmt.Errorf("could not prepare statement: %v", err)
} }
defer statement.Close()
return statement.Query(values...) return statement.Query(values...)
} }
@@ -1505,7 +1500,7 @@ func lookupHash(dbFile string, hash string) (ok bool, err error) {
return false, fmt.Errorf("could not read DB row: %v", err) return false, fmt.Errorf("could not read DB row: %v", err)
} }
} }
return false, nil return false, rows.Err()
} }
func randomString() string { func randomString() string {