Cleaning up and rewriting how connection strings are build, expecially around handling of of SQLite PRAGMAs. Work in progress.

Author: c9845 (AA)

go.mod

@@ -24,10 +24,7 @@ require (
 	golang.org/x/tools v0.17.0 // indirect
 	lukechampine.com/uint128 v1.3.0 // indirect
 	modernc.org/cc/v3 v3.41.0 // indirect
-	modernc.org/cc/v4 v4.2.1 // indirect
 	modernc.org/ccgo/v3 v3.16.15 // indirect
-	modernc.org/ccgo/v4 v4.0.0-20230612200659-63de3e82e68d // indirect
-	modernc.org/gc/v2 v2.1.2-0.20220923113132-f3b5abcf8083 // indirect
 	modernc.org/libc v1.40.5 // indirect
 	modernc.org/mathutil v1.6.0 // indirect
 	modernc.org/memory v1.7.2 // indirect

go.sum

@@ -6,7 +6,6 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/denisenkom/go-mssqldb v0.12.3 h1:pBSGx9Tq67pBOTLmxNuirNTeB8Vjmf886Kx+8Y+8shw=
 github.com/denisenkom/go-mssqldb v0.12.3/go.mod h1:k0mtMFOnU+AihqFxPMiF05rtiDrorD1Vrm1KEz5hxDo=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
@@ -21,8 +20,6 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
 github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
-github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
-github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
 github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
@@ -34,8 +31,6 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/mattn/go-sqlite3 v1.14.18 h1:JL0eqdCOq6DJVNPSvArO/bIV9/P7fbGrV00LZHc+5aI=
-github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI=
 github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8=
@@ -49,35 +44,27 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/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-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
-golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
 golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
 golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
-golang.org/x/exp v0.0.0-20181106170214-d68db9428509/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
 golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 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/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
-golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 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-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
 golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 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/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8=
-golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk=
 golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
 golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -89,23 +76,12 @@ lukechampine.com/uint128 v1.3.0 h1:cDdUVfRwDUDovz610ABgFD17nXD4/uDgVHl2sC3+sbo=
 lukechampine.com/uint128 v1.3.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
 modernc.org/cc/v3 v3.41.0 h1:QoR1Sn3YWlmA1T4vLaKZfawdVtSiGx8H+cEojbC7v1Q=
 modernc.org/cc/v3 v3.41.0/go.mod h1:Ni4zjJYJ04CDOhG7dn640WGfwBzfE0ecX8TyMB0Fv0Y=
-modernc.org/cc/v4 v4.2.1 h1:xwwaXFwiPaVZpGRMd19NPLsaiNyNBO8oChey4501g1M=
-modernc.org/cc/v4 v4.2.1/go.mod h1:0O8vuqhQfwBy+piyfEjzWIUGV4I3TPsXSf0W05+lgN8=
 modernc.org/ccgo/v3 v3.16.15 h1:KbDR3ZAVU+wiLyMESPtbtE/Add4elztFyfsWoNTgxS0=
 modernc.org/ccgo/v3 v3.16.15/go.mod h1:yT7B+/E2m43tmMOT51GMoM98/MtHIcQQSleGnddkUNI=
-modernc.org/ccgo/v4 v4.0.0-20230612200659-63de3e82e68d h1:3yB/pQNL5kVPDifGFqoZjeRxf8m0+Us15rB7ertNASQ=
-modernc.org/ccgo/v4 v4.0.0-20230612200659-63de3e82e68d/go.mod h1:austqj6cmEDRfewsUvmGmyIgsI/Nq87oTXlfTgY85Fc=
 modernc.org/ccorpus v1.11.6 h1:J16RXiiqiCgua6+ZvQot4yUuUy8zxgqbqEEUuGPlISk=
 modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
-modernc.org/fileutil v1.0.0/go.mod h1:JHsWpkrk/CnVV1H/eGlFf85BEpfkrp56ro8nojIq9Q8=
-modernc.org/gc/v2 v2.1.2-0.20220923113132-f3b5abcf8083 h1:rGoLVwiOxdeVkGYMOF/8Pw7xpDd3OqScJU/tqHgvY1c=
-modernc.org/gc/v2 v2.1.2-0.20220923113132-f3b5abcf8083/go.mod h1:Zt5HLUW0j+l02wj99UsPs+1DOFwwsGnqfcw+BGyyP/A=
 modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=
 modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
-modernc.org/lex v1.1.0/go.mod h1:+ojes+j0JYCaqwKYCBjcUavscJHmWFKvViUTMU4VjLA=
-modernc.org/lexer v1.0.0/go.mod h1:F/Dld0YKYdZCLQ7bD0USbWL4YKCyTDRDHiDTOs0q0vk=
-modernc.org/libc v1.34.9 h1:yhQGs5jsWHJIU7jY6nCe8GJw27j+z6xYi0eorwPpGgI=
-modernc.org/libc v1.34.9/go.mod h1:YAXkAZ8ktnkCKaN9sw/UDeUVkGYJ/YquGO4FTi5nmHE=
 modernc.org/libc v1.40.5 h1:B9KljZSWzWCV2WtgQ54xu0Ig4imof21SLnKFx7qZ3os=
 modernc.org/libc v1.40.5/go.mod h1:YAXkAZ8ktnkCKaN9sw/UDeUVkGYJ/YquGO4FTi5nmHE=
 modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
@@ -114,16 +90,12 @@ modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E=
 modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E=
 modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
 modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/scannertest v1.0.0/go.mod h1:9qnOCV+wSvq1o9hcOPNwRorND4qpZdtmTvmcdKyN3iE=
-modernc.org/sqlite v1.27.0 h1:MpKAHoyYB7xqcwnUwkuD+npwEa0fojF0B5QRbN+auJ8=
-modernc.org/sqlite v1.27.0/go.mod h1:Qxpazz0zH8Z1xCFyi5GSL3FzbtZ3fvbjmywNogldEW0=
 modernc.org/sqlite v1.28.0 h1:Zx+LyDDmXczNnEQdvPuEfcFVA2ZPyaD7UCZDjef3BHQ=
 modernc.org/sqlite v1.28.0/go.mod h1:Qxpazz0zH8Z1xCFyi5GSL3FzbtZ3fvbjmywNogldEW0=
 modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=
 modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0=
 modernc.org/tcl v1.15.2 h1:C4ybAYCGJw968e+Me18oW55kD/FexcHbqH2xak1ROSY=
 modernc.org/tcl v1.15.2/go.mod h1:3+k/ZaEbKrC8ePv8zJWPtBSW0V7Gg9g8rkmhI1Kfs3c=
-modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
 modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
 modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
 modernc.org/z v1.7.3 h1:zDJf6iHjrnB+WRD88stbXokugjyc0/pB91ri1gO6LZY=

sqldb-sqlite-mattn.go

@@ -18,7 +18,7 @@ import (
 
 const (
 	//sqliteLibrary is used in logging.
-	sqliteLibrary = "github.com/mattn/go-sqlite3"
+	sqliteLibrary = sqliteLibraryMattn
 
 	//sqliteDriverName is used in Connect() when calling [database/sql.Open].
 	sqliteDriverName = "sqlite3"

sqldb-sqlite-modernc.go

@@ -18,7 +18,7 @@ import (
 
 const (
 	//sqliteLibrary is used in logging.
-	sqliteLibrary = "modernc.org/sqlite"
+	sqliteLibrary = sqliteLibraryModernc
 
 	//sqliteDriverName is used in Connect() when calling [database/sql.Open].
 	sqliteDriverName = "sqlite"

sqldb-sqlite.go

@@ -7,26 +7,31 @@ import (
 	"github.com/jmoiron/sqlx"
 )
 
+// library is used for handling the SQLite libraries/drivers that can be used.
+type library string
+
 const (
 	//Possible SQLite libraries. These are used in comparisons, such as when building
 	//the connection string PRAGMAs.
-	sqliteLibraryMattn   = "github.com/mattn/go-sqlite3"
-	sqliteLibraryModernc = "modernc.org/sqlite"
+	sqliteLibraryMattn   library = "github.com/mattn/go-sqlite3"
+	sqliteLibraryModernc library = "modernc.org/sqlite"
+)
 
-	//InMemoryFilePathRacy is the path to provide for SQLitePath when you want to use
-	//an in-memory database instead of a file on disk. This is racy because each call
-	//to Connect() will open a brand new database. If you only call Connect() once
-	//then this is safe to use.
+const (
+	//SQLiteInMemoryFilePathRacy is the path to provide for SQLitePath when you want
+	//to use an in-memory database instead of a file on disk. This is racy because
+	//each call to Connect() will open a brand new database. If you only call
+	//Connect() once then this is safe to use.
 	//
 	//This is good for running tests since then each test runs with a separate
 	//in-memory db.
-	InMemoryFilePathRacy = ":memory:"
+	SQLiteInMemoryFilePathRacy = ":memory:"
 
-	//InMemoryFilePathRaceSafe is the path to provide for SQLitePath when you want to
-	//use an in-memory database instead of a file on disk. This is race safe since
-	//multiple calls of Connect() will connect to the same in-memory database,
+	//SQLiteInMemoryFilePathRaceSafe is the path to provide for SQLitePath when you
+	//want to use an in-memory database instead of a file on disk. This is race safe
+	//since multiple calls of Connect() will connect to the same in-memory database,
 	//although connecting more than once to the same database would be very odd.
-	InMemoryFilePathRaceSafe = "file::memory:?cache=shared"
+	SQLiteInMemoryFilePathRaceSafe = "file::memory:?cache=shared"
 )
 
 // NewSQLite is a shorthand for calling New() and then manually setting the applicable
@@ -61,7 +66,7 @@ func GetSQLiteVersion() (version string, err error) {
 	driver := getDriver(DBTypeSQLite)
 
 	//Connect.
-	conn, err := sqlx.Open(driver, InMemoryFilePathRacy)
+	conn, err := sqlx.Open(driver, SQLiteInMemoryFilePathRacy)
 	if err != nil {
 		return
 	}
@@ -78,24 +83,26 @@ func GetSQLiteVersion() (version string, err error) {
 
 // GetSQLiteLibrary returns the SQLite library that was used to build the binary. The
 // library is set at build/run with go build tags.
-func GetSQLiteLibrary() string {
+func GetSQLiteLibrary() library {
 	return sqliteLibrary
 }
 
-// pragmsQueriesToString takes SQLite PRAGMAs in query format and retuns them in the
-// format needed to be appended to a SQLite database filepath per the in-use SQLite
-// driver.
+// pragmasToURLValues takes SQLite PRAGMAs in SQLite query format and retuns them in
+// a url.Values for appending to a SQLite filepath URL.
 //
 // SQLite PRAGMAs need to be set upon initially connecting to the database. The
-// PRAGMAs are added to the database file's path as query parameters (?...&...).
+// PRAGMAs are added to the database's filepath as query parameters (?...&...).
 // However, the format of these appended query parameters differs between SQLite
-// libraries. This translates PRAGMA statements into the format required by the
-// library the binary is built with.
+// libraries (mattn vs modernc). This func translates PRAGMA statements, written in
+// the SQLite query format, into the filepath format required by the SQLite driver
+// the binary is built with.
 //
-// "PRAGMA busy_timeout = 5000" becomes "_pragma=busy_timeout=5000" when using the
-// modernc library.
-func pragmsQueriesToString(pragmas []string) (filenamePragmaString string) {
-	v := url.Values{}
+// Example:
+// - SQLite Query Format: "PRAGMA busy_timeout = 5000".
+// - Mattn Format:        "_busy_timeout=5000".
+// - Modernc: Format:     "_pragma=busy_timeout=5000".
+func pragmasToURLValues(pragmas []string, lib library) (v url.Values) {
+	v = url.Values{}
 
 	for _, p := range pragmas {
 		//Sanitize, to make replace/stripping of "PRAGMA" keyword easier.
@@ -104,10 +111,9 @@ func pragmsQueriesToString(pragmas []string) (filenamePragmaString string) {
 		//Strip out the PRAGMA keyword.
 		p = strings.TrimPrefix(p, "pragma")
 
-		//Build pragma as expected by library in use.
-		switch GetSQLiteLibrary() {
+		//Build pragma key-value pairs as expected by driver/library in use.
+		switch lib {
 		case sqliteLibraryMattn:
-			//Library's format:  _busy_timeout=5000
 			key, value, found := strings.Cut(p, "=")
 			if !found {
 				continue
@@ -120,7 +126,6 @@ func pragmsQueriesToString(pragmas []string) (filenamePragmaString string) {
 			v.Add(key, value)
 
 		case sqliteLibraryModernc:
-			//Library's format: _pragma=busy_timeout=5000
 			key := "_pragma"
 			value := p
 
@@ -134,5 +139,5 @@ func pragmsQueriesToString(pragmas []string) (filenamePragmaString string) {
 		}
 	}
 
-	return v.Encode()
+	return
 }

sqldb-translators_test.go

@@ -6,7 +6,7 @@ import (
 
 func TestRunTranslators(t *testing.T) {
 	//Define config.
-	c := NewSQLite(InMemoryFilePathRaceSafe)
+	c := NewSQLite(SQLiteInMemoryFilePathRaceSafe)
 	c.DeployQueryTranslators = []Translator{
 		TranslateMariaDBToSQLiteCreateTable,
 	}

sqldb.go

@@ -111,6 +111,7 @@ package sqldb
 import (
 	"errors"
 	"fmt"
+	"log"
 	"net"
 	"net/url"
 	"os"
@@ -393,7 +394,7 @@ func (c *Config) Connect() (err error) {
 	//If the database is in-memory, we can ignore this error though, since, the
 	//database will never exist yet an is in fact created when Open() and Ping() are
 	//called below.
-	if c.IsSQLite() && c.SQLitePath != InMemoryFilePathRacy && c.SQLitePath != InMemoryFilePathRaceSafe {
+	if c.IsSQLite() && c.SQLitePath != SQLiteInMemoryFilePathRacy && c.SQLitePath != SQLiteInMemoryFilePathRaceSafe {
 		_, err = os.Stat(c.SQLitePath)
 		if os.IsNotExist(err) {
 			return err
@@ -428,9 +429,10 @@ func (c *Config) Connect() (err error) {
 	case DBTypeMySQL, DBTypeMariaDB, DBTypeMSSQL:
 		c.infoLn("sqldb.Connect", "Connecting to database "+c.Name+" on "+c.Host+" with user "+c.User+".")
 	case DBTypeSQLite:
+		lib := GetSQLiteLibrary()
+
 		c.infoLn("sqldb.Connect", "Connecting to database: "+c.SQLitePath+".")
-		c.debugLn("sqldb.Connect", "SQLite Library: "+GetSQLiteLibrary()+".")
-		c.debugLn("sqldb.Connect", "SQLite PRAGMAs: "+pragmsQueriesToString(c.SQLitePragmas)+".")
+		c.debugLn("sqldb.Connect", "SQLite Library: "+lib+".")
 	default:
 		//This can never occur because we called validate() above to verify that a
 		//valid database type was provided.
@@ -543,19 +545,29 @@ func (c *Config) buildConnectionString(deployingDB bool) (connString string) {
 		connString = c.SQLitePath
 
 		//For SQLite, the connection string is simply a path to a file. However, we
-		//need to append pragmas as needed.
+		//may need to append PRAGMAs as needed. PRAGMAs are appended to end of
+		//filepath as query parameters.
 		if len(c.SQLitePragmas) != 0 {
-			pragmasToAdd := pragmsQueriesToString(c.SQLitePragmas)
+			u, err := url.Parse(c.SQLitePath)
+			if err != nil {
+				log.Fatalln("Could not parse SQLite path.", c.SQLitePath, err)
+				os.Exit(1)
+				return
+			}
 
-			if strings.Contains(connString, "?") {
-				//handle InMemoryFilePathRaceSafe
-				connString += "&" + pragmasToAdd
+			lib := GetSQLiteLibrary()
+			pragmasToAdd := pragmasToURLValues(c.SQLitePragmas, lib)
+
+			if len(u.Query()) > 0 {
+				u.RawQuery = u.RawQuery + "&" + pragmasToAdd.Encode()
 			} else {
-				connString += "&" + pragmasToAdd
+				u.RawQuery = "?" + pragmasToAdd.Encode()
 			}
 
+			connString = u.String()
+
 			c.debugLn("sqldb.buildConnectionString", "PRAGMAs provided: ", c.SQLitePragmas)
-			c.debugLn("sqldb.buildConnectionString", "PRAGMA String:    ", pragmasToAdd)
+			c.debugLn("sqldb.buildConnectionString", "PRAGMA String:    ", pragmasToAdd.Encode())
 			c.debugLn("sqldb.buildConnectionString", "Path With PRAGMAS:", connString)
 		}
 
@@ -567,7 +579,10 @@ func (c *Config) buildConnectionString(deployingDB bool) (connString string) {
 		}
 
 		q := url.Values{}
-		q.Add("database", c.Name)
+
+		if !deployingDB {
+			q.Add("database", c.Name)
+		}
 
 		//Handle other connection options.
 		if len(c.ConnectionOptions) > 0 {