Clean up some logging output when connecting to a db. It was a bit messy in real-world use.

Turned func into method for getting PRAGMAs as a string.  This is a bit better for usage and was needed to log out PRAGMAs during Connect().

Author: c9845

changlog.txt

@@ -1,3 +1,16 @@
+v2.3.1
+----------
+- Clean up and organize debug logging output.
+
+v2.3.0
+----------
+- Remove functionality for skipping INSERT INTO statements when deploying db. 
+    - This only worked for DeployQueries, not for DeployFuncs, and this led to confusion.
+
+v2.2.0
+----------
+- Add support for translating CREATE TABLE queries when updating a database.
+
 v2.1.0
 ----------
 - Support for UpdateFuncs. 

sqldb-sqlite.go

@@ -99,18 +99,18 @@ func GetSQLiteLibrary() string {
 	return sqliteLibrary
 }
 
-// buildPragmaString builds the string of pragmas that should be appended to the filename
-// when connecting to a SQLite database. This is needed to set pragmas reliably since
-// pragmas must be set upon initially connecting to the database. The difficulty in
-// setting pragmas is that each SQLite library (mattn vs modernc) has a slighly different
-// format for setting pragmas. This takes the list of pragmas in SQLite query format (
-// PRAGMA busy_timeout = 5000) and translates them to the correct format for the SQLite
-// library in use.
-func buildPragmaString(pragmas []string) (filenamePragmaString string) {
+// SQLitePragmasAsString builds the string of pragmas that should be appended to the
+// filename when connecting to a SQLite database. This is needed to set pragmas reliably
+// since pragmas must be set upon initially connecting to the database. The difficulty
+// in setting pragmas is that each SQLite library (mattn vs modernc) has a slighly
+// different format for setting pragmas. This takes the list of pragmas in SQLite query
+// format (PRAGMA busy_timeout = 5000) and translates them to the correct format for
+// the SQLite library in use.
+func (cfg *Config) SQLitePragmasAsString() (filenamePragmaString string) {
 	v := url.Values{}
 
-	for _, p := range pragmas {
-		//Sanitize, make replace/stripping of "PRAGMA" keyword easier.
+	for _, p := range cfg.SQLitePragmas {
+		//Sanitize, to make replace/stripping of "PRAGMA" keyword easier.
 		p = strings.ToLower(p)
 
 		//Strip out the PRAGMA keyword.
@@ -144,7 +144,7 @@ func buildPragmaString(pragmas []string) (filenamePragmaString string) {
 			//add
 			v.Add(key, value)
 		default:
-			//this can never happen since we hardcode libraries.
+			//this can never happen since we hardcode the supported sqlite libraries.
 		}
 	}
 

sqldb.go

@@ -409,10 +409,11 @@ func (cfg *Config) buildConnectionString(deployingDB bool) (connString string) {
 		//For SQLite, the connection string is simply a path to a file. However, we
 		//need to append pragmas as needed.
 		if len(cfg.SQLitePragmas) != 0 {
-			pragmasToAdd := buildPragmaString(cfg.SQLitePragmas)
+			pragmasToAdd := cfg.SQLitePragmasAsString()
 			connString += pragmasToAdd
 
-			cfg.debugPrintln("sqldb.buildConnectionString", "PRAGMA String:", pragmasToAdd)
+			//Logging for development debugging.
+			// cfg.debugPrintln("sqldb.buildConnectionString", "PRAGMA String:", pragmasToAdd)
 			// cfg.debugPrintln("sqldb.buildConnectionString", "Path With PRAGMAS:", connString)
 		}
 
@@ -527,7 +528,10 @@ func (cfg *Config) Connect() (err error) {
 		cfg.debugPrintln("sqldb.Connect", "Connecting to database "+cfg.Name+" on "+cfg.Host+" with user "+cfg.User)
 	case DBTypeSQLite:
 		cfg.debugPrintln("sqldb.Connect", "Connecting to database "+cfg.SQLitePath+".")
-		cfg.debugPrintln("sqldb.Connect", "Using SQLite Library "+GetSQLiteLibrary()+".")
+		cfg.debugPrintln("sqldb.Connect", "SQLite Library: "+GetSQLiteLibrary()+".")
+		cfg.debugPrintln("sqldb.Connect", "PRAGMAS: "+cfg.SQLitePragmasAsString()+".")
+	default:
+		//this can never happen since we hardcode the supported sqlite libraries.
 	}
 
 	return

sqldb_test.go

@@ -974,13 +974,15 @@ func TestString(t *testing.T) {
 	}
 }
 
-func TestBuildPragmaString(t *testing.T) {
+func TestSQLitePragmasAsString(t *testing.T) {
 	p := []string{
 		"PRAGMA journal_mode = WAL",
 		"PRAGMA busy_timeout = 5000",
 	}
+	cfg := NewSQLiteConfig("")
+	cfg.SQLitePragmas = p
 
-	built := buildPragmaString(p)
+	built := cfg.SQLitePragmasAsString()
 
 	u, err := url.ParseQuery(built)
 	if err != nil {