From 4905463df5ebec125fb65c604b0481c455929642 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Wed, 3 Jan 2024 15:20:13 -0800 Subject: [PATCH 1/2] test: Use local database server for vet tests --- examples/authors/sqlc.yaml | 4 ++-- examples/batch/sqlc.json | 2 +- examples/booktest/sqlc.json | 4 ++-- examples/jets/sqlc.json | 2 +- examples/ondeck/sqlc.json | 4 ++-- internal/endtoend/vet_test.go | 15 ++++++++++----- 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/examples/authors/sqlc.yaml b/examples/authors/sqlc.yaml index bf6cdb21a1..57f2319ea1 100644 --- a/examples/authors/sqlc.yaml +++ b/examples/authors/sqlc.yaml @@ -7,7 +7,7 @@ sql: queries: postgresql/query.sql engine: postgresql database: - managed: true + uri: "${VET_TEST_EXAMPLES_POSTGRES_AUTHORS}" analyzer: database: false rules: @@ -23,7 +23,7 @@ sql: queries: mysql/query.sql engine: mysql database: - managed: true + uri: "${VET_TEST_EXAMPLES_MYSQL_AUTHORS}" rules: - sqlc/db-prepare # - mysql-query-too-costly diff --git a/examples/batch/sqlc.json b/examples/batch/sqlc.json index 5b81b40786..2f6b9a9e7e 100644 --- a/examples/batch/sqlc.json +++ b/examples/batch/sqlc.json @@ -11,7 +11,7 @@ "queries": "postgresql/query.sql", "engine": "postgresql", "database": { - "managed": true + "uri": "${VET_TEST_EXAMPLES_POSTGRES_BATCH}" }, "analyzer": { "database": false diff --git a/examples/booktest/sqlc.json b/examples/booktest/sqlc.json index fb7f3823cc..b0b0d71d01 100644 --- a/examples/booktest/sqlc.json +++ b/examples/booktest/sqlc.json @@ -12,7 +12,7 @@ "engine": "postgresql", "sql_package": "pgx/v5", "database": { - "managed": true + "uri": "${VET_TEST_EXAMPLES_POSTGRES_BOOKTEST}" }, "analyzer": { "database": false @@ -28,7 +28,7 @@ "queries": "mysql/query.sql", "engine": "mysql", "database": { - "managed": true + "uri": "${VET_TEST_EXAMPLES_MYSQL_BOOKTEST}" }, "rules": [ "sqlc/db-prepare" diff --git a/examples/jets/sqlc.json b/examples/jets/sqlc.json index d664966753..8dfa0df777 100644 --- a/examples/jets/sqlc.json +++ b/examples/jets/sqlc.json @@ -12,7 +12,7 @@ "engine": "postgresql", "sql_package": "pgx/v5", "database": { - "managed": true + "uri": "${VET_TEST_EXAMPLES_POSTGRES_JETS}" }, "analyzer": { "database": false diff --git a/examples/ondeck/sqlc.json b/examples/ondeck/sqlc.json index f8070f3641..7b97328b3f 100644 --- a/examples/ondeck/sqlc.json +++ b/examples/ondeck/sqlc.json @@ -12,7 +12,7 @@ "engine": "postgresql", "sql_package": "database/sql", "database": { - "managed": true + "uri": "${VET_TEST_EXAMPLES_POSTGRES_ONDECK}" }, "analyzer": { "database": false @@ -31,7 +31,7 @@ "queries": "mysql/query", "engine": "mysql", "database": { - "managed": true + "uri": "${VET_TEST_EXAMPLES_MYSQL_ONDECK}" }, "rules": [ "sqlc/db-prepare" diff --git a/internal/endtoend/vet_test.go b/internal/endtoend/vet_test.go index 55b2b89112..c7915012d3 100644 --- a/internal/endtoend/vet_test.go +++ b/internal/endtoend/vet_test.go @@ -9,10 +9,12 @@ import ( "fmt" "os" "path/filepath" + "strings" "testing" "github.com/sqlc-dev/sqlc/internal/cmd" "github.com/sqlc-dev/sqlc/internal/sqltest" + "github.com/sqlc-dev/sqlc/internal/sqltest/local" ) func findSchema(t *testing.T, path string) (string, bool) { @@ -31,11 +33,6 @@ func TestExamplesVet(t *testing.T) { t.Parallel() ctx := context.Background() - authToken := os.Getenv("SQLC_AUTH_TOKEN") - if authToken == "" { - t.Skip("missing auth token") - } - examples, err := filepath.Abs(filepath.Join("..", "..", "examples")) if err != nil { t.Fatal(err) @@ -62,6 +59,14 @@ func TestExamplesVet(t *testing.T) { defer db.Close() defer cleanup() } + if s, found := findSchema(t, filepath.Join(path, "mysql")); found { + uri := local.MySQL(t, []string{s}) + os.Setenv(fmt.Sprintf("VET_TEST_EXAMPLES_MYSQL_%s", strings.ToUpper(tc)), uri) + } + if s, found := findSchema(t, filepath.Join(path, "postgresql")); found { + uri := local.PostgreSQL(t, []string{s}) + os.Setenv(fmt.Sprintf("VET_TEST_EXAMPLES_POSTGRES_%s", strings.ToUpper(tc)), uri) + } } var stderr bytes.Buffer From a3523db16868e60bf58e5dd6833ed3e225fdbc94 Mon Sep 17 00:00:00 2001 From: Kyle Conroy Date: Wed, 3 Jan 2024 15:21:54 -0800 Subject: [PATCH 2/2] Remove last use of hosted --- examples/authors/mysql/db_test.go | 4 ++-- examples/booktest/mysql/db_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/authors/mysql/db_test.go b/examples/authors/mysql/db_test.go index 589b22424a..270b5d8049 100644 --- a/examples/authors/mysql/db_test.go +++ b/examples/authors/mysql/db_test.go @@ -10,12 +10,12 @@ import ( _ "github.com/go-sql-driver/mysql" - "github.com/sqlc-dev/sqlc/internal/sqltest/hosted" + "github.com/sqlc-dev/sqlc/internal/sqltest/local" ) func TestAuthors(t *testing.T) { ctx := context.Background() - uri := hosted.MySQL(t, []string{"schema.sql"}) + uri := local.MySQL(t, []string{"schema.sql"}) sdb, err := sql.Open("mysql", uri) if err != nil { t.Fatal(err) diff --git a/examples/booktest/mysql/db_test.go b/examples/booktest/mysql/db_test.go index b2c80d178a..8e048319b5 100644 --- a/examples/booktest/mysql/db_test.go +++ b/examples/booktest/mysql/db_test.go @@ -11,12 +11,12 @@ import ( _ "github.com/go-sql-driver/mysql" - "github.com/sqlc-dev/sqlc/internal/sqltest/hosted" + "github.com/sqlc-dev/sqlc/internal/sqltest/local" ) func TestBooks(t *testing.T) { ctx := context.Background() - uri := hosted.MySQL(t, []string{"schema.sql"}) + uri := local.MySQL(t, []string{"schema.sql"}) db, err := sql.Open("mysql", uri) if err != nil { t.Fatal(err)