Skip to content

Commit 5300585

Browse files
Fs02Fs02
authored
💥 Remove builtin sqlite3 adapter (#257)
* 💥 Remove builtin sqlite3 adapter * fix adapter path * fix adapter path * fix adapter path
1 parent 3243db8 commit 5300585

File tree

5 files changed

+12
-259
lines changed

5 files changed

+12
-259
lines changed

‎adapter/sqlite3/sqlite3.go

Lines changed: 0 additions & 127 deletions
This file was deleted.

‎adapter/sqlite3/sqlite3_test.go

Lines changed: 0 additions & 120 deletions
This file was deleted.

‎cmd/rel/internal/migrate_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestExecMigrate(t *testing.T) {
2929
args = []string{
3030
"rel",
3131
"migrate",
32-
"-adapter=github.com/go-rel/rel/adapter/sqlite3",
32+
"-adapter=github.com/go-rel/sqlite3",
3333
"-driver=github.com/mattn/go-sqlite3",
3434
"-dsn=:memory:",
3535
"-dir=db",
@@ -47,7 +47,7 @@ func TestExecMigrate(t *testing.T) {
4747
"migrate",
4848
"-dir=testdata/migrations",
4949
"-module=github.com/go-rel/rel/cmd/rel/internal",
50-
"-adapter=github.com/go-rel/rel/adapter/sqlite3",
50+
"-adapter=github.com/go-rel/sqlite3",
5151
"-driver=github.com/mattn/go-sqlite3",
5252
"-dsn=:memory:",
5353
"-verbose=false",

‎cmd/rel/internal/util.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ func getDatabaseInfo() (string, string, string) {
2222
driver = os.Getenv("DATABASE_DRIVER")
2323
dsn = os.Getenv("DATABASE_URL")
2424
case os.Getenv("SQLITE3_DATABASE") != "":
25-
adapter = "github.com/go-rel/rel/adapter/sqlite3"
25+
adapter = "github.com/go-rel/sqlite3"
2626
driver = "github.com/mattn/go-sqlite3"
2727
dsn = os.Getenv("SQLITE3_DATABASE")
2828
case os.Getenv("MYSQL_HOST") != "":
29-
adapter = "github.com/go-rel/rel/adapter/mysql"
29+
adapter = "github.com/go-rel/mysql"
3030
driver = "github.com/go-sql-driver/mysql"
3131
dsn = fmt.Sprintf("%s:%s@(%s:%s)/%s?charset=utf8&parseTime=True&loc=Local",
3232
os.Getenv("MYSQL_USERNAME"),
@@ -35,7 +35,7 @@ func getDatabaseInfo() (string, string, string) {
3535
os.Getenv("MYSQL_PORT"),
3636
os.Getenv("MYSQL_DATABASE"))
3737
case os.Getenv("POSTGRES_HOST") != "":
38-
adapter = "github.com/go-rel/rel/adapter/postgres"
38+
adapter = "github.com/go-rel/postgres"
3939
driver = "github.com/lib/pq"
4040
dsn = fmt.Sprintf("postgres://%s:%s@%s:%s/%s?sslmode=disable",
4141
os.Getenv("POSTGRES_USERNAME"),
@@ -44,7 +44,7 @@ func getDatabaseInfo() (string, string, string) {
4444
os.Getenv("POSTGRES_PORT"),
4545
os.Getenv("POSTGRES_DATABASE"))
4646
case os.Getenv("POSTGRESQL_HOST") != "":
47-
adapter = "github.com/go-rel/rel/adapter/postgres"
47+
adapter = "github.com/go-rel/postgres"
4848
driver = "github.com/lib/pq"
4949
dsn = fmt.Sprintf("postgres://%s:%s@%s:%s/%s?sslmode=disable",
5050
os.Getenv("POSTGRESQL_USERNAME"),

‎cmd/rel/internal/util_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
func TestGetDatabaseInfo(t *testing.T) {
1313
t.Run("database", func(t *testing.T) {
14-
os.Setenv("DATABASE_ADAPTER", "github.com/go-rel/rel/adapter/mysql")
14+
os.Setenv("DATABASE_ADAPTER", "github.com/go-rel/mysql")
1515
os.Setenv("DATABASE_DRIVER", "github.com/go-sql-driver/mysql")
1616
os.Setenv("DATABASE_URL", "user:password@(localhost:3306)/db?charset=utf8&parseTime=True&loc=Local")
1717

@@ -20,7 +20,7 @@ func TestGetDatabaseInfo(t *testing.T) {
2020
defer os.Setenv("DATABASE_URL", "")
2121

2222
adapter, driver, url := getDatabaseInfo()
23-
assert.Equal(t, "github.com/go-rel/rel/adapter/mysql", adapter)
23+
assert.Equal(t, "github.com/go-rel/mysql", adapter)
2424
assert.Equal(t, "github.com/go-sql-driver/mysql", driver)
2525
assert.Equal(t, "user:password@(localhost:3306)/db?charset=utf8&parseTime=True&loc=Local", url)
2626
})
@@ -39,7 +39,7 @@ func TestGetDatabaseInfo(t *testing.T) {
3939
defer os.Setenv("MYSQL_PASSWORD", "")
4040

4141
adapter, driver, url := getDatabaseInfo()
42-
assert.Equal(t, "github.com/go-rel/rel/adapter/mysql", adapter)
42+
assert.Equal(t, "github.com/go-rel/mysql", adapter)
4343
assert.Equal(t, "github.com/go-sql-driver/mysql", driver)
4444
assert.Equal(t, "user:password@(localhost:3306)/db?charset=utf8&parseTime=True&loc=Local", url)
4545
})
@@ -58,7 +58,7 @@ func TestGetDatabaseInfo(t *testing.T) {
5858
defer os.Setenv("POSTGRES_PASSWORD", "")
5959

6060
adapter, driver, url := getDatabaseInfo()
61-
assert.Equal(t, "github.com/go-rel/rel/adapter/postgres", adapter)
61+
assert.Equal(t, "github.com/go-rel/postgres", adapter)
6262
assert.Equal(t, "github.com/lib/pq", driver)
6363
assert.Equal(t, "postgres://user:password@localhost:5432/db?sslmode=disable", url)
6464
})
@@ -77,7 +77,7 @@ func TestGetDatabaseInfo(t *testing.T) {
7777
defer os.Setenv("POSTGRESQL_PASSWORD", "")
7878

7979
adapter, driver, url := getDatabaseInfo()
80-
assert.Equal(t, "github.com/go-rel/rel/adapter/postgres", adapter)
80+
assert.Equal(t, "github.com/go-rel/postgres", adapter)
8181
assert.Equal(t, "github.com/lib/pq", driver)
8282
assert.Equal(t, "postgres://user:password@localhost:5432/db?sslmode=disable", url)
8383
})
@@ -87,7 +87,7 @@ func TestGetDatabaseInfo(t *testing.T) {
8787
defer os.Setenv("SQLITE3_DATABASE", "")
8888

8989
adapter, driver, url := getDatabaseInfo()
90-
assert.Equal(t, "github.com/go-rel/rel/adapter/sqlite3", adapter)
90+
assert.Equal(t, "github.com/go-rel/sqlite3", adapter)
9191
assert.Equal(t, "github.com/mattn/go-sqlite3", driver)
9292
assert.Equal(t, "test.db", url)
9393
})

0 commit comments

Comments
 (0)