Postgres

.github/workflows/go.yml

@@ -1,7 +1,7 @@
 # This workflow will build a golang project
 # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go
 
-name: go-querysql-test
+name: sqlcode
 
 on:
   pull_request:
@@ -11,19 +11,16 @@ jobs:
 
   build:
     runs-on: ubuntu-latest
-    env:
-      SQLSERVER_DSN: "sqlserver://127.0.0.1:1433?database=master&user id=sa&password=VippsPw1"
+    strategy:
+      matrix: 
+        driver: ['mssql','pgsql']
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.23'
-
-      - name: Start db
-        run: docker compose -f docker-compose.test.yml up -d
+          go-version: '1.25'
 
       - name: Test
-        # Skip the example folder because it has examples of what-not-to-do
-        run: go test -v $(go list ./... | grep -v './example')
+        run: docker compose -f docker-compose.${{ matrix.driver }}.yml run test

Makefile

@@ -0,0 +1,8 @@
+test: test_mssql test_pgsql
+
+
+test_mssql:
+	docker compose --progress plain -f docker-compose.mssql.yml run test
+
+test_pgsql:
+	docker compose --progress plain -f docker-compose.pgsql.yml run test

cli/cmd/build.go

@@ -3,6 +3,8 @@ package cmd
 import (
 	"errors"
 	"fmt"
+
+	mssql "github.com/microsoft/go-mssqldb"
 	"github.com/spf13/cobra"
 	"github.com/vippsas/sqlcode"
 )
@@ -23,7 +25,7 @@ var (
 				return err
 			}
 
-			preprocessed, err := sqlcode.Preprocess(d.CodeBase, schemasuffix)
+			preprocessed, err := sqlcode.Preprocess(d.CodeBase, schemasuffix, &mssql.Driver{})
 			if err != nil {
 				return err
 			}

cli/cmd/config.go

@@ -5,16 +5,17 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
-	mssql "github.com/denisenkom/go-mssqldb"
-	"github.com/denisenkom/go-mssqldb/azuread"
-	"golang.org/x/net/proxy"
 	"io/ioutil"
 	"os"
 	"path"
 	"strings"
 
-	_ "github.com/denisenkom/go-mssqldb/azuread"
-	"github.com/denisenkom/go-mssqldb/msdsn"
+	mssql "github.com/microsoft/go-mssqldb"
+	"github.com/microsoft/go-mssqldb/azuread"
+	"golang.org/x/net/proxy"
+
+	_ "github.com/microsoft/go-mssqldb/azuread"
+	"github.com/microsoft/go-mssqldb/msdsn"
 	"github.com/sirupsen/logrus"
 	"gopkg.in/yaml.v3"
 )

cli/cmd/constants.go

@@ -20,18 +20,18 @@ var (
 			if err != nil {
 				return err
 			}
-			if len(d.CodeBase.Creates) == 0 && len(d.CodeBase.Declares) == 0 {
+			if d.CodeBase.Empty() {
 				fmt.Println("No SQL code found in given paths")
 			}
-			if len(d.CodeBase.Errors) > 0 {
+			if d.CodeBase.HasErrors() {
 				fmt.Println("Errors:")
-				for _, e := range d.CodeBase.Errors {
+				for _, e := range d.CodeBase.Errors() {
 					fmt.Printf("%s:%d:%d: %s\n", e.Pos.File, e.Pos.Line, e.Pos.Line, e.Message)
 				}
 				return nil
 			}
 			fmt.Println("declare")
-			for i, c := range d.CodeBase.Declares {
+			for i, c := range d.CodeBase.Declares() {
 				var prefix string
 				if i == 0 {
 					prefix = "    "

cli/cmd/dep.go

@@ -36,16 +36,16 @@ var (
 				fmt.Println()
 				err = nil
 			}
-			if len(d.CodeBase.Creates) == 0 && len(d.CodeBase.Declares) == 0 {
+			if d.CodeBase.Empty() {
 				fmt.Println("No SQL code found in given paths")
 			}
-			if len(d.CodeBase.Errors) > 0 {
+			if d.CodeBase.HasErrors() {
 				fmt.Println("Errors:")
-				for _, e := range d.CodeBase.Errors {
+				for _, e := range d.CodeBase.Errors() {
 					fmt.Printf("%s:%d:%d: %s\n", e.Pos.File, e.Pos.Line, e.Pos.Line, e.Message)
 				}
 			}
-			for _, c := range d.CodeBase.Creates {
+			for _, c := range d.CodeBase.Creates() {
 				fmt.Println(c.QuotedName.String() + ":")
 				if len(c.DependsOn) > 0 {
 					fmt.Println("  Uses:")

dbintf.go

@@ -3,6 +3,7 @@ package sqlcode
 import (
 	"context"
 	"database/sql"
+	"database/sql/driver"
 )
 
 type DB interface {
@@ -11,6 +12,7 @@ type DB interface {
 	QueryRowContext(ctx context.Context, query string, args ...interface{}) *sql.Row
 	Conn(ctx context.Context) (*sql.Conn, error)
 	BeginTx(ctx context.Context, txOptions *sql.TxOptions) (*sql.Tx, error)
+	Driver() driver.Driver
 }
 
 var _ DB = &sql.DB{}

dbops.go

@@ -3,11 +3,26 @@ package sqlcode
 import (
 	"context"
 	"database/sql"
+
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/stdlib"
+	mssql "github.com/microsoft/go-mssqldb"
 )
 
 func Exists(ctx context.Context, dbc DB, schemasuffix string) (bool, error) {
 	var schemaID int
-	err := dbc.QueryRowContext(ctx, `select isnull(schema_id(@p1), 0)`, SchemaName(schemasuffix)).Scan(&schemaID)
+
+	driver := dbc.Driver()
+	var qs string
+
+	if _, ok := driver.(*mssql.Driver); ok {
+		qs = `select isnull(schema_id(@p1), 0)`
+	}
+	if _, ok := driver.(*stdlib.Driver); ok {
+		qs = `select coalesce((select oid from pg_namespace where nspname = $1),0)`
+	}
+
+	err := dbc.QueryRowContext(ctx, qs, SchemaName(schemasuffix)).Scan(&schemaID)
 	if err != nil {
 		return false, err
 	}
@@ -19,8 +34,24 @@ func Drop(ctx context.Context, dbc DB, schemasuffix string) error {
 	if err != nil {
 		return err
 	}
-	_, err = tx.ExecContext(ctx, `sqlcode.DropCodeSchema`,
-		sql.Named("schemasuffix", schemasuffix))
+
+	var qs string
+	var arg = []interface{}{}
+	driver := dbc.Driver()
+
+	if _, ok := driver.(*mssql.Driver); ok {
+		qs = `sqlcode.DropCodeSchema`
+		arg = []interface{}{sql.Named("schemasuffix", schemasuffix)}
+	}
+
+	if _, ok := dbc.Driver().(*stdlib.Driver); ok {
+		qs = `call sqlcode.dropcodeschema(@schemasuffix)`
+		arg = []interface{}{
+			pgx.NamedArgs{"schemasuffix": schemasuffix},
+		}
+	}
+
+	_, err = tx.ExecContext(ctx, qs, arg...)
 	if err != nil {
 		_ = tx.Rollback()
 		return err