Merge branch 'main' of https://github.com/c9845/sqldb into main

Author: c9845

go.mod

@@ -7,26 +7,26 @@ require (
 	github.com/go-sql-driver/mysql v1.7.0
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/mattn/go-sqlite3 v1.14.16
-	golang.org/x/exp v0.0.0-20221205204356-47842c84f3db
-	modernc.org/sqlite v1.20.0
+	golang.org/x/exp v0.0.0-20230131160201-f062dba9d201
+	modernc.org/sqlite v1.20.3
 )
 
 require (
+	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/mattn/go-isatty v0.0.16 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20220927061507-ef77025ab5aa // indirect
-	golang.org/x/crypto v0.3.0 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+	golang.org/x/crypto v0.5.0 // indirect
 	golang.org/x/mod v0.7.0 // indirect
-	golang.org/x/sys v0.3.0 // indirect
-	golang.org/x/tools v0.4.0 // indirect
-	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
+	golang.org/x/sys v0.4.0 // indirect
+	golang.org/x/tools v0.5.0 // indirect
 	lukechampine.com/uint128 v1.2.0 // indirect
 	modernc.org/cc/v3 v3.40.0 // indirect
 	modernc.org/ccgo/v3 v3.16.13 // indirect
-	modernc.org/libc v1.21.5 // indirect
+	modernc.org/libc v1.22.2 // indirect
 	modernc.org/mathutil v1.5.0 // indirect
 	modernc.org/memory v1.5.0 // indirect
 	modernc.org/opt v0.1.3 // indirect

go.sum

@@ -110,7 +110,7 @@ func (cfg *Config) DeploySchemaWithOps(ops DeploySchemaOptions) (err error) {
 	connection := cfg.Connection()
 
 	//Run each deploy query.
-	cfg.debugPrintln("sqldb.DeploySchema", "Running DeployQueries...")
+	cfg.infoPrintln("sqldb.DeploySchema", "Running DeployQueries...")
 	for _, q := range cfg.DeployQueries {
 		//Translate the query if needed. This will only translate queries with
 		//CREATE TABLE in the text.
@@ -120,10 +120,10 @@ func (cfg *Config) DeploySchemaWithOps(ops DeploySchemaOptions) (err error) {
 		if strings.Contains(q, "CREATE TABLE") {
 			idx := strings.Index(q, "(")
 			if idx > 0 {
-				cfg.debugPrintln(strings.TrimSpace(q[:idx]) + "...")
+				cfg.infoPrintln(strings.TrimSpace(q[:idx]) + "...")
 			}
 		} else {
-			cfg.debugPrintln(q)
+			cfg.infoPrintln(q)
 		}
 
 		//Execute the query. Always log on error so users can identify query that has
@@ -136,35 +136,38 @@ func (cfg *Config) DeploySchemaWithOps(ops DeploySchemaOptions) (err error) {
 			return
 		}
 	}
-	cfg.debugPrintln("sqldb.DeploySchema", "Running DeployQueries...done")
+	cfg.infoPrintln("sqldb.DeploySchema", "Running DeployQueries...done")
 
 	//Run each deploy func.
-	cfg.debugPrintln("sqldb.DeploySchema", "Running DeployFuncs...")
+	cfg.infoPrintln("sqldb.DeploySchema", "Running DeployFuncs...")
 	for _, f := range cfg.DeployFuncs {
 		//Get function name for diagnostics.
 		rawNameWithPath := runtime.FuncForPC(reflect.ValueOf(f).Pointer()).Name()
 		funcName := path.Base(rawNameWithPath)
 
 		//Log out some info about the func being run for diagnostics.
-		cfg.debugPrintln(funcName)
+		cfg.infoPrintln(funcName)
 
 		//Execute the func. Always log on error so users can identify func that has
 		//an error. Connection always gets closed since an error occured.
 		innerErr := f(connection)
 		if innerErr != nil {
 			err = innerErr
-			log.Println("sqldb.DeploySchema()", "Error with func.", funcName)
+			cfg.errorPrintln("sqldb.DeploySchema", "Error with DeployFunc.", funcName)
 			cfg.Close()
 			return innerErr
 		}
 	}
-	cfg.debugPrintln("sqldb.DeploySchema", "Running DeployFuncs...done")
+	cfg.infoPrintln("sqldb.DeploySchema", "Running DeployFuncs...done")
 
+	//Close the connection to the database, if needed. We want to keep the connection
+	//open mostly for tests since tests might use an in-memory database (SQLite) and
+	//if the connection is closed the database gets wiped away.
 	if ops.CloseConnection {
-		//Close() is handled by defer above.
-		cfg.debugPrintln("sqldb.DeploySchema()", "Connection closed after success.")
+		cfg.Close()
+		cfg.debugPrintln("sqldb.DeploySchema", "Connection closed after success.")
 	} else {
-		cfg.debugPrintln("sqldb.DeploySchema()", "Connection left open after success.")
+		cfg.debugPrintln("sqldb.DeploySchema", "Connection left open after success.")
 	}
 
 	return

sqldb-deploySchema.go

@@ -0,0 +1,29 @@
+package sqldb
+
+import "log"
+
+//This file specifically deals with logging. See the config LoggingLevel field.
+
+// errorPrintLn performs log.Println if LoggingLevel is set to LogLevelError or a
+// higher logging level.
+func (cfg *Config) errorPrintln(v ...any) {
+	if cfg.LoggingLevel >= LogLevelError {
+		log.Println(v...)
+	}
+}
+
+// infoPrintLn performs log.Println if LoggingLevel is set to LogLevelInfo or a
+// higher logging level.
+func (cfg *Config) infoPrintln(v ...any) {
+	if cfg.LoggingLevel >= LogLevelInfo {
+		log.Println(v...)
+	}
+}
+
+// debugPrintLn performs log.Println if LoggingLevel is set to LogLevelDebug or a
+// higher logging level.
+func (cfg *Config) debugPrintln(v ...any) {
+	if cfg.LoggingLevel >= LogLevelDebug {
+		log.Println(v...)
+	}
+}

sqldb-logging.go

@@ -15,8 +15,6 @@ func NewMSSQLConfig(host string, port uint, name, user, password string) (cfg *C
 	cfg.User = user
 	cfg.Password = password
 
-	cfg.ConnectionOptions = make(map[string]string)
-
 	return
 }
 

sqldb-mssql.go

@@ -15,8 +15,6 @@ func NewMySQLConfig(host string, port uint, name, user, password string) (cfg *C
 	cfg.User = user
 	cfg.Password = password
 
-	cfg.ConnectionOptions = make(map[string]string)
-
 	return
 }
 

sqldb-mysql.go

@@ -39,8 +39,6 @@ func NewSQLiteConfig(pathToFile string) (cfg *Config) {
 	cfg.SQLitePragmas = sqliteDefaultPragmas
 	cfg.UseDefaultTranslateFuncs()
 
-	cfg.ConnectionOptions = make(map[string]string)
-
 	return
 }
 

sqldb-sqlite.go

@@ -79,7 +79,7 @@ func (cfg *Config) UpdateSchemaWithOps(ops UpdateSchemaOptions) (err error) {
 	defer tx.Rollback()
 
 	//Run each update query.
-	cfg.debugPrintln("sqldb.UpdateSchema", "Running UpdateQueries...")
+	cfg.infoPrintln("sqldb.UpdateSchema", "Running UpdateQueries...")
 	for _, q := range cfg.UpdateQueries {
 		//Translate the query if needed. This will only translate queries with
 		//CREATE TABLE in the text.
@@ -93,10 +93,10 @@ func (cfg *Config) UpdateSchemaWithOps(ops UpdateSchemaOptions) (err error) {
 		if strings.Contains(q, "CREATE TABLE") {
 			idx := strings.Index(q, "(")
 			if idx > 0 {
-				cfg.debugPrintln(strings.TrimSpace(q[:idx]) + "...")
+				cfg.infoPrintln(strings.TrimSpace(q[:idx]) + "...")
 			}
 		} else {
-			cfg.debugPrintln(q)
+			cfg.infoPrintln(q)
 		}
 
 		//Execute the query. Always log on error so users can identify query that has
@@ -109,29 +109,29 @@ func (cfg *Config) UpdateSchemaWithOps(ops UpdateSchemaOptions) (err error) {
 			return
 		}
 	}
-	cfg.debugPrintln("sqldb.UpdateSchema", "Running UpdateQueries...done")
+	cfg.infoPrintln("sqldb.UpdateSchema", "Running UpdateQueries...done")
 
 	//Run each update func.
-	cfg.debugPrintln("sqldb.UpdateSchema", "Running UpdateFuncs...")
+	cfg.infoPrintln("sqldb.UpdateSchema", "Running UpdateFuncs...")
 	for _, f := range cfg.UpdateFuncs {
 		//Get function name for diagnostics.
 		rawNameWithPath := runtime.FuncForPC(reflect.ValueOf(f).Pointer()).Name()
 		funcName := path.Base(rawNameWithPath)
 
 		//Log out some info about the func being run for diagnostics.
-		cfg.debugPrintln(funcName)
+		cfg.infoPrintln(funcName)
 
 		//Execute the func. Always log on error so users can identify func that has
 		//an error. Connection always gets closed since an error occured.
 		innerErr := f(tx)
 		if innerErr != nil {
 			err = innerErr
-			log.Println("sqldb.UpdateSchema()", "Error with func.", funcName)
+			cfg.errorPrintln("sqldb.UpdateSchema", "Error with UpdateFunc.", funcName)
 			cfg.Close()
 			return innerErr
 		}
 	}
-	cfg.debugPrintln("sqldb.UpdateSchema", "Running UpdateFuncs...done")
+	cfg.infoPrintln("sqldb.UpdateSchema", "Running UpdateFuncs...done")
 
 	//Commit transaction now that all UpdateQueries have been run successfully.
 	err = tx.Commit()
@@ -140,8 +140,11 @@ func (cfg *Config) UpdateSchemaWithOps(ops UpdateSchemaOptions) (err error) {
 		return
 	}
 
+	//Close the connection to the database, if needed. We want to keep the connection
+	//open mostly for tests since tests might use an in-memory database (SQLite) and
+	//if the connection is closed the database gets wiped away.
 	if ops.CloseConnection {
-		//Close() is handled by defer above.
+		cfg.Close()
 		cfg.debugPrintln("sqldb.UpdateSchama", "Connection closed after success.")
 	} else {
 		cfg.debugPrintln("sqldb.UpdateSchama", "Connection left open after success.")
@@ -172,13 +175,13 @@ func UpdateSchema() (err error) {
 }
 
 // ignoreUpdateSchemaErrors handles when an error is returned from an UpdateQuery when
-// run from UpdateSchema(). This is used to handle queries that can fail and aren't really
-// an error (i.e.: adding a column that already exists). Excusable errors can happen
-// because UpdateQueries should be able to run more than once (i.e.: if you run UpdateSchema()
-// each time your app starts).
+// run from UpdateSchema(). This is used to handle queries that can fail and aren't
+// really an error (i.e.: adding a column that already exists). Excusable errors can
+// happen because UpdateQueries should be able to run more than once (i.e.: if you run
+// UpdateSchema() each time your app starts).
 //
-// The query to update the schema is passed in so that we can check what an error is in
-// relation to. Sometimes the error returned doesn't provide enough context.
+// The query to update the schema is passed in so that we can check what an error is
+// in relation to. Sometimes the error returned doesn't provide enough context.
 func (cfg *Config) ignoreUpdateSchemaErrors(query string, err error) bool {
 	//make sure an error was provided
 	if err == nil {
@@ -199,17 +202,17 @@ func (cfg *Config) ignoreUpdateSchemaErrors(query string, err error) bool {
 }
 
 // UpdateIgnoreErrorFunc is function for handling errors returned when trying to update
-// the schema of your database using UpdateSchema(). The query being run, as well as the
-// error from running the query, are passed in so that the function can determine if this
-// error can be ignored for this query. Each function of this type, and used for this
-// purpose should be very narrowly focused so as not to ignore errors by mistake (false
-// positives).
+// the schema of your database using UpdateSchema(). The query being run, as well as
+// the error from running the query, are passed in so that the function can determine
+// if this error can be ignored for this query. Each function of this type, and used
+// for this purpose should be very narrowly focused so as not to ignore errors by
+// mistake (false positives).
 type UpdateIgnoreErrorFunc func(Config, string, error) bool
 
-// UFAddDuplicateColumn checks if an error was generated because a column already exists.
-// This typically happens because you are rerunning UpdateSchema() and the column has
-// already been added. This error can be safely ignored since a duplicate column won't
-// be create.
+// UFAddDuplicateColumn checks if an error was generated because a column already
+// exists. This typically happens because you are rerunning UpdateSchema() and the
+// column has already been added. This error can be safely ignored since a duplicate
+// column won't be create.
 func UFAddDuplicateColumn(c Config, query string, err error) bool {
 	addCol := strings.Contains(strings.ToUpper(query), "ADD COLUMN")
 	dup := strings.Contains(strings.ToLower(err.Error()), "duplicate column")
@@ -222,9 +225,9 @@ func UFAddDuplicateColumn(c Config, query string, err error) bool {
 	return false
 }
 
-// UFDropUnknownColumn checks if an error from was generated because a column does not exist.
-// This typically happens because you are rerunning UpdateSchema() and the column has
-// already been dropped. This error can be safely ignored in most cases.
+// UFDropUnknownColumn checks if an error from was generated because a column does not
+// exist. This typically happens because you are rerunning UpdateSchema() and the
+// column has already been dropped. This error can be safely ignored in most cases.
 func UFDropUnknownColumn(c Config, query string, err error) bool {
 	dropCol := strings.Contains(strings.ToUpper(query), "DROP COLUMN")
 
@@ -244,12 +247,12 @@ func UFDropUnknownColumn(c Config, query string, err error) bool {
 
 // UFModifySQLiteColumn checks if an error occured because you are trying to modify a
 // column for a SQLite database. SQLite does not allow modifying columns. In this case,
-// we just ignore the error. This is ok since SQLite allows you to store any type of value
-// in any column.
+// we just ignore the error. This is ok since SQLite allows you to store any type of
+// value in any column.
 //
-// To get around this error, you should create a new table with the new schema, copy the
-// old data to the new table, delete the old table, and rename the new table to the old
-// table.
+// To get around this error, you should create a new table with the new schema, copy
+// the old data to the new table, delete the old table, and rename the new table to
+// the old table.
 func UFModifySQLiteColumn(c Config, query string, err error) bool {
 	//ignore queries that modify a column for sqlite dbs
 	if strings.Contains(strings.ToUpper(query), "MODIFY COLUMN") && c.Type == DBTypeSQLite {