Working on adding SQLite support. Seems to be working... for now.

riffingonsoftware · riffingonsoftware · commit 28e4a86e4f17 · 2024-07-10T16:42:28.000-06:00
diff --git a/internal/gen.go b/internal/gen.go
@@ -368,7 +368,7 @@ func columnsToStruct(req *plugin.GenerateRequest, name string, columns []pyColum
 }
 
 var postgresPlaceholderRegexp = regexp.MustCompile(`\B\$(\d+)\b`)
-var sqlitePlaceholderRegexp = regexp.MustCompile(`\B\?(\d+)\b`)
+var sqlitePlaceholderRegexp = regexp.MustCompile(`\B[?$@](\d+)\b`)
 
 // Sqlalchemy uses ":name" for placeholders, so "$N" is converted to ":pN"
 // This also means ":" has special meaning to sqlalchemy, so it must be escaped.
diff --git a/internal/sqlite_type.go b/internal/sqlite_type.go
@@ -2,38 +2,35 @@ package python
 
 import (
 	"log"
+	"strings"
 
 	"github.com/sqlc-dev/plugin-sdk-go/plugin"
 	"github.com/sqlc-dev/plugin-sdk-go/sdk"
 )
 
 func sqliteType(req *plugin.GenerateRequest, col *plugin.Column) string {
-	columnType := sdk.DataType(col.Type)
+	columnType := strings.ToLower(sdk.DataType(col.Type))
 
 	switch columnType {
-	case "INTEGER", "INT", "TINYINT", "SMALLINT", "MEDIUMINT", "BIGINT", "INT2", "INT8":
+	case "int", "integer", "tinyint", "smallint", "mediumint", "bigint", "unsigned big int", "int2", "int8":
 		return "int"
-	case "REAL", "DOUBLE", "DOUBLE PRECISION", "FLOAT":
+	case "real", "double", "double precision", "float":
 		return "float"
-	case "NUMERIC", "DECIMAL":
+	case "numeric", "decimal":
 		return "decimal.Decimal"
-	case "BOOLEAN":
+	case "boolean":
 		return "bool"
-	case "JSON":
+	case "json":
 		return "Any"
-	case "BLOB":
+	case "blob":
 		return "memoryview"
-	case "DATE":
+	case "date":
 		return "datetime.date"
-	case "TIME":
-		return "datetime.time"
-	case "DATETIME", "TIMESTAMP":
+	case "datetime":
 		return "datetime.datetime"
-	case "TEXT", "CHARACTER", "VARCHAR", "NCHAR", "NVARCHAR", "CLOB":
+	case "text", "character", "varchar", "nchar", "nvarchar", "clob":
 		return "str"
 	default:
-		// SQLite doesn't have built-in UUID, INET, CIDR, MACADDR, or INTERVAL types
-		// It also doesn't have an ENUM type, but we'll keep the enum check for consistency
 		for _, schema := range req.Catalog.Schemas {
 			for _, enum := range schema.Enums {
 				if columnType == enum.Name {

Original file line number	Diff line number	Diff line change
`@@ -368,7 +368,7 @@ func columnsToStruct(req *plugin.GenerateRequest, name string, columns []pyColum`
`368`	`368`	`}`
`369`	`369`
`370`	`370`	var postgresPlaceholderRegexp = regexp.MustCompile(`\B\$(\d+)\b`)
`371`		-var sqlitePlaceholderRegexp = regexp.MustCompile(`\B\?(\d+)\b`)
	`371`	+var sqlitePlaceholderRegexp = regexp.MustCompile(`\B[?$@](\d+)\b`)
`372`	`372`
`373`	`373`	`// Sqlalchemy uses ":name" for placeholders, so "$N" is converted to ":pN"`
`374`	`374`	`// This also means ":" has special meaning to sqlalchemy, so it must be escaped.`