Move sq + ParseDurShortString() to goext and change conf values by env

server/db/channels.go

@@ -2,8 +2,8 @@ package db
 
 import (
 	"blackforestbytes.com/simplecloudnotifier/models"
-	"blackforestbytes.com/simplecloudnotifier/sq"
 	"database/sql"
+	"gogs.mikescher.com/BlackForestBytes/goext/sq"
 	"time"
 )
 

server/db/clients.go

@@ -2,8 +2,8 @@ package db
 
 import (
 	"blackforestbytes.com/simplecloudnotifier/models"
-	"blackforestbytes.com/simplecloudnotifier/sq"
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"gogs.mikescher.com/BlackForestBytes/goext/sq"
 	"time"
 )
 

server/db/context.go

@@ -1,7 +1,7 @@
 package db
 
 import (
-	"blackforestbytes.com/simplecloudnotifier/sq"
+	"gogs.mikescher.com/BlackForestBytes/goext/sq"
 	"time"
 )
 

server/db/database.go

@@ -3,14 +3,15 @@ package db
 import (
 	server "blackforestbytes.com/simplecloudnotifier"
 	"blackforestbytes.com/simplecloudnotifier/db/schema"
-	"blackforestbytes.com/simplecloudnotifier/sq"
 	"context"
 	"database/sql"
 	"errors"
 	"fmt"
 	"github.com/jmoiron/sqlx"
 	_ "github.com/mattn/go-sqlite3"
+	"github.com/rs/zerolog/log"
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"gogs.mikescher.com/BlackForestBytes/goext/sq"
 	"time"
 )
 
@@ -33,7 +34,11 @@ func NewDatabase(conf server.Config) (*Database, error) {
 
 	qqdb := sq.NewDB(xdb)
 
-	return &Database{qqdb}, nil
+	scndb := &Database{qqdb}
+
+	qqdb.SetListener(scndb)
+
+	return scndb, nil
 }
 
 func (db *Database) Migrate(ctx context.Context) error {
@@ -74,3 +79,35 @@ func (db *Database) Ping(ctx context.Context) error {
 func (db *Database) BeginTx(ctx context.Context) (sq.Tx, error) {
 	return db.db.BeginTransaction(ctx, sql.LevelDefault)
 }
+
+func (db *Database) OnQuery(txID *uint16, sql string, _ *sq.PP) {
+	if txID == nil {
+		log.Debug().Msg(fmt.Sprintf("[SQL-QUERY] %s", fmtSQLPrint(sql)))
+	} else {
+		log.Debug().Msg(fmt.Sprintf("[SQL-TX<%d>-QUERY] %s", *txID, fmtSQLPrint(sql)))
+	}
+}
+
+func (db *Database) OnExec(txID *uint16, sql string, _ *sq.PP) {
+	if txID == nil {
+		log.Debug().Msg(fmt.Sprintf("[SQL-EXEC] %s", fmtSQLPrint(sql)))
+	} else {
+		log.Debug().Msg(fmt.Sprintf("[SQL-TX<%d>-EXEC] %s", *txID, fmtSQLPrint(sql)))
+	}
+}
+
+func (db *Database) OnPing() {
+	log.Debug().Msg("[SQL-PING]")
+}
+
+func (db *Database) OnTxBegin(txid uint16) {
+	log.Debug().Msg(fmt.Sprintf("[SQL-TX<%d>-START]", txid))
+}
+
+func (db *Database) OnTxCommit(txid uint16) {
+	log.Debug().Msg(fmt.Sprintf("[SQL-TX<%d>-COMMIT]", txid))
+}
+
+func (db *Database) OnTxRollback(txid uint16) {
+	log.Debug().Msg(fmt.Sprintf("[SQL-TX<%d>-ROLLBACK]", txid))
+}

server/db/deliveries.go

@@ -3,8 +3,8 @@ package db
 import (
 	scn "blackforestbytes.com/simplecloudnotifier"
 	"blackforestbytes.com/simplecloudnotifier/models"
-	"blackforestbytes.com/simplecloudnotifier/sq"
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"gogs.mikescher.com/BlackForestBytes/goext/sq"
 	"time"
 )
 

server/db/messages.go

@@ -3,9 +3,9 @@ package db
 import (
 	"blackforestbytes.com/simplecloudnotifier/db/cursortoken"
 	"blackforestbytes.com/simplecloudnotifier/models"
-	"blackforestbytes.com/simplecloudnotifier/sq"
 	"database/sql"
 	"fmt"
+	"gogs.mikescher.com/BlackForestBytes/goext/sq"
 	"time"
 )
 

server/db/meta.go

@@ -1,10 +1,10 @@
 package db
 
 import (
-	"blackforestbytes.com/simplecloudnotifier/sq"
 	"context"
 	"errors"
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"gogs.mikescher.com/BlackForestBytes/goext/sq"
 )
 
 func (db *Database) ReadSchema(ctx context.Context) (retval int, reterr error) {

server/db/subscriptions.go

@@ -2,8 +2,8 @@ package db
 
 import (
 	"blackforestbytes.com/simplecloudnotifier/models"
-	"blackforestbytes.com/simplecloudnotifier/sq"
 	"database/sql"
+	"gogs.mikescher.com/BlackForestBytes/goext/sq"
 	"time"
 )
 

server/db/users.go

@@ -3,8 +3,8 @@ package db
 import (
 	scn "blackforestbytes.com/simplecloudnotifier"
 	"blackforestbytes.com/simplecloudnotifier/models"
-	"blackforestbytes.com/simplecloudnotifier/sq"
 	"database/sql"
+	"gogs.mikescher.com/BlackForestBytes/goext/sq"
 	"time"
 )
 

server/db/utils.go

@@ -2,6 +2,7 @@ package db
 
 import (
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"strings"
 	"time"
 )
 
@@ -23,3 +24,14 @@ func time2DBOpt(t *time.Time) *int64 {
 	}
 	return langext.Ptr(t.UnixMilli())
 }
+
+func fmtSQLPrint(sql string) string {
+	if strings.Contains(sql, ";") {
+		return "(...multi...)"
+	}
+
+	sql = strings.ReplaceAll(sql, "\r", "")
+	sql = strings.ReplaceAll(sql, "\n", " ")
+
+	return sql
+}