Remove and rebuild duplicate translation funcs, fix some other bugs that prevented some usage.

Forgot run-translator funcs were already defined in other files.  Removed recently added funcs and combined code.  Previous code did not have package-level-global-var funcs for running translators.

Add funcs to run deploy and update schema functionality for package-level-global-var.

Export some defaults for use when not calling New().

Author: c9845

sqldb-deploySchema.go

@@ -167,14 +167,47 @@ func (c *Config) DeploySchema(opts *DeploySchemaOptions) (err error) {
 	return
 }
 
+// DeploySchema runs the DeployQueries and DeployFuncs specified in a config against
+// the database noted in the config. Use this to create your tables, create indexes,
+// etc. This will automatically issue a CREATE DATABASE IF NOT EXISTS query.
+//
+// DeployQueries will be translated via DeployQueryTranslators and any DeployQuery
+// errors will be processed by DeployQueryErrorHandlers. Neither of these steps apply
+// to DeployFuncs.
+//
+// Typically this func is run when a flag, i.e.: --deploy-db, is provided.
+func DeploySchema(opts *DeploySchemaOptions) (err error) {
+	return cfg.DeploySchema(opts)
+}
+
 // RunDeployQueryTranslators runs the list of DeployQueryTranslators on the provided
-// query. This is run in DeploySchema().
-func (c *Config) RunDeployQueryTranslators(q string) string {
+// query.
+//
+// This func is called in DeploySchema() but can also be called manually when you want
+// to translate a DeployQuery (for example, running a specific DeployQuery as part of
+// UpdateSchema).
+func (c *Config) RunDeployQueryTranslators(in string) (out string) {
+	out = in
 	for _, t := range c.DeployQueryTranslators {
-		q = t(q)
+		out = t(out)
+	}
+
+	return out
+}
+
+// RunDeployQueryTranslators runs the list of DeployQueryTranslators on the provided
+// query.
+//
+// This func is called in DeploySchema() but can also be called manually when you want
+// to translate a DeployQuery (for example, running a specific DeployQuery as part of
+// UpdateSchema).
+func RunDeployQueryTranslators(in string) (out string) {
+	out = in
+	for _, t := range cfg.DeployQueryTranslators {
+		out = t(out)
 	}
 
-	return q
+	return out
 }
 
 // runDeployQueryErrorHandlers runs the list of DeployQueryErrorHandlers when an error

sqldb-sqlite-mattn.go

@@ -24,7 +24,10 @@ const (
 	sqliteDriverName = "sqlite3"
 )
 
+// SQLiteDefaultPragmas defines the list of PRAGMA statments to configure SQLite that
+// we use by default.
+//
 // Placeholder so that this variable is defined for this SQLite library. The mattn
 // library defines some default PRAGMAs already so we do not need to define them here.
 // However, we need this variable defined since it is checked for in Connect().
-var sqliteDefaultPragmas = []string{}
+var SQLiteDefaultPragmas = []string{}

sqldb-sqlite-modernc.go

@@ -24,13 +24,16 @@ const (
 	sqliteDriverName = "sqlite"
 )
 
+// SQLiteDefaultPragmas defines the list of PRAGMA statments to configure SQLite that
+// we use by default.
+//
 // The [github.com/mattn/go-sqlite3] library sets some PRAGMAs by default. The
-// [modernc.org/sqlite]library does not define any default PRAGMAs. However, to
+// [modernc.org/sqlite] library does not define any default PRAGMAs. However, to
 // make switching between the two database libraries/drivers easier, we define
 // some PRAGMAs here to make using a SQLite database more consistent.
 //
 // https://github.com/mattn/go-sqlite3/blob/ae2a61f847e10e6dd771ecd4e1c55e0421cdc7f9/sqlite3.go#L1086
-var sqliteDefaultPragmas = []string{
+var SQLiteDefaultPragmas = []string{
 	"PRAGMA busy_timeout = 5000",
 	"PRAGMA synchronous = NORMAL",
 }

sqldb-updateSchema.go

@@ -118,14 +118,43 @@ func (c *Config) UpdateSchema(opts *UpdateSchemaOptions) (err error) {
 	return
 }
 
+// UpdateSchema runs the UpdateQueries and UpdateFuncs specified in a config against
+// the database noted in the config. Use this to add columns, add indexes, rename
+// things, perform data changes, etc.
+//
+// UpdateQueries will be translated via UpdateQueryTranslators and any UpdateQuery
+// errors will be processed by UpdateQueryErrorHandlers. Neither of these steps apply
+// to UpdateFuncs.
+//
+// Typically this func is run when a flag, i.e.: --update-db, is provided.
+func UpdateSchema(opts *UpdateSchemaOptions) (err error) {
+	return cfg.UpdateSchema(opts)
+}
+
 // RunUpdateQueryTranslators runs the list of UpdateQueryTranslators on the provided
-// query. This is run in Update().
-func (c *Config) RunUpdateQueryTranslators(q string) string {
+// query.
+//
+// This func is called in UpdateSchema().
+func (c *Config) RunUpdateQueryTranslators(in string) (out string) {
+	out = in
 	for _, t := range c.UpdateQueryTranslators {
-		q = t(q)
+		out = t(out)
+	}
+
+	return out
+}
+
+// RunUpdateQueryTranslators runs the list of UpdateQueryTranslators on the provided
+// query.
+//
+// This func is called in UpdateSchema().
+func RunUpdateQueryTranslators(in string) (out string) {
+	out = in
+	for _, t := range cfg.UpdateQueryTranslators {
+		out = t(out)
 	}
 
-	return q
+	return out
 }
 
 // runUpdateQueryErrorHandlers runs the list of UpdateQueryErrorHandlers when an error

sqldb.go

@@ -344,8 +344,8 @@ var cfg *Config
 func New() *Config {
 	c := new(Config)
 
-	c.SQLitePragmas = sqliteDefaultPragmas
-	c.MapperFunc = defaultMapperFunc
+	c.SQLitePragmas = SQLiteDefaultPragmas
+	c.MapperFunc = DefaultMapperFunc
 	c.LoggingLevel = LogLevelDefault
 	c.ConnectionOptions = make(map[string]string)
 
@@ -445,14 +445,14 @@ func Connect() (err error) {
 	return cfg.Connect()
 }
 
-// defaultMapperFunc is the default function used for handling column name formatting
+// DefaultMapperFunc is the default function used for handling column name formatting
 // when retrieving data from the database and matching up to struct field names. No
 // reformatting is done; the column names are returned exactly as they are noted in
 // the database schema. This is unlike [sqlx] that lowercases all column names and
 // thus requires struct tags to match up against exported struct fields.
 //
 // See: https://jmoiron.github.io/sqlx/#mapping
-func defaultMapperFunc(s string) string {
+func DefaultMapperFunc(s string) string {
 	return s
 }
 
@@ -691,55 +691,3 @@ func AddConnectionOption(key, value string) {
 func Type() dbType {
 	return cfg.Type
 }
-
-// RunDeployTranslators runs the list of translators defined on the given query.
-//
-// This is used when you aren't calling DeploySchema() but you still want to translate
-// a DeployQuery. For example, running a specific DeployQuery as part of UpdateSchema().
-func RunDeployTranslators(in string) (out string) {
-	out = in
-	for _, t := range cfg.DeployQueryTranslators {
-		out = t(out)
-	}
-
-	return out
-}
-
-// RunDeployTranslators runs the list of translators defined on the given query.
-//
-// This is used when you aren't calling DeploySchema() but you still want to translate
-// a DeployQuery. For example, running a specific DeployQuery as part of UpdateSchema().
-func (c *Config) RunDeployTranslators(in string) (out string) {
-	out = in
-	for _, t := range c.DeployQueryTranslators {
-		out = t(out)
-	}
-
-	return out
-}
-
-// RunUpdateTranslators runs the list of translators defined on the given query.
-//
-// This is used when you aren't calling UpdateSchema() but you still want to translate
-// an UpdateQuery.
-func RunUpdateTranslators(in string) (out string) {
-	out = in
-	for _, t := range cfg.UpdateQueryTranslators {
-		out = t(out)
-	}
-
-	return out
-}
-
-// RunUpdateTranslators runs the list of translators defined on the given query.
-//
-// This is used when you aren't calling UpdateSchema() but you still want to translate
-// an UpdateQuery.
-func (c *Config) RunUpdateTranslators(in string) (out string) {
-	out = in
-	for _, t := range c.UpdateQueryTranslators {
-		out = t(out)
-	}
-
-	return out
-}

sqldb_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestNew(t *testing.T) {
 	c := New()
-	if len(c.SQLitePragmas) != len(sqliteDefaultPragmas) {
+	if len(c.SQLitePragmas) != len(SQLiteDefaultPragmas) {
 		t.FailNow()
 		return
 	}
@@ -336,7 +336,7 @@ func TestIsSQLite(t *testing.T) {
 
 func TestDefaultMapperFunc(t *testing.T) {
 	in := "asdfasdfasdf"
-	out := defaultMapperFunc(in)
+	out := DefaultMapperFunc(in)
 	if in != out {
 		t.Fatal("defaultMapperFunc modified provided string but should not have.")
 		return