Cleaning up.

Author: simukka

.github/workflows/go.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix: 
-        driver: ['mssql','pgsql']
+        driver: ['mssql']
     steps:
       - uses: actions/checkout@v5
 

docker-compose.mssql.yml

@@ -1,17 +1,19 @@
 services:
   mssql:
-    image: mcr.microsoft.com/mssql/server:latest
+    image: mcr.microsoft.com/mssql/server:2022-CU18-ubuntu-22.04
     networks:
       - mssql
     environment:
       ACCEPT_EULA: "Y"
       SA_PASSWORD: VippsPw1
     healthcheck:
-      test: ["CMD", "/opt/mssql-tools18/bin/sqlcmd", "-C", "-Usa", "-PVippsPw1", "-Q", "select 1"]
+      test: ["CMD", "/opt/mssql-tools18/bin/sqlcmd", "-C", "-Usa", "-PVippsPw1", "-Q", "'select 1'"]
       interval: 1s
       retries: 20
   test:
     build:
+      context: .
+      no_cache: true
       dockerfile: dockerfile.test
     networks:
       - mssql

migrations/0001.sqlcode.pgsql

@@ -1,9 +1,7 @@
 databases:
   mssql:
     connection: sqlserver://mssql:1433?database=foo&user id=foouser&password=FooPasswd1
-  pgsql:
-    connection: postgresql://sa:VippsPw1@postgres:5432/master?sslmode=disable
-
+  
 # One option is to list other paths to include ('dependencies') here.
 
 # Commands to set up for testing with credentials above:

sqlcode.yaml

@@ -6,7 +6,6 @@ package sqlparser
 
 import (
 	"crypto/sha256"
-	"errors"
 	"fmt"
 	"io/fs"
 	"path/filepath"
@@ -84,8 +83,8 @@ func ParseFilesystems(fslst []fs.FS, includeTags []string) (filenames []string,
 					hash := sha256.Sum256(buf)
 					existingPathDesc, hashExists := hashes[hash]
 					if hashExists {
-						return errors.New(fmt.Sprintf("file %s has exact same contents as %s (possibly in different filesystems)",
-							pathDesc, existingPathDesc))
+						return fmt.Errorf("file %s has exact same contents as %s (possibly in different filesystems)",
+							pathDesc, existingPathDesc)
 					}
 					hashes[hash] = pathDesc
 
@@ -98,6 +97,9 @@ func ParseFilesystems(fslst []fs.FS, includeTags []string) (filenames []string,
 					// only include if include tags match
 					if matchesIncludeTags(fdoc.PragmaIncludeIf(), includeTags) {
 						filenames = append(filenames, pathDesc)
+						if result == nil {
+							result = &mssql.TSqlDocument{}
+						}
 						result.Include(fdoc)
 					}
 				}

sqlparser/parser.go

@@ -87,7 +87,7 @@ func NewFixture() *Fixture {
 		// 8: Trace SQL statements
 		// 16: Log statement parameters
 		// 32: Log transaction begin/end
-		dsn = dsn + "&log=63"
+		dsn = dsn + "&log=2"
 		mssql.SetLogger(StdoutLogger{})
 		fixture.Driver = SqlDriverMssql
 	}

sqltest/fixture.go

@@ -9,11 +9,7 @@ import (
 //go:embed *.sql
 var sqlfs embed.FS
 
-//go:embed *.pgsql
-var pgsqlfx embed.FS
-
 var SQL = sqlcode.MustInclude(
 	sqlcode.Options{},
 	sqlfs,
-	pgsqlfx,
 )

sqltest/sql.go

@@ -2,7 +2,6 @@ package sqltest
 
 import (
 	"context"
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -18,13 +17,6 @@ func Test_Patch(t *testing.T) {
 		fixture.RunMigrationFile("../migrations/0001.sqlcode.sql")
 	}
 
-	if fixture.IsPostgresql() {
-		fixture.RunMigrationFile("../migrations/0001.sqlcode.pgsql")
-		_, err := fixture.DB.Exec(
-			fmt.Sprintf(`grant create on database "%s" to "sqlcode-definer-role"`, fixture.DBName))
-		require.NoError(t, err)
-	}
-
 	require.NoError(t, SQL.EnsureUploaded(ctx, fixture.DB))
 
 	fixture.RunIfMssql(t, "returns 1 affected row", func(t *testing.T) {
@@ -36,18 +28,6 @@ func Test_Patch(t *testing.T) {
 		require.NoError(t, err)
 		assert.Equal(t, int64(1), rowsAffected)
 	})
-
-	// TODO: instrument a test table to perform an update operation
-	fixture.RunIfPostgres(t, "returns 0 affected rows", func(t *testing.T) {
-		patched := SQL.CodePatch(fixture.DB, `call [code].Test()`)
-		res, err := fixture.DB.ExecContext(ctx, patched)
-		require.NoError(t, err)
-
-		// postgresql perform does not result with affected rows
-		rowsAffected, err := res.RowsAffected()
-		require.NoError(t, err)
-		assert.Equal(t, int64(0), rowsAffected)
-	})
 }
 
 func Test_EnsureUploaded(t *testing.T) {
@@ -63,19 +43,6 @@ func Test_EnsureUploaded(t *testing.T) {
 		require.Len(t, schemas, 1)
 
 	})
-
-	f.RunIfPostgres(t, "uploads schema", func(t *testing.T) {
-		f.RunMigrationFile("../migrations/0001.sqlcode.pgsql")
-
-		_, err := f.DB.Exec(
-			fmt.Sprintf(`grant create on database "%s" to "sqlcode-definer-role"`, f.DBName))
-		require.NoError(t, err)
-
-		require.NoError(t, SQL.EnsureUploaded(ctx, f.DB))
-		schemas, err := SQL.ListUploaded(ctx, f.DB)
-		require.NoError(t, err)
-		require.Len(t, schemas, 1)
-	})
 }
 
 func Test_DropAndUpload(t *testing.T) {
@@ -88,15 +55,4 @@ func Test_DropAndUpload(t *testing.T) {
 		require.NoError(t, SQL.EnsureUploaded(ctx, f.DB))
 		require.NoError(t, SQL.DropAndUpload(ctx, f.DB))
 	})
-
-	f.RunIfPostgres(t, "drop and upload", func(t *testing.T) {
-		f.RunMigrationFile("../migrations/0001.sqlcode.pgsql")
-
-		_, err := f.DB.Exec(
-			fmt.Sprintf(`grant create on database "%s" to "sqlcode-definer-role"`, f.DBName))
-		require.NoError(t, err)
-
-		require.NoError(t, SQL.EnsureUploaded(ctx, f.DB))
-		require.NoError(t, SQL.DropAndUpload(ctx, f.DB))
-	})
 }