Fixed issues in postgresql sequence/column diff

.github/workflows/ci-macos.yml

@@ -18,6 +18,12 @@ jobs:
     - name: Build
       run: |
         brew install pkg-config protobuf protoc-gen-go
+        make all_wo_orcl
+        ls -ltr bin/
+        ./bin/schema_gen --help
+        ./bin/diff_gen --help
+        rm -rf bin
+        git checkout schema_gen/schema_gen.go go.mod go.sum
         pushd /tmp
         wget -q https://download.oracle.com/otn_software/mac/instantclient/198000/instantclient-basic-macos.x64-19.8.0.0.0dbru.dmg
         wget -q https://download.oracle.com/otn_software/mac/instantclient/198000/instantclient-sdk-macos.x64-19.8.0.0.0dbru.dmg
@@ -29,14 +35,10 @@ jobs:
         ./install_ic.sh
         popd
         cp oci8-macos.pc /Users/runner/Downloads/instantclient_19_8/oci8.pc
-        export LD_LIBRARY_PATH=/Users/runner/Downloads/instantclient_19_8
-        export PKG_CONFIG_PATH=/Users/runner/Downloads/instantclient_19_8
+        export LD_LIBRARY_PATH=/Users/runner/Downloads/instantclient_19_8:$LD_LIBRARY_PATH
+        export DYLD_FALLBACK_LIBRARY_PATH=$LD_LIBRARY_PATH
+        export PKG_CONFIG_PATH=/Users/runner/Downloads/instantclient_19_8:$PKG_CONFIG_PATH
         make all
         ls -ltr bin/
         ./bin/schema_gen --help
         ./bin/diff_gen --help
-        rm -rf bin
-        make all_wo_orcl
-        ls -ltr bin/
-        ./bin/schema_gen --help
-        ./bin/diff_gen --help

.github/workflows/ci-release.yml

@@ -21,11 +21,8 @@ jobs:
       id: extract_branch
     - name: Install docker
       run: |
-        HOMEBREW_NO_AUTO_UPDATE=1 brew install --cask docker
-        sudo /Applications/Docker.app/Contents/MacOS/Docker --unattended --install-privileged-components
-        open -a /Applications/Docker.app --args --unattended --accept-license
-        echo "We are waiting for Docker to be up and running. It can take over 2 minutes..."
-        while ! /Applications/Docker.app/Contents/Resources/bin/docker info &>/dev/null; do sleep 1; done 
+        brew install docker colima
+        colima start
     - name: Build
       run: |
         brew install pkg-config protobuf protoc-gen-go

.github/workflows/ci-win.yml

@@ -58,6 +58,7 @@ jobs:
         ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       run: |
         echo "::add-path::C:\temp\basic\instantclient_21_3"
+        echo "::add-path::C:\Strawberry\perl\bin"
         echo '::set-env name=CGO_CFLAGS::-IC:\temp\basic\instantclient_21_3\sdk\include'
         echo '::set-env name=CGO_LDFLAGS::-LC:\temp\basic\instantclient_21_3\sdk\lib\msvc -lstdc++ -loci'
         echo '::set-env name=PKG_CONFIG_PATH::C:\temp'
@@ -75,7 +76,7 @@ jobs:
         mv instantclient_21_3/sdk basic/instantclient_21_3/
         cd D:\a\sqldiffer\sqldiffer
         cp oci8-win.pc c:\temp\oci8.pc
-        git checkout schema_gen/schema_gen.go  go.mod  go.sum
+        git checkout schema_gen/schema_gen.go go.mod go.sum
         make all
         dir bin
         cd bin

go.mod

@@ -3,17 +3,18 @@ module github.com/sumeetchhetri/sqldiffer
 go 1.17
 
 require (
-	github.com/denisenkom/go-mssqldb v0.11.0
+	github.com/denisenkom/go-mssqldb v0.12.2
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/golang/protobuf v1.5.2
 	github.com/jessevdk/go-flags v1.5.0
-	github.com/lib/pq v1.10.4
+	github.com/lib/pq v1.10.7
 	github.com/mattn/go-oci8 v0.1.1
 )
 
 require (
-	github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
-	golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c // indirect
-	golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4 // indirect
-	google.golang.org/protobuf v1.26.0 // indirect
+	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
+	github.com/golang-sql/sqlexp v0.1.0 // indirect
+	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 // indirect
+	golang.org/x/sys v0.0.0-20220915200043-7b5979e65e41 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
 )

go.sum

@@ -1,9 +1,21 @@
+github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0=
+github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/denisenkom/go-mssqldb v0.11.0 h1:9rHa233rhdOyrz2GcP9NM+gi2psgJZ4GWDpL/7ND8HI=
 github.com/denisenkom/go-mssqldb v0.11.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
+github.com/denisenkom/go-mssqldb v0.12.2 h1:1OcPn5GBIobjWNd+8yjfHNIaFX14B1pWI3F9HZy5KXw=
+github.com/denisenkom/go-mssqldb v0.12.2/go.mod h1:lnIw1mZukFRZDJYQ0Pb833QS2IaC3l5HkEfra2LJ+sk=
+github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
+github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=
+github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
+github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
+github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
@@ -13,15 +25,44 @@ github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LF
 github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
 github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk=
 github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
+github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
+github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/mattn/go-oci8 v0.1.1 h1:aEUDxNAyDG0tv8CA3TArnDQNyc4EhnWlsfxRgDHABHM=
 github.com/mattn/go-oci8 v0.1.1/go.mod h1:wjDx6Xm9q7dFtHJvIlrI99JytznLw5wQ4R+9mNXJwGI=
+github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8=
+github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c h1:Vj5n4GlwjmQteupaxJ9+0FNOmBrHfq7vN4btdGoDZgI=
 golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90 h1:Y/gsMcFOcR+6S6f3YeMKl5g+dZMEWqcz5Czj/GWYbkM=
+golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4 h1:EZ2mChiOa8udjfp6rRmswTbtZN/QzUQp4ptM4rnjHvc=
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220915200043-7b5979e65e41 h1:ohgcoMbSofXygzo6AD2I1kz3BFmW1QArPYTtwEM3UXc=
+golang.org/x/sys v0.0.0-20220915200043-7b5979e65e41/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

sequence/postgresql.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	sql "database/sql"
 	"strconv"
+
 	//"fmt"
 	//proto "github.com/golang/protobuf/proto"
 	c "github.com/sumeetchhetri/sqldiffer/common"
@@ -95,7 +96,7 @@ func (db *PgSequence) Query(context interface{}) string {
 		NULL, 
 		NULL 
 	FROM information_schema.sequences i
-	inner join pg_sequence p on i.sequence_name::regclass = p.seqrelid`
+	inner join pg_sequence p on i.sequence_name = p.seqrelid::regclass::text`
 }
 
 //FromResult -

table/column/mysql.go

@@ -5,8 +5,10 @@ import (
 	sql "database/sql"
 	"fmt"
 	"regexp"
-	c "github.com/sumeetchhetri/sqldiffer/common"
 	"strings"
+
+	c "github.com/sumeetchhetri/sqldiffer/common"
+
 	//proto "github.com/golang/protobuf/proto"
 	pb2 "github.com/sumeetchhetri/sqldiffer/protos"
 )
@@ -63,7 +65,7 @@ func (db *MysqlColumn) GenerateUpd(co *pb2.Column, context interface{}) string {
 		b.WriteString(" USING ")
 		b.WriteString(*co.Name)
 		t := *co.Type
-		if strings.Index(t, "(") != -1 {
+		if strings.Contains(t, "(") {
 			t = t[0:strings.Index(t, "(")]
 		}
 		b.WriteString("::")

table/column/postgresql.go

@@ -5,8 +5,10 @@ import (
 	sql "database/sql"
 	"fmt"
 	"regexp"
-	c "github.com/sumeetchhetri/sqldiffer/common"
 	"strings"
+
+	c "github.com/sumeetchhetri/sqldiffer/common"
+
 	//"fmt"
 	//proto "github.com/golang/protobuf/proto"
 	pb2 "github.com/sumeetchhetri/sqldiffer/protos"
@@ -35,7 +37,7 @@ func (db *PgColumn) GenerateNew(co *pb2.Column, context interface{}) string {
 	if !*co.Notnull {
 		b.WriteString(" NOT NULL ")
 	}
-	if co.DefVal != nil {
+	if co.DefVal != nil && *co.DefVal != "" {
 		b.WriteString(" DEFAULT ")
 		b.WriteString(*co.DefVal)
 	}
@@ -64,7 +66,7 @@ func (db *PgColumn) GenerateUpd(co *pb2.Column, context interface{}) string {
 		b.WriteString(" USING ")
 		b.WriteString(*co.Name)
 		t := *co.Type
-		if strings.Index(t, "(") != -1 {
+		if strings.Contains(t, "(") {
 			t = t[0:strings.Index(t, "(")]
 		}
 		b.WriteString("::")

table/postgresql.go

@@ -5,6 +5,7 @@ import (
 	sql "database/sql"
 	"regexp"
 	"strings"
+
 	//"fmt"
 	c "github.com/sumeetchhetri/sqldiffer/common"
 	//proto "github.com/golang/protobuf/proto"
@@ -64,7 +65,7 @@ func (db *PgTable) GenerateDel(tb *pb2.Table, context interface{}) string {
 	var b bytes.Buffer
 	b.WriteString("\nDROP TABLE ")
 	b.WriteString(*tb.Name)
-	b.WriteString("\n")
+	b.WriteString(";\n")
 	return b.String()
 }