From 9f1f7476abde53151a9e27c86a327aefb1363997 Mon Sep 17 00:00:00 2001 From: ycc Date: Thu, 28 Sep 2023 17:28:38 +0200 Subject: [PATCH] added logging capability --- db.go | 123 +++++++++++++++++++++++++++++++++++++++------------------ go.mod | 10 ++--- go.sum | 24 ++++++----- 3 files changed, 105 insertions(+), 52 deletions(-) diff --git a/db.go b/db.go index c431a4b..0e674af 100755 --- a/db.go +++ b/db.go @@ -6,7 +6,6 @@ import ( "errors" "fmt" "html/template" - "log" "os" "reflect" "strconv" @@ -14,8 +13,11 @@ import ( _ "github.com/go-sql-driver/mysql" "github.com/lib/pq" + "github.com/rs/zerolog" ) +var log zerolog.Logger + type Db struct { Driver string Url string @@ -49,7 +51,7 @@ func Open(driver string, url string) *Db { database.Url = url database.conn, err = sql.Open(driver, url) if err != nil { - log.Println(err) + log.Error().Msg(err.Error()) } return &database } @@ -73,10 +75,13 @@ func (t *TableInfo) GetAssociativeArray(columns []string, restriction string, so // QueryAssociativeArray : Provide query result as an associative array func (db *Db) QueryAssociativeArray(query string) (Rows, error) { + if db.LogQueries { + log.Info().Msg(query) + } rows, err := db.conn.Query(query) if err != nil { - log.Println(err) - log.Println(query) + log.Error().Msg(err.Error()) + log.Error().Msg(query) return nil, err } defer rows.Close() @@ -84,8 +89,8 @@ func (db *Db) QueryAssociativeArray(query string) (Rows, error) { results := Rows{} cols, err := rows.Columns() if err != nil { - log.Println(err) - log.Println(query) + log.Error().Msg(err.Error()) + log.Error().Msg(query) return nil, err } // make types map @@ -191,7 +196,7 @@ func (t *TableInfo) GetSchema() (*TableInfo, error) { } cols, err := t.db.QueryAssociativeArray(schemaQuery) if err != nil { - log.Println(err) + log.Error().Msg(err.Error()) return nil, err } ti.Columns = make(map[string]string) @@ -221,7 +226,7 @@ func (db *Db) GetSchema() ([]TableInfo, error) { var res []TableInfo tables, err := db.ListTables() if err != nil { - log.Println(err.Error()) + log.Error().Msg(err.Error()) return nil, err } for _, row := range tables { @@ -232,7 +237,7 @@ func (db *Db) GetSchema() ([]TableInfo, error) { ti.db = db fullti, err = ti.GetSchema() if err != nil { - log.Println(err.Error()) + log.Error().Msg(err.Error()) return nil, err } res = append(res, *fullti) @@ -285,18 +290,24 @@ func (db *Db) pgCreateTable(t TableInfo) error { } query += columns query = query[:len(query)-1] + " )" + if db.LogQueries { + log.Info().Msg(query) + } _, err := t.db.conn.Query(query) if err != nil { - log.Println(err.Error()) + log.Error().Msg(err.Error()) return err } for name, rowtype := range t.Columns { desc := strings.Split(fmt.Sprintf("%v", rowtype), "|") if len(desc) > 1 { query = "COMMENT ON COLUMN " + t.Name + "." + fmt.Sprintf("%v", name) + " IS '" + desc[1] + "'" + if db.LogQueries { + log.Info().Msg(query) + } _, err := t.db.conn.Query(query) if err != nil { - log.Println(err.Error()) + log.Error().Msg(err.Error()) return err } } @@ -323,9 +334,12 @@ func (db *Db) myCreateTable(t TableInfo) error { } query += columns query = query[:len(query)-1] + " )" + if db.LogQueries { + log.Info().Msg(query) + } _, err := t.db.conn.Query(query) if err != nil { - log.Println(err.Error()) + log.Error().Msg(err.Error()) return err } return nil @@ -333,15 +347,21 @@ func (db *Db) myCreateTable(t TableInfo) error { func (t *TableInfo) DeleteTable() error { query := "drop table " + t.Name + if t.db.LogQueries { + log.Info().Msg(query) + } _, err := t.db.conn.Query(query) if err != nil { - log.Println(err.Error()) + log.Error().Msg(err.Error()) return err } query = "drop sequence if exists sq_" + t.Name + if t.db.LogQueries { + log.Info().Msg(query) + } _, err = t.db.conn.Query(query) if err != nil { - log.Println(err.Error()) + log.Error().Msg(err.Error()) return err } return nil @@ -359,16 +379,22 @@ func (t *TableInfo) AddColumn(name string, sqltype string, comment string) error func (t *TableInfo) pgAddColumn(name string, sqltype string, comment string) error { query := "alter table " + t.Name + " add " + name + " " + sqltype + if t.db.LogQueries { + log.Info().Msg(query) + } rows, err := t.db.conn.Query(query) if err != nil { - log.Println(err) + log.Error().Msg(err.Error()) return err } if strings.TrimSpace(comment) != "" { query = "COMMENT ON COLUMN " + t.Name + "." + name + " IS '" + comment + "'" + if t.db.LogQueries { + log.Info().Msg(query) + } _, err = t.db.conn.Query(query) if err != nil { - log.Println(err.Error()) + log.Error().Msg(err.Error()) return err } } @@ -381,9 +407,12 @@ func (t *TableInfo) myAddColumn(name string, sqltype string, comment string) err if strings.TrimSpace(comment) != "" { query += " COMMENT " + pq.QuoteLiteral(comment) } + if t.db.LogQueries { + log.Info().Msg(query) + } rows, err := t.db.conn.Query(query) if err != nil { - log.Println(err) + log.Error().Msg(err.Error()) return err } defer rows.Close() @@ -392,9 +421,12 @@ func (t *TableInfo) myAddColumn(name string, sqltype string, comment string) err func (t *TableInfo) DeleteColumn(name string) error { query := "alter table " + t.Name + " drop " + name + if t.db.LogQueries { + log.Info().Msg(query) + } rows, err := t.db.conn.Query(query) if err != nil { - log.Println(err) + log.Error().Msg(err.Error()) return err } defer rows.Close() @@ -407,13 +439,13 @@ func (db *Db) ImportSchema(filename string) { var jsonSource []TableInfo err := json.Unmarshal([]byte(byteValue), &jsonSource) if err != nil { - log.Println(err) + log.Error().Msg(err.Error()) } for _, ti := range jsonSource { ti.db = db err = db.CreateTable(ti) if err != nil { - log.Println(err.Error()) + log.Error().Msg(err.Error()) } } } @@ -427,7 +459,7 @@ func (db *Db) ClearImportSchema(filename string) { ti.db = db err := ti.DeleteTable() if err != nil { - log.Println(err.Error()) + log.Error().Msg(err.Error()) } } } @@ -458,7 +490,7 @@ func (t *TableInfo) Insert(record AssRow) (int64, error) { values := "" t, err := t.GetSchema() if err != nil { - log.Println(err) + log.Error().Msg(err.Error()) return -1, err } var id int64 @@ -468,7 +500,11 @@ func (t *TableInfo) Insert(record AssRow) (int64, error) { values += FormatForSQL(t.Columns[key], element) + "," } if t.db.Driver == "postgres" { - err = t.db.conn.QueryRow("INSERT INTO " + t.Name + "(" + removeLastChar(columns) + ") VALUES (" + removeLastChar(values) + ") RETURNING id").Scan(&id) + query := "INSERT INTO " + t.Name + "(" + removeLastChar(columns) + ") VALUES (" + removeLastChar(values) + ") RETURNING id" + if t.db.LogQueries { + log.Info().Msg(query) + } + err = t.db.conn.QueryRow(query).Scan(&id) } if t.db.Driver == "mysql" { /* _, err = t.db.conn.Query("INSERT INTO " + t.Name + "(" + removeLastChar(columns) + ") VALUES (" + removeLastChar(values) + ")") @@ -476,7 +512,12 @@ func (t *TableInfo) Insert(record AssRow) (int64, error) { return id, err } err = t.db.conn.QueryRow("SELECT LAST_INSERT_ID()").Scan(&id)*/ - stmt, err := t.db.conn.Prepare("INSERT INTO " + t.Name + "(" + removeLastChar(columns) + ") VALUES (" + removeLastChar(values) + ")") + + query := "INSERT INTO " + t.Name + "(" + removeLastChar(columns) + ") VALUES (" + removeLastChar(values) + ")" + stmt, err := t.db.conn.Prepare(query) + if t.db.LogQueries { + log.Info().Msg(query) + } fmt.Println("INSERT INTO " + t.Name + "(" + removeLastChar(columns) + ") VALUES (" + removeLastChar(values) + ")") if err != nil { return id, err @@ -497,7 +538,7 @@ func (t *TableInfo) Update(record AssRow) error { t, err := t.GetSchema() if err != nil { - log.Println(err) + log.Error().Msg(err.Error()) return err } id := "" @@ -514,10 +555,13 @@ func (t *TableInfo) Update(record AssRow) error { } stack = removeLastChar(stack) query := ("UPDATE " + t.Name + " SET " + stack + " WHERE id = " + id) + if t.db.LogQueries { + log.Info().Msg(query) + } rows, err := t.db.conn.Query(query) if err != nil { - log.Println(query) - log.Println(err) + log.Error().Msg(query) + log.Error().Msg(err.Error()) return err } defer rows.Close() @@ -536,10 +580,13 @@ func (t *TableInfo) Delete(record AssRow) error { } } query := ("DELETE FROM " + t.Name + " WHERE id = " + id) + if t.db.LogQueries { + log.Info().Msg(query) + } rows, err := t.db.conn.Query(query) if err != nil { - log.Println(query) - log.Println(err) + log.Error().Msg(query) + log.Error().Msg(err.Error()) return err } defer rows.Close() @@ -593,7 +640,7 @@ func Quote(str string) string { func (db *Db) SaveSchema(generatedFilename string) error { schema, err := db.GetSchema() if err != nil { - log.Println(err) + log.Error().Msg(err.Error()) return err } // file, _ := json.Marshal(schema) @@ -624,7 +671,7 @@ func buildLinks(schema []TableInfo) []Link { func (db *Db) GenerateSchemaTemplate(templateFilename string, generatedFilename string) error { schema, err := db.GetSchema() if err != nil { - log.Println(err) + log.Error().Msg(err.Error()) return err } links := buildLinks(schema) @@ -638,17 +685,17 @@ func (db *Db) GenerateSchemaTemplate(templateFilename string, generatedFilename t, err := template.ParseFiles(templateFilename) if err != nil { - log.Println(err) + log.Error().Msg(err.Error()) return err } f, err := os.Create(generatedFilename) if err != nil { - log.Println("create file: ", err) + log.Error().Msg("create file: " + err.Error()) return err } err = t.Execute(f, data) if err != nil { - log.Println(err) + log.Error().Msg(err.Error()) return err } return nil @@ -658,24 +705,24 @@ func (db *Db) GenerateSchemaTemplate(templateFilename string, generatedFilename func (db *Db) GenerateTableTemplates(templateFilename string, outputFolder string, extension string) error { schema, err := db.GetSchema() if err != nil { - log.Println(err) + log.Error().Msg(err.Error()) return err } for _, ti := range schema { t, err := template.ParseFiles(templateFilename) if err != nil { - log.Println(err) + log.Error().Msg(err.Error()) return err } f, err := os.Create(outputFolder + string(os.PathSeparator) + ti.Name + "." + extension) if err != nil { - log.Println("create file: ", err) + log.Error().Msg("create file: " + err.Error()) return err } err = t.Execute(f, ti) if err != nil { - log.Println(err) + log.Error().Msg(err.Error()) return err } } diff --git a/go.mod b/go.mod index f68b719..4c7030e 100644 --- a/go.mod +++ b/go.mod @@ -3,13 +3,13 @@ module forge.redroom.link/yves/sqldb go 1.17 require ( + github.com/go-sql-driver/mysql v1.7.1 github.com/lib/pq v1.10.4 - gorm.io/driver/mysql v1.5.1 + github.com/rs/zerolog v1.31.0 ) require ( - github.com/go-sql-driver/mysql v1.7.1 // indirect - github.com/jinzhu/inflection v1.0.0 // indirect - github.com/jinzhu/now v1.1.5 // indirect - gorm.io/gorm v1.25.1 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect + golang.org/x/sys v0.12.0 // indirect ) diff --git a/go.sum b/go.sum index 4c1ea61..242d1bc 100644 --- a/go.sum +++ b/go.sum @@ -1,13 +1,19 @@ -github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= +github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= -github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= -github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= -github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= -github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/lib/pq v1.10.4 h1:SO9z7FRPzA03QhHKJrH5BXA6HU1rS4V2nIVrrNC1iYk= github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -gorm.io/driver/mysql v1.5.1 h1:WUEH5VF9obL/lTtzjmML/5e6VfFR/788coz2uaVCAZw= -gorm.io/driver/mysql v1.5.1/go.mod h1:Jo3Xu7mMhCyj8dlrb3WoCaRd1FhsVh+yMXb1jUInf5o= -gorm.io/gorm v1.25.1 h1:nsSALe5Pr+cM3V1qwwQ7rOkw+6UeLrX5O4v3llhHa64= -gorm.io/gorm v1.25.1/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A= +github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= +golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=