diff options
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/storage/db.go | 5 | ||||
| -rw-r--r-- | internal/storage/db_test.go | 12 | ||||
| -rw-r--r-- | internal/storage/mssql_test.go | 10 | ||||
| -rw-r--r-- | internal/storage/mysql_test.go | 8 | ||||
| -rw-r--r-- | internal/storage/postgresql_test.go | 8 | ||||
| -rw-r--r-- | internal/storage/sqlite3.go | 48 | ||||
| -rw-r--r-- | internal/storage/sqlite3_test.go | 94 |
7 files changed, 167 insertions, 18 deletions
diff --git a/internal/storage/db.go b/internal/storage/db.go index 12adc4c..dc32304 100644 --- a/internal/storage/db.go +++ b/internal/storage/db.go @@ -8,17 +8,20 @@ import ( "github.com/eugenetriguba/bolt/internal/configloader" _ "github.com/go-sql-driver/mysql" _ "github.com/jackc/pgx/v5/stdlib" + _ "github.com/mattn/go-sqlite3" _ "github.com/microsoft/go-mssqldb" ) var postgresqlDriverName = "postgresql" var mysqlDriverName = "mysql" var mssqlDriverName = "mssql" +var sqliteDriverName = "sqlite3" var supportedDrivers = map[string]dbDriver{ postgresqlDriverName: {name: "pgx", adapter: PostgresqlAdapter{}}, mysqlDriverName: {name: "mysql", adapter: MySQLAdapter{}}, mssqlDriverName: {name: "sqlserver", adapter: MSSQLAdapter{}}, + sqliteDriverName: {name: "sqlite3", adapter: SqliteAdapter{}}, } type dbDriver struct { @@ -33,7 +36,7 @@ var ( ErrUnableToConnect = errors.New("unable to open connection to database") ErrUnsupportedDriver = fmt.Errorf( "unsupported driver, supported drivers are %s", - []string{postgresqlDriverName, mysqlDriverName, mssqlDriverName}, + []string{postgresqlDriverName, mysqlDriverName, mssqlDriverName, sqliteDriverName}, ) ) diff --git a/internal/storage/db_test.go b/internal/storage/db_test.go index 4b7dc93..f3386f5 100644 --- a/internal/storage/db_test.go +++ b/internal/storage/db_test.go @@ -3,6 +3,7 @@ package storage_test import ( "database/sql" "errors" + "os" "testing" "github.com/eugenetriguba/bolt/internal/bolttest" @@ -27,10 +28,13 @@ func TestNewDB_UnsupportedDriver(t *testing.T) { } func TestNewDB_UnableToConnect(t *testing.T) { - t.Setenv("BOLT_DB_CONN_HOST", "") - t.Setenv("BOLT_DB_CONN_PORT", "") - _, err := storage.NewDB(bolttest.NewTestConnectionConfig()) - assert.ErrorIs(t, err, storage.ErrUnableToConnect) + driver := os.Getenv("BOLT_DB_CONN_DRIVER") + if driver != "sqlite3" { + t.Setenv("BOLT_DB_CONN_HOST", "") + t.Setenv("BOLT_DB_CONN_PORT", "") + _, err := storage.NewDB(bolttest.NewTestConnectionConfig()) + assert.ErrorIs(t, err, storage.ErrUnableToConnect) + } } func TestClose_IsClosed(t *testing.T) { diff --git a/internal/storage/mssql_test.go b/internal/storage/mssql_test.go index 400b210..4a99ffd 100644 --- a/internal/storage/mssql_test.go +++ b/internal/storage/mssql_test.go @@ -13,7 +13,7 @@ import ( "github.com/eugenetriguba/checkmate/assert" ) -func TestConvertGenericPlaceholders(t *testing.T) { +func TestMSSQL_ConvertGenericPlaceholders(t *testing.T) { type test struct { query string argCount int @@ -44,7 +44,7 @@ func TestConvertGenericPlaceholders(t *testing.T) { } } -func TestTableExists(t *testing.T) { +func TestMSSQL_TableExists(t *testing.T) { cfg := bolttest.NewTestConnectionConfig() adapter := storage.MSSQLAdapter{} db, err := sql.Open("sqlserver", adapter.CreateDSN(cfg)) @@ -67,7 +67,7 @@ func TestTableExists(t *testing.T) { assert.True(t, exists) } -func TestDatabaseName(t *testing.T) { +func TestMSSQL_DatabaseName(t *testing.T) { cfg := bolttest.NewTestConnectionConfig() adapter := storage.MSSQLAdapter{} db, err := sql.Open("sqlserver", adapter.CreateDSN(cfg)) @@ -82,7 +82,7 @@ func TestDatabaseName(t *testing.T) { assert.Equal(t, name, cfg.DBName) } -func TestCreateDSN(t *testing.T) { +func TestMSSQL_CreateDSN(t *testing.T) { cfg := configloader.ConnectionConfig{ Driver: "mssql", Host: "db1", @@ -102,7 +102,7 @@ func TestCreateDSN(t *testing.T) { assert.Equal(t, cs, expectedConnectionString) } -func TestCreateDSN_UnparsablePort(t *testing.T) { +func TestMSSQL_CreateDSN_UnparsablePort(t *testing.T) { cfg := configloader.ConnectionConfig{ Driver: "mssql", Host: "db1", diff --git a/internal/storage/mysql_test.go b/internal/storage/mysql_test.go index 76f1098..b6f48b3 100644 --- a/internal/storage/mysql_test.go +++ b/internal/storage/mysql_test.go @@ -13,7 +13,7 @@ import ( "github.com/eugenetriguba/checkmate/assert" ) -func TestConvertGenericPlaceholders(t *testing.T) { +func TestMySQL_ConvertGenericPlaceholders(t *testing.T) { type test struct { query string argCount int @@ -44,7 +44,7 @@ func TestConvertGenericPlaceholders(t *testing.T) { } } -func TestTableExists(t *testing.T) { +func TestMySQL_TableExists(t *testing.T) { cfg := bolttest.NewTestConnectionConfig() adapter := storage.MySQLAdapter{} db, err := sql.Open("mysql", adapter.CreateDSN(cfg)) @@ -67,7 +67,7 @@ func TestTableExists(t *testing.T) { assert.True(t, exists) } -func TestDatabaseName(t *testing.T) { +func TestMySQL_DatabaseName(t *testing.T) { cfg := bolttest.NewTestConnectionConfig() adapter := storage.MySQLAdapter{} db, err := sql.Open("mysql", adapter.CreateDSN(cfg)) @@ -82,7 +82,7 @@ func TestDatabaseName(t *testing.T) { assert.Equal(t, name, cfg.DBName) } -func TestCreateDSN(t *testing.T) { +func TestMySQL_CreateDSN(t *testing.T) { cfg := configloader.ConnectionConfig{ Driver: "mysql", Host: "db1", diff --git a/internal/storage/postgresql_test.go b/internal/storage/postgresql_test.go index 8218cc1..ef89cff 100644 --- a/internal/storage/postgresql_test.go +++ b/internal/storage/postgresql_test.go @@ -13,7 +13,7 @@ import ( "github.com/eugenetriguba/checkmate/assert" ) -func TestConvertGenericPlaceholders(t *testing.T) { +func TestPostgresql_ConvertGenericPlaceholders(t *testing.T) { type test struct { query string argCount int @@ -44,7 +44,7 @@ func TestConvertGenericPlaceholders(t *testing.T) { } } -func TestTableExists(t *testing.T) { +func TestPostgresql_TableExists(t *testing.T) { cfg := bolttest.NewTestConnectionConfig() adapter := storage.PostgresqlAdapter{} db, err := sql.Open("pgx", adapter.CreateDSN(cfg)) @@ -67,7 +67,7 @@ func TestTableExists(t *testing.T) { assert.True(t, exists) } -func TestDatabaseName(t *testing.T) { +func TestPostgresql_DatabaseName(t *testing.T) { cfg := bolttest.NewTestConnectionConfig() adapter := storage.PostgresqlAdapter{} db, err := sql.Open("pgx", adapter.CreateDSN(cfg)) @@ -82,7 +82,7 @@ func TestDatabaseName(t *testing.T) { assert.Equal(t, name, cfg.DBName) } -func TestCreateDSN(t *testing.T) { +func TestPostgresql_CreateDSN(t *testing.T) { cfg := configloader.ConnectionConfig{ Driver: "postgres", Host: "db1", diff --git a/internal/storage/sqlite3.go b/internal/storage/sqlite3.go new file mode 100644 index 0000000..877dc7e --- /dev/null +++ b/internal/storage/sqlite3.go @@ -0,0 +1,48 @@ +package storage + +import ( + "fmt" + + "github.com/eugenetriguba/bolt/internal/configloader" +) + +type SqliteAdapter struct{} + +func (s SqliteAdapter) ConvertGenericPlaceholders( + query string, + argsCount int, +) string { + // The sqlite driver uses ? as a generic placeholder, + // so no translation is necessary. + return query +} + +func (s SqliteAdapter) TableExists( + executor sqlExecutor, + tableName string, +) (bool, error) { + var count int + err := executor.QueryRow(` + SELECT COUNT(*) + FROM sqlite_master + WHERE type='table' AND name=?; + `, tableName).Scan(&count) + if err != nil { + return false, fmt.Errorf( + "unable to check if %s exists: %w", + tableName, + err, + ) + } + + return count > 0, nil +} + +func (s SqliteAdapter) DatabaseName(executor sqlExecutor) (string, error) { + return "main", nil +} + +func (s SqliteAdapter) CreateDSN(cfg configloader.ConnectionConfig) string { + // Note: Use the dbname as the sqlite db name/path + return cfg.DBName +} diff --git a/internal/storage/sqlite3_test.go b/internal/storage/sqlite3_test.go new file mode 100644 index 0000000..69eea38 --- /dev/null +++ b/internal/storage/sqlite3_test.go @@ -0,0 +1,94 @@ +//go:build sqlite3 + +package storage_test + +import ( + "database/sql" + "testing" + + "github.com/eugenetriguba/bolt/internal/bolttest" + "github.com/eugenetriguba/bolt/internal/configloader" + "github.com/eugenetriguba/bolt/internal/storage" + "github.com/eugenetriguba/checkmate/assert" +) + +func TestSqlite3_ConvertGenericPlaceholders(t *testing.T) { + type test struct { + query string + argCount int + expectedQuery string + } + + testCases := []test{ + { + query: "SELECT id, name FROM some_table;", + argCount: 0, + expectedQuery: "SELECT id, name FROM some_table;", + }, + { + query: "SELECT id, name FROM some_table WHERE id = ?;", + argCount: 1, + expectedQuery: "SELECT id, name FROM some_table WHERE id = ?;", + }, + { + query: "SELECT id, name FROM some_table WHERE id = ? AND name = ?;", + argCount: 2, + expectedQuery: "SELECT id, name FROM some_table WHERE id = ? AND name = ?;", + }, + } + for _, tc := range testCases { + adapter := storage.MySQLAdapter{} + newQuery := adapter.ConvertGenericPlaceholders(tc.query, tc.argCount) + assert.Equal(t, newQuery, tc.expectedQuery) + } +} + +func TestSqlite3_TableExists(t *testing.T) { + cfg := bolttest.NewTestConnectionConfig() + adapter := storage.SqliteAdapter{} + db, err := sql.Open("sqlite3", adapter.CreateDSN(cfg)) + assert.Nil(t, err) + t.Cleanup(func() { + _, err = db.Exec("DROP TABLE IF EXISTS tmp;") + assert.Nil(t, err) + assert.Nil(t, db.Close()) + }) + + exists, err := adapter.TableExists(db, "tmp") + assert.Nil(t, err) + assert.False(t, exists) + + _, err = db.Exec("CREATE TABLE tmp(id INT PRIMARY KEY);") + assert.Nil(t, err) + + exists, err = adapter.TableExists(db, "tmp") + assert.Nil(t, err) + assert.True(t, exists) +} + +func TestSqlite3_DatabaseName(t *testing.T) { + cfg := bolttest.NewTestConnectionConfig() + adapter := storage.SqliteAdapter{} + db, err := sql.Open("sqlite3", adapter.CreateDSN(cfg)) + assert.Nil(t, err) + t.Cleanup(func() { + assert.Nil(t, db.Close()) + }) + + name, err := adapter.DatabaseName(db) + assert.Nil(t, err) + + assert.Equal(t, name, "main") +} + +func TestSqlite3_CreateDSN(t *testing.T) { + cfg := configloader.ConnectionConfig{ + Driver: "sqlite3", + DBName: "./tmp/test.db", + } + adapter := storage.SqliteAdapter{} + + cs := adapter.CreateDSN(cfg) + + assert.Equal(t, cs, cfg.DBName) +} |