Remove ill-advised code

Added FormScanner custom scanner, updated Go version.
2025-03-30 11:16:27 +02:00 · 2025-03-30 11:14:41 +02:00 · 2025-03-30 11:12:07 +02:00 · 2025-03-30 11:10:32 +02:00 · 2025-03-30 11:08:20 +02:00 · 2025-03-30 11:03:15 +02:00
13 changed files with 345 additions and 92 deletions
--- a/fts5/fts5.go
+++ b/fts5/fts5.go
@ -0,0 +1,151 @@
+package fts5
+
+import (
+	"database/sql"
+	"fmt"
+	"iter"
+	"strings"
+
+	_ "github.com/mattn/go-sqlite3"
+)
+
+type FTS5 struct {
+	colNames []string
+	db       *sql.DB
+
+	insertStmt *sql.Stmt
+	matchStmt  *sql.Stmt
+}
+
+func OpenMem(columnNames ...string) (*FTS5, error) {
+	db, err := sql.Open("sqlite3", ":memory:")
+	if err != nil {
+		return nil, err
+	}
+	return newInternal(db, columnNames)
+}
+
+func Open(path string, columnNames ...string) (*FTS5, error) {
+	db, err := sql.Open("sqlite3", path)
+	if err != nil {
+		return nil, err
+	}
+	return newInternal(db, columnNames)
+}
+
+func newInternal(db *sql.DB, columnNames []string) (*FTS5, error) {
+	_, err := db.Exec(fmt.Sprintf(
+		`CREATE VIRTUAL TABLE IF NOT EXISTS search USING fts5(%s, tokenize='porter')`,
+		strings.Join(columnNames, ",")))
+	if err != nil {
+		db.Close()
+		return nil, err
+	}
+
+	insertStmt, err := prepareInsertStmt(db, columnNames)
+	if err != nil {
+		db.Close()
+		return nil, err
+	}
+
+	matchStmt, err := db.Prepare(`SELECT rowid,rank FROM search WHERE search=? ` +
+		`ORDER BY rank ` +
+		`LIMIT ? OFFSET ?`)
+	if err != nil {
+		db.Close()
+		return nil, err
+	}
+
+	return &FTS5{
+		colNames:   columnNames,
+		db:         db,
+		insertStmt: insertStmt,
+		matchStmt:  matchStmt,
+	}, nil
+}
+
+func (fts *FTS5) Close() error {
+	return fts.db.Close()
+}
+
+func (fts *FTS5) Upsert(id int64, data map[string]string) error {
+	return execInsertStmt(fts.insertStmt, fts.colNames, id, data)
+}
+
+type Item struct {
+	ID   int64
+	Data map[string]string
+}
+
+func (fts *FTS5) UpsertBulk(src iter.Seq2[Item, error]) error {
+	tx, err := fts.db.Begin()
+	if err != nil {
+		return err
+	}
+
+	insertStmt, err := prepareInsertStmt(tx, fts.colNames)
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	for item, err := range src {
+		if err != nil {
+			tx.Rollback()
+			return err
+		}
+
+		if err := execInsertStmt(insertStmt, fts.colNames, item.ID, item.Data); err != nil {
+			tx.Rollback()
+			return err
+		}
+	}
+
+	return tx.Commit()
+}
+
+func (fts *FTS5) Delete(id int64) (bool, error) {
+	result, err := fts.db.Exec(`DELETE FROM search WHERE rowid=?`, id)
+	if err != nil {
+		return false, err
+	}
+
+	count, err := result.RowsAffected()
+	if err != nil {
+		panic(err)
+	}
+	if count > 1 {
+		panic("multiple rows deleted")
+	}
+	return count > 0, nil
+}
+
+func (fts *FTS5) DeleteAll() error {
+	_, err := fts.db.Exec(`DELETE FROM search`)
+	return err
+}
+
+type Result struct {
+	ID   int64
+	Rank float64
+}
+
+func (fts *FTS5) Match(query string, limit, offset int) ([]Result, error) {
+	results := make([]Result, 0, limit)
+
+	rows, err := fts.matchStmt.Query(query, limit, offset)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+
+	for rows.Next() {
+		result := Result{}
+		if err := rows.Scan(&result.ID, &result.Rank); err != nil {
+			return nil, err
+		}
+		results = append(results, result)
+	}
+
+	return results, nil
+}
--- a/fts5/fts5_test.go
+++ b/fts5/fts5_test.go
@ -0,0 +1,59 @@
+package fts5
+
+import (
+	"testing"
+)
+
+func TestMatch(t *testing.T) {
+	fts, err := OpenMem("Title", "Text")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	fts.Upsert(100, map[string]string{
+		"Title": "Peter Rabbit",
+		"Text":  "Peter Rabbit is a fictional animal character in various children's stories by English author Beatrix Potter.",
+	})
+
+	fts.Upsert(200, map[string]string{
+		"Title": "Baloo",
+		"Text":  "Fictional bear from the Jungle Book.",
+	})
+
+	fts.Upsert(300, map[string]string{
+		"Title": "Barney Bear",
+		"Text":  "A grumpy brown bear.",
+	})
+
+	fts.Upsert(400, map[string]string{
+		"Title": "Peter the Panda",
+		"Text":  "A secret agent panda from Seattle.",
+	})
+
+	// Should have 2 results for "peter".
+	results, err := fts.Match("peter", 3, 0)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(results) != 2 {
+		t.Fatal(results)
+	}
+
+	// Try limit.
+	results, err = fts.Match("peter", 1, 0)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(results) != 1 {
+		t.Fatal(results)
+	}
+
+	// Try offset.
+	results, err = fts.Match("peter", 3, 1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(results) != 1 {
+		t.Fatal(results)
+	}
+}
--- a/fts5/query.go
+++ b/fts5/query.go
@ -0,0 +1,36 @@
+package fts5
+
+import (
+	"database/sql"
+	"fmt"
+	"strings"
+)
+
+type preparer interface {
+	Prepare(string) (*sql.Stmt, error)
+}
+
+func prepareInsertStmt(
+	db preparer,
+	columnNames []string,
+) (*sql.Stmt, error) {
+	insertQuery := fmt.Sprintf(`INSERT INTO search(rowid,%s) VALUES (?%s)`,
+		strings.Join(columnNames, ","),
+		strings.Repeat(",?", len(columnNames)))
+	return db.Prepare(insertQuery)
+}
+
+func execInsertStmt(
+	stmt *sql.Stmt,
+	colNames []string,
+	id int64,
+	data map[string]string,
+) error {
+	values := make([]any, len(colNames)+1)
+	values[0] = id
+	for i, col := range colNames {
+		values[i+1] = data[col]
+	}
+	_, err := stmt.Exec(values...)
+	return err
+}
--- a/fts5/requiretag.go
+++ b/fts5/requiretag.go
@ -0,0 +1,9 @@
+//go:build !fts5
+
+package fts5
+
+import "log"
+
+func init() {
+	log.Fatal("You must provide build tag `-tags fts5`.")
+}
--- a/go.mod
+++ b/go.mod
@ -1,22 +1,20 @@
 module git.crumpington.com/lib/go

-go 1.23.2
+go 1.24.1

 require (
 	github.com/lib/pq v1.10.9
-	github.com/mailgun/mailgun-go/v4 v4.18.5
+	github.com/mailgun/mailgun-go/v4 v4.22.2
 	github.com/mattn/go-sqlite3 v1.14.24
-	golang.org/x/crypto v0.29.0
-	golang.org/x/net v0.31.0
+	golang.org/x/crypto v0.36.0
+	golang.org/x/net v0.37.0
 )

 require (
-	github.com/go-chi/chi/v5 v5.0.8 // indirect
-	github.com/json-iterator/go v1.1.10 // indirect
-	github.com/mailgun/errors v0.3.0 // indirect
+	github.com/go-chi/chi/v5 v5.2.1 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/mailgun/errors v0.4.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
-	github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
-	golang.org/x/sys v0.27.0 // indirect
-	golang.org/x/text v0.20.0 // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	golang.org/x/text v0.23.0 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -1,44 +1,38 @@
-github.com/ahmetb/go-linq v3.0.0+incompatible h1:qQkjjOXKrKOTy83X8OpRmnKflXKQIL/mC/gMVVDMhOA=
-github.com/ahmetb/go-linq v3.0.0+incompatible/go.mod h1:PFffvbdbtw+QTB0WKRP0cNht7vnCfnGlEpak/DVg5cY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-chi/chi/v5 v5.0.8 h1:lD+NLqFcAi1ovnVZpsnObHGW4xb4J8lNmoYVfECH1Y0=
-github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/chi/v5 v5.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8=
+github.com/go-chi/chi/v5 v5.2.1/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
-github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/mailgun/errors v0.3.0 h1:g8R8lodkwqk5WIVMAClyUqt0PSd5JTVgobB+H7C2sLs=
-github.com/mailgun/errors v0.3.0/go.mod h1:+ltknP+jhv3gZ1StKY6ugoQECcPxDCaSdmYesqTZcLQ=
-github.com/mailgun/mailgun-go/v4 v4.18.5 h1:wZnTutW/fzxNyJVBMa6O4LLGW/hO+IGfKpuqBT4nbVs=
-github.com/mailgun/mailgun-go/v4 v4.18.5/go.mod h1:+d4FCswFAukgYc1XtKK2IxOYaVxjVm8AN2z/5TBiT8M=
+github.com/mailgun/errors v0.4.0 h1:6LFBvod6VIW83CMIOT9sYNp28TCX0NejFPP4dSX++i8=
+github.com/mailgun/errors v0.4.0/go.mod h1:xGBaaKdEdQT0/FhwvoXv4oBaqqmVZz9P1XEnvD/onc0=
+github.com/mailgun/mailgun-go/v4 v4.22.2 h1:B7Mc9Kgo3+05f9B/t1wAjSY7zDchD/C7bb29+aXsnzw=
+github.com/mailgun/mailgun-go/v4 v4.22.2/go.mod h1:imTtizoFtpfZqPqGP8vltVBB6q9yWcv6llBhfFeElZU=
 github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM=
 github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
-golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
-golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
-golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
-golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
-golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
+golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
+golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
+golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/sqlgen/sqlite.go.tmpl
+++ b/sqlgen/sqlite.go.tmpl
@ -2,30 +2,9 @@ package {{.PackageName}}

 import (
 	"database/sql"
-	"errors"
 	"iter"
-
-	"github.com/mattn/go-sqlite3"
 )

-var (
-	ErrConstraint = errors.New("constraint violation")
-	ErrNotFound = errors.New("not found")
-)
-
-func translateError(err error) error {
-	if err == nil {
-		return nil
-	}
-	if e, ok := err.(sqlite3.Error); ok && e.Code == 19 {
-		return ErrConstraint
-	}
-	if errors.Is(err, sql.ErrNoRows) {
-		return ErrNotFound
-	}
-	return err
-}
-
 type TX interface {
 	Exec(query string, args ...any) (sql.Result, error)
 	Query(query string, args ...any) (*sql.Rows, error)
@ -57,7 +36,7 @@ func {{.Type}}_Insert(
  }

 	_, err = tx.Exec("{{.InsertQuery}}", {{.InsertArgs}})
-	return translateError(err)
+	return err
 }

 {{- end}} {{/* if not .NoInsert */}}
@ -77,7 +56,7 @@ func {{.Type}}_Update(

 	result, err := tx.Exec("{{.UpdateQuery}}", {{.UpdateArgs}})
 	if err != nil {
-		return translateError(err)
+		return err
 	}

 	n, err := result.RowsAffected()
@ -86,7 +65,7 @@ func {{.Type}}_Update(
 	}
 	switch n {
 	case 0:
-		return ErrNotFound
+		return sql.ErrNoRows
 	case 1:
 		return nil
 	default:
@ -108,7 +87,7 @@ func {{.Type}}_UpdateFull(

 	result, err := tx.Exec("{{.UpdateFullQuery}}", {{.UpdateFullArgs}})
 	if err != nil {
-		return translateError(err)
+		return err
 	}

 	n, err := result.RowsAffected()
@ -117,7 +96,7 @@ func {{.Type}}_UpdateFull(
 	}
 	switch n {
 		case 0:
-		return ErrNotFound
+		return sql.ErrNoRows
 	case 1:
 		return nil
 	default:
@ -137,7 +116,7 @@ func {{.Type}}_Delete(
 ) (err error) {
 	result, err := tx.Exec("{{.DeleteQuery}}", {{.DeleteArgs}})
 	if err != nil {
-		return translateError(err)
+		return err
 	}

 	n, err := result.RowsAffected()
@ -146,7 +125,7 @@ func {{.Type}}_Delete(
 	}
 	switch n {
 		case 0:
-		return ErrNotFound
+		return sql.ErrNoRows
 	case 1:
 		return nil
 	default:
@ -165,7 +144,7 @@ func {{.Type}}_Get(
 ) {
  row = &{{.Type}}{}
 	r := tx.QueryRow("{{.GetQuery}}", {{.DeleteArgs}})
-	err = translateError(r.Scan({{.ScanArgs}}))
+	err = r.Scan({{.ScanArgs}})
 	return
 }

@ -180,7 +159,7 @@ func {{.Type}}_GetWhere(
 ) {
  row = &{{.Type}}{}
 	r := tx.QueryRow(query, args...)
-	err = translateError(r.Scan({{.ScanArgs}}))
+	err = r.Scan({{.ScanArgs}})
 	return
 }

@ -204,7 +183,7 @@ func {{.Type}}_Iterate(
 		defer rows.Close()
 		for rows.Next() {
 			row := &{{.Type}}{}
-			err := translateError(rows.Scan({{.ScanArgs}}))
+			err := rows.Scan({{.ScanArgs}})
 			if !yield(row, err) {
 				return
 			}
--- a/sqlgen/main.go
+++ b/sqlgen/main.go
@ -5,14 +5,19 @@ import (
 	"os"
 )

+const (
+	DRIVER_SQLITE   = "sqlite"
+	DRIVER_POSTGRES = "postgres"
+)
+
 func Main() {
 	usage := func() {
 		fmt.Fprintf(os.Stderr, `
 %s DRIVER DEFS_PATH OUTPUT_PATH

-Drivers are one of: sqlite, postgres
+Drivers are one of: %s %s
 `,
-			os.Args[0])
+			os.Args[0], DRIVER_SQLITE, DRIVER_POSTGRES)
 		os.Exit(1)
 	}

@ -21,21 +26,20 @@ Drivers are one of: sqlite, postgres
 	}

 	var (
-		template   string
 		driver     = os.Args[1]
 		defsPath   = os.Args[2]
 		outputPath = os.Args[3]
 	)

 	switch driver {
-	case "sqlite":
-		template = sqliteTemplate
+	case DRIVER_SQLITE, DRIVER_POSTGRES:
+		// OK
 	default:
 		fmt.Fprintf(os.Stderr, "Unknown driver: %s", driver)
 		usage()
 	}

-	err := render(template, defsPath, outputPath)
+	err := render(driver, defsPath, outputPath)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error: %v", err)
 		os.Exit(1)
--- a/sqlgen/parse.go
+++ b/sqlgen/parse.go
@ -6,15 +6,15 @@ import (
 	"strings"
 )

-func parsePath(filePath string) (*schema, error) {
+func parsePath(driver, filePath string) (*schema, error) {
 	fileBytes, err := os.ReadFile(filePath)
 	if err != nil {
 		return nil, err
 	}
-	return parseBytes(fileBytes)
+	return parseBytes(driver, fileBytes)
 }

-func parseBytes(fileBytes []byte) (*schema, error) {
+func parseBytes(driver string, fileBytes []byte) (*schema, error) {
 	s := string(fileBytes)
 	for _, c := range []string{",", "(", ")", ";"} {
 		s = strings.ReplaceAll(s, c, " "+c+" ")
@ -29,7 +29,7 @@ func parseBytes(fileBytes []byte) (*schema, error) {
 	for len(tokens) > 0 {
 		switch tokens[0] {
 		case "TABLE":
-			tokens, err = parseTable(schema, tokens)
+			tokens, err = parseTable(driver, schema, tokens)
 			if err != nil {
 				return nil, err
 			}
@ -42,7 +42,7 @@ func parseBytes(fileBytes []byte) (*schema, error) {
 	return schema, nil
 }

-func parseTable(schema *schema, tokens []string) ([]string, error) {
+func parseTable(driver string, schema *schema, tokens []string) ([]string, error) {
 	tokens = tokens[1:]
 	if len(tokens) < 3 {
 		return tokens, errors.New("incomplete table definition")
@ -52,6 +52,7 @@ func parseTable(schema *schema, tokens []string) ([]string, error) {
 	}

 	table := &table{
+		driver: driver,
 		Name:   tokens[0],
 		Type:   tokens[2],
 	}
--- a/sqlgen/parse_test.go
+++ b/sqlgen/parse_test.go
@ -22,7 +22,7 @@ func TestParse(t *testing.T) {

 	for _, defPath := range paths {
 		t.Run(filepath.Base(defPath), func(t *testing.T) {
-			parsed, err := parsePath(defPath)
+			parsed, err := parsePath("", defPath)
 			if err != nil {
 				t.Fatal(err)
 			}
--- a/sqlgen/schema.go
+++ b/sqlgen/schema.go
@ -10,6 +10,7 @@ type schema struct {
 }

 type table struct {
+	driver   string //
 	Name     string // Name in SQL
 	Type     string // Go type
 	NoInsert bool
@ -29,6 +30,19 @@ type column struct {

 // ----------------------------------------------------------------------------

+func (t *table) translateQuery(in string) string {
+	if t.driver == DRIVER_SQLITE {
+		return in
+	}
+
+	i := 1
+	for strings.Contains(in, "?") {
+		in = strings.Replace(in, "?", fmt.Sprintf("$%d", i), 1)
+		i++
+	}
+	return in
+}
+
 func (t *table) colSQLNames() []string {
 	names := make([]string, len(t.Columns))
 	for i := range names {
@ -72,7 +86,7 @@ func (t *table) InsertQuery() string {
 		b.WriteString(`?`)
 	}
 	b.WriteString(`)`)
-	return b.String()
+	return t.translateQuery(b.String())
 }

 func (t *table) InsertArgs() string {
@ -116,7 +130,7 @@ func (t *table) UpdateQuery() string {
 		b.WriteString(` ` + c.SqlName + `=?`)
 	}

-	return b.String()
+	return t.translateQuery(b.String())
 }

 func (t *table) UpdateArgs() string {
@ -166,7 +180,7 @@ func (t *table) UpdateFullQuery() string {
 		b.WriteString(` ` + c.SqlName + `=?`)
 	}

-	return b.String()
+	return t.translateQuery(b.String())
 }

 func (t *table) UpdateFullArgs() string {
@ -222,7 +236,7 @@ func (t *table) DeleteQuery() string {
 		b.WriteString(col.SqlName)
 		b.WriteString(`=?`)
 	}
-	return b.String()
+	return t.translateQuery(b.String())
 }

 func (t *table) DeleteArgs() string {
@ -248,7 +262,7 @@ func (t *table) GetQuery() string {
 		}
 		b.WriteString(col.SqlName + `=?`)
 	}
-	return b.String()
+	return t.translateQuery(b.String())
 }

 func (t *table) ScanArgs() string {
--- a/sqlgen/template.go
+++ b/sqlgen/template.go
@ -8,16 +8,20 @@ import (
 	"text/template"
 )

-//go:embed sqlite.go.tmpl
-var sqliteTemplate string
+//go:embed gen.go.tmpl
+var fileTemplate string

-func render(templateStr, schemaPath, outputPath string) error {
-	sch, err := parsePath(schemaPath)
+func render(driver, schemaPath, outputPath string) (err error) {
+	outputPath, err = filepath.Abs(outputPath)
+	if err != nil {
+		return err
+	}
+	sch, err := parsePath(driver, schemaPath)
 	if err != nil {
 		return err
 	}

-	tmpl := template.Must(template.New("").Parse(templateStr))
+	tmpl := template.Must(template.New("").Parse(fileTemplate))
 	fOut, err := os.Create(outputPath)
 	if err != nil {
 		return err
--- a/webutil/formscanner.go
+++ b/webutil/formscanner.go
@ -37,3 +37,7 @@ func (s *FormScanner) Scan(name string, val any) *FormScanner {
 func (s *FormScanner) Error() error {
 	return s.err
 }
+
+func (s *FormScanner) SetError(err error) {
+	s.err = err
+}
Author	SHA1	Message	Date
jdl	e20a966475	Remove ill-advised code	2025-03-30 11:16:27 +02:00
jdl	060426fd64	Remove ill-advised code	2025-03-30 11:14:41 +02:00
jdl	833093ebee	Added FormScanner custom scanner, updated Go version.	2025-03-30 11:12:07 +02:00
jdl	f236c3d212	Added FormScanner custom scanner, updated Go version.	2025-03-30 11:10:32 +02:00
jdl	010243c726	Added FormScanner custom scanner, updated Go version.	2025-03-30 11:08:20 +02:00
jdl	acbdcae5f9	Added FormScanner custom scanner, updated Go version.	2025-03-30 11:03:15 +02:00
jdl	4993940aca	cleanup	2024-11-30 07:35:54 +01:00
jdl	9061198e7f	fts5	2024-11-19 16:41:41 +01:00
jdl	9070d8cfc0	wip	2024-11-19 16:30:42 +01:00
jdl	0d8cc762c0	wip	2024-11-19 16:20:18 +01:00
jdl	5577f90f95	wip	2024-11-19 08:57:49 +01:00