💥 Remove builtin sqlite3 adapter (#257)

* 💥 Remove builtin sqlite3 adapter * fix adapter path * fix adapter path * fix adapter path
go-rel · Nov 14, 2021 · 5300585 · 5300585
1 parent 3243db8
commit 5300585
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 259 deletions.
diff --git a/adapter/sqlite3/sqlite3.go b/adapter/sqlite3/sqlite3.go
diff --git a/adapter/sqlite3/sqlite3_test.go b/adapter/sqlite3/sqlite3_test.go
diff --git a/cmd/rel/internal/migrate_test.go b/cmd/rel/internal/migrate_test.go
@@ -29,7 +29,7 @@ func TestExecMigrate(t *testing.T) {
 			args = []string{
 				"rel",
 				"migrate",
-				"-adapter=github.com/go-rel/rel/adapter/sqlite3",
+				"-adapter=github.com/go-rel/sqlite3",
 				"-driver=github.com/mattn/go-sqlite3",
 				"-dsn=:memory:",
 				"-dir=db",
@@ -47,7 +47,7 @@ func TestExecMigrate(t *testing.T) {
 				"migrate",
 				"-dir=testdata/migrations",
 				"-module=github.com/go-rel/rel/cmd/rel/internal",
-				"-adapter=github.com/go-rel/rel/adapter/sqlite3",
+				"-adapter=github.com/go-rel/sqlite3",
 				"-driver=github.com/mattn/go-sqlite3",
 				"-dsn=:memory:",
 				"-verbose=false",

diff --git a/cmd/rel/internal/util.go b/cmd/rel/internal/util.go
@@ -22,11 +22,11 @@ func getDatabaseInfo() (string, string, string) {
 		driver = os.Getenv("DATABASE_DRIVER")
 		dsn = os.Getenv("DATABASE_URL")
 	case os.Getenv("SQLITE3_DATABASE") != "":
-		adapter = "github.com/go-rel/rel/adapter/sqlite3"
+		adapter = "github.com/go-rel/sqlite3"
 		driver = "github.com/mattn/go-sqlite3"
 		dsn = os.Getenv("SQLITE3_DATABASE")
 	case os.Getenv("MYSQL_HOST") != "":
-		adapter = "github.com/go-rel/rel/adapter/mysql"
+		adapter = "github.com/go-rel/mysql"
 		driver = "github.com/go-sql-driver/mysql"
 		dsn = fmt.Sprintf("%s:%s@(%s:%s)/%s?charset=utf8&parseTime=True&loc=Local",
 			os.Getenv("MYSQL_USERNAME"),
@@ -35,7 +35,7 @@ func getDatabaseInfo() (string, string, string) {
 			os.Getenv("MYSQL_PORT"),
 			os.Getenv("MYSQL_DATABASE"))
 	case os.Getenv("POSTGRES_HOST") != "":
-		adapter = "github.com/go-rel/rel/adapter/postgres"
+		adapter = "github.com/go-rel/postgres"
 		driver = "github.com/lib/pq"
 		dsn = fmt.Sprintf("postgres://%s:%s@%s:%s/%s?sslmode=disable",
 			os.Getenv("POSTGRES_USERNAME"),
@@ -44,7 +44,7 @@ func getDatabaseInfo() (string, string, string) {
 			os.Getenv("POSTGRES_PORT"),
 			os.Getenv("POSTGRES_DATABASE"))
 	case os.Getenv("POSTGRESQL_HOST") != "":
-		adapter = "github.com/go-rel/rel/adapter/postgres"
+		adapter = "github.com/go-rel/postgres"
 		driver = "github.com/lib/pq"
 		dsn = fmt.Sprintf("postgres://%s:%s@%s:%s/%s?sslmode=disable",
 			os.Getenv("POSTGRESQL_USERNAME"),

diff --git a/cmd/rel/internal/util_test.go b/cmd/rel/internal/util_test.go
@@ -11,7 +11,7 @@ import (
 
 func TestGetDatabaseInfo(t *testing.T) {
 	t.Run("database", func(t *testing.T) {
-		os.Setenv("DATABASE_ADAPTER", "github.com/go-rel/rel/adapter/mysql")
+		os.Setenv("DATABASE_ADAPTER", "github.com/go-rel/mysql")
 		os.Setenv("DATABASE_DRIVER", "github.com/go-sql-driver/mysql")
 		os.Setenv("DATABASE_URL", "user:password@(localhost:3306)/db?charset=utf8&parseTime=True&loc=Local")
 
@@ -20,7 +20,7 @@ func TestGetDatabaseInfo(t *testing.T) {
 		defer os.Setenv("DATABASE_URL", "")
 
 		adapter, driver, url := getDatabaseInfo()
-		assert.Equal(t, "github.com/go-rel/rel/adapter/mysql", adapter)
+		assert.Equal(t, "github.com/go-rel/mysql", adapter)
 		assert.Equal(t, "github.com/go-sql-driver/mysql", driver)
 		assert.Equal(t, "user:password@(localhost:3306)/db?charset=utf8&parseTime=True&loc=Local", url)
 	})
@@ -39,7 +39,7 @@ func TestGetDatabaseInfo(t *testing.T) {
 		defer os.Setenv("MYSQL_PASSWORD", "")
 
 		adapter, driver, url := getDatabaseInfo()
-		assert.Equal(t, "github.com/go-rel/rel/adapter/mysql", adapter)
+		assert.Equal(t, "github.com/go-rel/mysql", adapter)
 		assert.Equal(t, "github.com/go-sql-driver/mysql", driver)
 		assert.Equal(t, "user:password@(localhost:3306)/db?charset=utf8&parseTime=True&loc=Local", url)
 	})
@@ -58,7 +58,7 @@ func TestGetDatabaseInfo(t *testing.T) {
 		defer os.Setenv("POSTGRES_PASSWORD", "")
 
 		adapter, driver, url := getDatabaseInfo()
-		assert.Equal(t, "github.com/go-rel/rel/adapter/postgres", adapter)
+		assert.Equal(t, "github.com/go-rel/postgres", adapter)
 		assert.Equal(t, "github.com/lib/pq", driver)
 		assert.Equal(t, "postgres://user:password@localhost:5432/db?sslmode=disable", url)
 	})
@@ -77,7 +77,7 @@ func TestGetDatabaseInfo(t *testing.T) {
 		defer os.Setenv("POSTGRESQL_PASSWORD", "")
 
 		adapter, driver, url := getDatabaseInfo()
-		assert.Equal(t, "github.com/go-rel/rel/adapter/postgres", adapter)
+		assert.Equal(t, "github.com/go-rel/postgres", adapter)
 		assert.Equal(t, "github.com/lib/pq", driver)
 		assert.Equal(t, "postgres://user:password@localhost:5432/db?sslmode=disable", url)
 	})
@@ -87,7 +87,7 @@ func TestGetDatabaseInfo(t *testing.T) {
 		defer os.Setenv("SQLITE3_DATABASE", "")
 
 		adapter, driver, url := getDatabaseInfo()
-		assert.Equal(t, "github.com/go-rel/rel/adapter/sqlite3", adapter)
+		assert.Equal(t, "github.com/go-rel/sqlite3", adapter)
 		assert.Equal(t, "github.com/mattn/go-sqlite3", driver)
 		assert.Equal(t, "test.db", url)
 	})