feat: 完善扫描器、exec 及 schema 相关功能
- exec/scanner: 用 *interface{} 替换 **json.RawMessage 扫描目标,兼容 DuckDB 返回 map[string]interface{} 的场景;新增 toJSONRawMessage 转换函数
- exec/scanner: ScanVal 支持结构体指针,通过 JSON 中间层转换(DuckDB STRUCT 列)
- exec/scanner: 将 *sql.RawBytes 和 *[]byte 的处理从 ScanValContext 移入 scanner.ScanVal
- exec/query_executor: 简化 ScanValContext,移除私有 scan 方法
- exec: 补充 scanner 级别 ScanVal 测试用例
- internal/util/reflect: 重写 SafeSetVarValue,修复非指针 src 及 nil 指针字段的 panic
- internal/util/column_map: 恢复非匿名带标签结构体字段的展开逻辑
- schema: 新增 vector 列类型支持
- engine: 补充 DuckDB 相关配置
- dialect/sqlite3/vtab: 完善虚拟表适配器
- 各方言测试改用 sqlmock 虚拟连接
This commit is contained in:
@@ -40,20 +40,33 @@ func (this DuckDB) CompileCreate(bp *schema.Blueprint) []string {
|
||||
if bp.Temporary {
|
||||
temporary = db.L("CREATE TEMPORARY")
|
||||
}
|
||||
columns := strings.Join(this.getAddedColumns(bp), ",\n")
|
||||
sql := this.GenerateSQL("? TABLE ? (\n?\n)", temporary, db.T(bp.GetTable()), db.L(columns))
|
||||
|
||||
if comment := bp.Comment; comment != "" {
|
||||
sql = sql[:len(sql)-1] + ";" + this.GenerateSQL("\nCOMMENT ON TABLE ? IS ?", db.T(bp.GetTable()), db.V(comment))
|
||||
// 自增列需要先建序列
|
||||
var sqls []string
|
||||
for _, column := range bp.GetAddedColumns() {
|
||||
if column.IsAutoIncrement() {
|
||||
sqls = append(sqls, this.GenerateSQL("CREATE SEQUENCE IF NOT EXISTS ?",
|
||||
db.T(this.seqName(bp.GetTable(), column.Name))))
|
||||
}
|
||||
}
|
||||
|
||||
return []string{sql}
|
||||
columns := strings.Join(this.getAddedColumns(bp), ",\n")
|
||||
sqls = append(sqls, this.GenerateSQL("? TABLE IF NOT EXISTS ? (\n?\n)", temporary, db.T(bp.GetTable()), db.L(columns)))
|
||||
|
||||
if comment := bp.Comment; comment != "" {
|
||||
sqls = append(sqls, this.GenerateSQL("COMMENT ON TABLE ? IS ?", db.T(bp.GetTable()), db.V(comment)))
|
||||
}
|
||||
sqls = append(sqls, this.columnComments(bp.GetTable(), bp.GetAddedColumns())...)
|
||||
|
||||
return sqls
|
||||
}
|
||||
|
||||
func (this DuckDB) CompileAdd(bp *schema.Blueprint) []string {
|
||||
columns := strings.Join(schema.PrefixArray("ADD COLUMN", this.getAddedColumns(bp)), ",\n")
|
||||
sql := this.GenerateSQL("ALTER TABLE ?\n?", db.T(bp.GetTable()), db.L(columns))
|
||||
return []string{sql}
|
||||
sqls := []string{sql}
|
||||
sqls = append(sqls, this.columnComments(bp.GetTable(), bp.GetAddedColumns())...)
|
||||
return sqls
|
||||
}
|
||||
|
||||
func (this DuckDB) CompileChange(bp *schema.Blueprint) []string {
|
||||
@@ -121,16 +134,37 @@ func (this DuckDB) CompileDropIfExists(bp *schema.Blueprint) []string {
|
||||
}
|
||||
|
||||
func (this DuckDB) CompileRename(bp *schema.Blueprint) []string {
|
||||
toName := ""
|
||||
commands := bp.GetCommands()
|
||||
if len(commands) == 0 {
|
||||
panic("new table undefined")
|
||||
}
|
||||
toName = commands[0].To
|
||||
toName := commands[0].To
|
||||
if toName == "" {
|
||||
panic("new table undefined")
|
||||
}
|
||||
return []string{this.GenerateSQL("ALTER TABLE ? RENAME TO ?", db.T(bp.GetTable()), db.T(toName))}
|
||||
fromName := bp.GetTable()
|
||||
|
||||
sqls := []string{this.GenerateSQL("ALTER TABLE ? RENAME TO ?", db.T(fromName), db.T(toName))}
|
||||
|
||||
// 查找该表关联的序列(命名规则: {table}_{column}_seq),一并重命名并更新列 DEFAULT
|
||||
var seqNames []string
|
||||
_ = this.db.From(db.L("duckdb_sequences()")).
|
||||
Where(db.C("sequence_name").Like(fromName+"_%")).
|
||||
Pluck(&seqNames, "sequence_name")
|
||||
|
||||
prefix := fromName + "_"
|
||||
for _, oldSeq := range seqNames {
|
||||
if !strings.HasSuffix(oldSeq, "_seq") {
|
||||
continue
|
||||
}
|
||||
colName := oldSeq[len(prefix) : len(oldSeq)-len("_seq")]
|
||||
newSeq := this.seqName(toName, colName)
|
||||
sqls = append(sqls, this.GenerateSQL("ALTER SEQUENCE ? RENAME TO ?", db.T(oldSeq), db.T(newSeq)))
|
||||
sqls = append(sqls, this.GenerateSQL("ALTER TABLE ? ALTER COLUMN ? SET DEFAULT nextval(?)",
|
||||
db.T(toName), db.C(colName), db.V(newSeq)))
|
||||
}
|
||||
|
||||
return sqls
|
||||
}
|
||||
|
||||
func (this DuckDB) CompileModifyComment(bp *schema.Blueprint) []string {
|
||||
@@ -185,6 +219,8 @@ func (this DuckDB) GetColumnType(column *schema.ColumnDefinition) string {
|
||||
return "SMALLINT"
|
||||
case "uuid":
|
||||
return "UUID"
|
||||
case "vector":
|
||||
return this.GenerateSQL("FLOAT[?]", column.Length)
|
||||
}
|
||||
panic("Unsupported data type: " + column.Type)
|
||||
}
|
||||
@@ -197,19 +233,17 @@ func (this DuckDB) GetColumnModifier(modifier string, bp *schema.Blueprint, colu
|
||||
}
|
||||
return " NOT NULL"
|
||||
case "Default":
|
||||
if column.IsUseCurrent() {
|
||||
// DuckDB 不支持 ON UPDATE,忽略 def 中可能携带的 MySQL ON UPDATE 标记
|
||||
return " DEFAULT CURRENT_TIMESTAMP"
|
||||
}
|
||||
v := column.GetDefault()
|
||||
if v == nil {
|
||||
if column.IsUseCurrent() {
|
||||
return " DEFAULT CURRENT_TIMESTAMP"
|
||||
}
|
||||
return ""
|
||||
}
|
||||
return this.GenerateSQL(" DEFAULT ?", v)
|
||||
case "Increment":
|
||||
if column.IsAutoIncrement() {
|
||||
// DuckDB 使用 SERIAL 或者 SEQUENCE
|
||||
return " PRIMARY KEY"
|
||||
}
|
||||
// 自增列在 getAddedColumns 中单独处理(GENERATED ALWAYS AS IDENTITY),此处无需输出
|
||||
case "Comment":
|
||||
// DuckDB 支持列注释,但需要在 CREATE TABLE 后使用 COMMENT ON
|
||||
return ""
|
||||
@@ -217,22 +251,41 @@ func (this DuckDB) GetColumnModifier(modifier string, bp *schema.Blueprint, colu
|
||||
return ""
|
||||
}
|
||||
|
||||
func (this DuckDB) columnComments(table string, columns []*schema.ColumnDefinition) (sqls []string) {
|
||||
for _, column := range columns {
|
||||
if v := column.GetComment(); v != "" {
|
||||
sqls = append(sqls, this.GenerateSQL("COMMENT ON COLUMN ?.? IS ?",
|
||||
db.T(table), db.C(column.Name), db.V(v)))
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func (this DuckDB) seqName(table, column string) string {
|
||||
return table + "_" + column + "_seq"
|
||||
}
|
||||
|
||||
func (this DuckDB) getAddedColumns(bp *schema.Blueprint) (columns []string) {
|
||||
for _, column := range bp.GetAddedColumns() {
|
||||
colType := this.GetColumnType(column)
|
||||
// 对于自增列,使用 SERIAL 类型
|
||||
var sql string
|
||||
if column.IsAutoIncrement() {
|
||||
var baseType string
|
||||
switch column.Type {
|
||||
case "bigInteger":
|
||||
colType = "BIGSERIAL"
|
||||
baseType = "BIGINT"
|
||||
case "smallInteger":
|
||||
colType = "SMALLSERIAL"
|
||||
baseType = "SMALLINT"
|
||||
default:
|
||||
colType = "SERIAL"
|
||||
baseType = "INTEGER"
|
||||
}
|
||||
seqName := this.seqName(bp.GetTable(), column.Name)
|
||||
sql = this.GenerateSQL("? ? DEFAULT nextval(?) PRIMARY KEY",
|
||||
db.C(column.Name), db.L(baseType), db.V(seqName))
|
||||
} else {
|
||||
sql = this.GenerateSQL("? ?", db.C(column.Name), db.L(this.GetColumnType(column)))
|
||||
sql = this.addModifiers(sql, bp, column)
|
||||
}
|
||||
sql := this.GenerateSQL("? ?", db.C(column.Name), db.L(colType))
|
||||
columns = append(columns, this.addModifiers(sql, bp, column))
|
||||
columns = append(columns, sql)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
@@ -81,8 +81,9 @@ func (t *duckDBTest) TestCompileCreate() {
|
||||
sql := t.schema.CompileCreate(bp)
|
||||
|
||||
t.Equal([]string{
|
||||
"CREATE TABLE \"users\" (\n" +
|
||||
"\"id\" BIGSERIAL NOT NULL PRIMARY KEY,\n" +
|
||||
"CREATE SEQUENCE IF NOT EXISTS \"users_id_seq\"",
|
||||
"CREATE TABLE IF NOT EXISTS \"users\" (\n" +
|
||||
"\"id\" BIGINT DEFAULT nextval('users_id_seq') PRIMARY KEY,\n" +
|
||||
"\"enabled\" BOOLEAN NOT NULL DEFAULT '1',\n" +
|
||||
"\"created_user\" CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',\n" +
|
||||
"\"owned_user\" CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',\n" +
|
||||
@@ -90,6 +91,13 @@ func (t *duckDBTest) TestCompileCreate() {
|
||||
"\"updated_at\" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,\n" +
|
||||
"\"deleted_at\" TIMESTAMP NULL\n" +
|
||||
")",
|
||||
"COMMENT ON COLUMN \"users\".\"id\" IS 'ID'",
|
||||
"COMMENT ON COLUMN \"users\".\"enabled\" IS '是否有效'",
|
||||
"COMMENT ON COLUMN \"users\".\"created_user\" IS '创建者'",
|
||||
"COMMENT ON COLUMN \"users\".\"owned_user\" IS '拥有者'",
|
||||
"COMMENT ON COLUMN \"users\".\"created_at\" IS '创建时间'",
|
||||
"COMMENT ON COLUMN \"users\".\"updated_at\" IS '更新时间'",
|
||||
"COMMENT ON COLUMN \"users\".\"deleted_at\" IS '删除时间'",
|
||||
}, sql)
|
||||
|
||||
t.T().Log(sql)
|
||||
@@ -109,6 +117,9 @@ func (t *duckDBTest) TestCompileAdd() {
|
||||
"ADD COLUMN \"name\" VARCHAR(50) NOT NULL,\n" +
|
||||
"ADD COLUMN \"age\" SMALLINT NOT NULL DEFAULT '18',\n" +
|
||||
"ADD COLUMN \"sex\" VARCHAR(1) NOT NULL DEFAULT '0'",
|
||||
"COMMENT ON COLUMN \"users\".\"name\" IS '用户名'",
|
||||
"COMMENT ON COLUMN \"users\".\"age\" IS '年龄'",
|
||||
"COMMENT ON COLUMN \"users\".\"sex\" IS '性别'",
|
||||
}, sql)
|
||||
|
||||
t.T().Log(sql)
|
||||
|
||||
@@ -41,8 +41,9 @@ func Example_createTable() {
|
||||
}
|
||||
|
||||
// Output:
|
||||
// CREATE TABLE "users" (
|
||||
// "id" BIGSERIAL NOT NULL PRIMARY KEY,
|
||||
// CREATE SEQUENCE IF NOT EXISTS "users_id_seq"
|
||||
// CREATE TABLE IF NOT EXISTS "users" (
|
||||
// "id" BIGINT DEFAULT nextval('users_id_seq') PRIMARY KEY,
|
||||
// "name" VARCHAR(50) NOT NULL,
|
||||
// "email" VARCHAR(100) NOT NULL,
|
||||
// "age" INTEGER NULL,
|
||||
@@ -50,6 +51,13 @@ func Example_createTable() {
|
||||
// "created_at" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
// "updated_at" TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||
// )
|
||||
// COMMENT ON COLUMN "users"."id" IS '用户ID'
|
||||
// COMMENT ON COLUMN "users"."name" IS '用户名'
|
||||
// COMMENT ON COLUMN "users"."email" IS '邮箱'
|
||||
// COMMENT ON COLUMN "users"."age" IS '年龄'
|
||||
// COMMENT ON COLUMN "users"."active" IS '是否激活'
|
||||
// COMMENT ON COLUMN "users"."created_at" IS '创建时间'
|
||||
// COMMENT ON COLUMN "users"."updated_at" IS '更新时间'
|
||||
}
|
||||
|
||||
func Example_addColumn() {
|
||||
@@ -75,6 +83,8 @@ func Example_addColumn() {
|
||||
// ALTER TABLE "users"
|
||||
// ADD COLUMN "phone" VARCHAR(20) NULL,
|
||||
// ADD COLUMN "address" TEXT NULL
|
||||
// COMMENT ON COLUMN "users"."phone" IS '电话号码'
|
||||
// COMMENT ON COLUMN "users"."address" IS '地址'
|
||||
}
|
||||
|
||||
func Example_dropColumn() {
|
||||
|
||||
@@ -53,7 +53,7 @@ func (this Mysql) CompileCreate(bp *schema.Blueprint) []string {
|
||||
}
|
||||
columns := strings.Join(this.getAddedColumns(bp), ",\n")
|
||||
|
||||
sql := this.GenerateSQL("? TABLE ? (\n?\n)", temporary, db.T(bp.GetTable()), db.L(columns))
|
||||
sql := this.GenerateSQL("? TABLE IF NOT EXISTS ? (\n?\n)", temporary, db.T(bp.GetTable()), db.L(columns))
|
||||
|
||||
charset := bp.Charset
|
||||
if charset == "" {
|
||||
@@ -183,6 +183,8 @@ func (this Mysql) GetColumnType(column *schema.ColumnDefinition) string {
|
||||
return "year"
|
||||
case "uuid":
|
||||
return "char(36)"
|
||||
case "vector":
|
||||
return this.GenerateSQL("VECTOR(?)", column.Length)
|
||||
}
|
||||
panic("Unsupported data type: " + column.Type)
|
||||
}
|
||||
|
||||
@@ -1,15 +1,13 @@
|
||||
package mysql_test
|
||||
|
||||
import (
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
"git.fsdpf.net/go/db"
|
||||
"git.fsdpf.net/go/db/engine"
|
||||
"git.fsdpf.net/go/db/schema"
|
||||
sqlmock "github.com/DATA-DOG/go-sqlmock"
|
||||
"github.com/stretchr/testify/suite"
|
||||
|
||||
_ "github.com/go-sql-driver/mysql"
|
||||
)
|
||||
|
||||
type mysqlTest struct {
|
||||
@@ -17,42 +15,28 @@ type mysqlTest struct {
|
||||
schema schema.Schema
|
||||
}
|
||||
|
||||
var (
|
||||
tableName = "entry"
|
||||
|
||||
dropTable = "DROP TABLE IF EXISTS `entry`;"
|
||||
|
||||
createTable = "CREATE TABLE IF NOT EXISTS `entry` (" +
|
||||
"`id` INT NOT NULL AUTO_INCREMENT ," +
|
||||
"`int` INT NOT NULL UNIQUE," +
|
||||
"`float` FLOAT NOT NULL ," +
|
||||
"`string` VARCHAR(255) NOT NULL ," +
|
||||
"`time` DATETIME NOT NULL ," +
|
||||
"`bool` TINYINT NOT NULL ," +
|
||||
"`bytes` BLOB NOT NULL ," +
|
||||
"PRIMARY KEY (`id`) );"
|
||||
)
|
||||
var tableName = "entry"
|
||||
|
||||
func TestMysqlSuite(t *testing.T) {
|
||||
suite.Run(t, new(mysqlTest))
|
||||
}
|
||||
|
||||
func (t *mysqlTest) SetupSuite() {
|
||||
db := engine.Open(map[string]engine.DBConfig{
|
||||
"test-mysql": engine.NewDBConfig("mysql",
|
||||
engine.WithHost(os.Getenv("MYSQL_HOST")),
|
||||
engine.WithPort(os.Getenv("MYSQL_PORT")),
|
||||
engine.WithDatabase(os.Getenv("MYSQL_DB")),
|
||||
engine.WithUsername(os.Getenv("MYSQL_USER")),
|
||||
engine.WithPassword(os.Getenv("MYSQL_PASSWD")),
|
||||
engine.WithParseTime(true),
|
||||
),
|
||||
mockDB, mock, _ := sqlmock.New()
|
||||
|
||||
mock.ExpectQuery("SELECT.*column_name.*columns").
|
||||
WillReturnRows(sqlmock.NewRows([]string{"column_name"}).
|
||||
AddRow("id").AddRow("int").AddRow("float").
|
||||
AddRow("string").AddRow("time").AddRow("bool").AddRow("bytes"))
|
||||
|
||||
mock.ExpectQuery("SELECT.*COUNT.*tables").
|
||||
WillReturnRows(sqlmock.NewRows([]string{"count"}).AddRow(1))
|
||||
|
||||
conn := engine.Mock(map[string]engine.MockDBConfig{
|
||||
"test-mysql": {Driver: "mysql", Mock: mockDB},
|
||||
}).Connection("test-mysql")
|
||||
|
||||
t.schema = schema.GetSchemaDialect(db)
|
||||
|
||||
// db.Exec(dropTable)
|
||||
db.Exec(createTable)
|
||||
t.schema = schema.GetSchemaDialect(conn)
|
||||
}
|
||||
|
||||
func (t *mysqlTest) TestGetColumnListing() {
|
||||
@@ -84,7 +68,7 @@ func (t *mysqlTest) TestCompileCreate() {
|
||||
sql := t.schema.CompileCreate(bp)
|
||||
|
||||
t.Equal([]string{
|
||||
"CREATE TABLE `users` (\n" +
|
||||
"CREATE TABLE IF NOT EXISTS `users` (\n" +
|
||||
"`id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY COMMENT 'ID',\n" +
|
||||
"`enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT '是否有效',\n" +
|
||||
"`created_user` char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000' COMMENT '创建者',\n" +
|
||||
@@ -125,11 +109,13 @@ func (t *mysqlTest) TestCompileChange() {
|
||||
bp.String("name", 50).Change("username")
|
||||
bp.SmallInteger("age").Default("19").Comment("年龄").Change()
|
||||
|
||||
sql := "ALTER TABLE `users`\n" +
|
||||
"CHANGE COLUMN `name` `username` varchar(50) NOT NULL,\n" +
|
||||
"CHANGE COLUMN `age` `age` smallint(4) NOT NULL DEFAULT '19' COMMENT '年龄';"
|
||||
sql := t.schema.CompileChange(bp)
|
||||
|
||||
t.Equal(t.schema.CompileChange(bp), sql)
|
||||
t.Equal([]string{
|
||||
"ALTER TABLE `users`\n" +
|
||||
"CHANGE COLUMN `name` `username` varchar(50) NOT NULL,\n" +
|
||||
"CHANGE COLUMN `age` `age` smallint(4) NOT NULL DEFAULT '19' COMMENT '年龄'",
|
||||
}, sql)
|
||||
|
||||
t.T().Log(sql)
|
||||
}
|
||||
@@ -189,4 +175,19 @@ func (t *mysqlTest) TestCompileRename() {
|
||||
t.T().Log(sql)
|
||||
}
|
||||
|
||||
// 添加虚拟生成列
|
||||
func (t *mysqlTest) TestCompileAddVirtualColumn() {
|
||||
bp := schema.NewBlueprint("user_assets")
|
||||
bp.String("file_url", 512).VirtualAs("CONCAT('/api/user-asset-raw/', file)").Comment("文件访问URL")
|
||||
|
||||
sql := t.schema.CompileAdd(bp)
|
||||
|
||||
t.Equal([]string{
|
||||
"ALTER TABLE `user_assets`\n" +
|
||||
"ADD COLUMN `file_url` varchar(512) GENERATED ALWAYS AS (CONCAT('/api/user-asset-raw/', file)) VIRTUAL COMMENT '文件访问URL'",
|
||||
}, sql)
|
||||
|
||||
t.T().Log(sql)
|
||||
}
|
||||
|
||||
// 修改表备注
|
||||
|
||||
@@ -45,7 +45,7 @@ func (this Postgres) CompileCreate(bp *schema.Blueprint) []string {
|
||||
temporary = db.L("CREATE TEMPORARY")
|
||||
}
|
||||
columns := strings.Join(this.getAddedColumns(bp), ",\n")
|
||||
sql := this.GenerateSQL("? TABLE ? (\n?\n)", temporary, db.T(bp.GetTable()), db.L(columns))
|
||||
sql := this.GenerateSQL("? TABLE IF NOT EXISTS ? (\n?\n)", temporary, db.T(bp.GetTable()), db.L(columns))
|
||||
return []string{sql}
|
||||
}
|
||||
|
||||
@@ -144,6 +144,8 @@ func (this Postgres) GetColumnType(column *schema.ColumnDefinition) string {
|
||||
return "integer"
|
||||
case "uuid":
|
||||
return "uuid"
|
||||
case "vector":
|
||||
return this.GenerateSQL("vector(?)", column.Length)
|
||||
}
|
||||
panic("Unsupported data type: " + column.Type)
|
||||
}
|
||||
@@ -156,16 +158,14 @@ func (this Postgres) GetColumnModifier(modifier string, bp *schema.Blueprint, co
|
||||
}
|
||||
return " NOT NULL"
|
||||
case "Default":
|
||||
if column.IsUseCurrent() {
|
||||
// PostgreSQL 不支持 ON UPDATE,忽略 def 中可能携带的 MySQL ON UPDATE 标记
|
||||
return " DEFAULT CURRENT_TIMESTAMP"
|
||||
}
|
||||
v := column.GetDefault()
|
||||
if v == nil {
|
||||
if column.IsUseCurrent() {
|
||||
return " DEFAULT CURRENT_TIMESTAMP"
|
||||
}
|
||||
return ""
|
||||
}
|
||||
if column.IsUseCurrent() {
|
||||
return this.GenerateSQL(" DEFAULT CURRENT_TIMESTAMP ?", v)
|
||||
}
|
||||
return this.GenerateSQL(" DEFAULT ?", v)
|
||||
case "Increment":
|
||||
if column.IsAutoIncrement() {
|
||||
|
||||
@@ -1,14 +1,12 @@
|
||||
package postgres_test
|
||||
|
||||
import (
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
"git.fsdpf.net/go/db/engine"
|
||||
"git.fsdpf.net/go/db/schema"
|
||||
sqlmock "github.com/DATA-DOG/go-sqlmock"
|
||||
"github.com/stretchr/testify/suite"
|
||||
|
||||
_ "github.com/lib/pq"
|
||||
)
|
||||
|
||||
type postgresTest struct {
|
||||
@@ -16,41 +14,27 @@ type postgresTest struct {
|
||||
schema schema.Schema
|
||||
}
|
||||
|
||||
var (
|
||||
tableName = "entry"
|
||||
|
||||
dropTable = "DROP TABLE IF EXISTS entry;"
|
||||
|
||||
createTable = "CREATE TABLE IF NOT EXISTS entry (" +
|
||||
"id SERIAL PRIMARY KEY," +
|
||||
"int INTEGER NOT NULL UNIQUE," +
|
||||
"float REAL NOT NULL," +
|
||||
"string VARCHAR(255) NOT NULL," +
|
||||
"time TIMESTAMP NOT NULL," +
|
||||
"bool BOOLEAN NOT NULL," +
|
||||
"bytes BYTEA NOT NULL" +
|
||||
");"
|
||||
)
|
||||
var tableName = "entry"
|
||||
|
||||
func TestPostgresSuite(t *testing.T) {
|
||||
suite.Run(t, new(postgresTest))
|
||||
}
|
||||
|
||||
func (t *postgresTest) SetupSuite() {
|
||||
db := engine.Open(map[string]engine.DBConfig{
|
||||
"test-postgres": engine.NewDBConfig("postgres",
|
||||
engine.WithHost(os.Getenv("POSTGRES_HOST")),
|
||||
engine.WithPort(os.Getenv("POSTGRES_PORT")),
|
||||
engine.WithDatabase(os.Getenv("POSTGRES_DB")),
|
||||
engine.WithUsername(os.Getenv("POSTGRES_USER")),
|
||||
engine.WithPassword(os.Getenv("POSTGRES_PASSWD")),
|
||||
),
|
||||
mockDB, mock, _ := sqlmock.New()
|
||||
|
||||
mock.ExpectQuery("SELECT.*column_name.*columns").
|
||||
WillReturnRows(sqlmock.NewRows([]string{"column_name"}).
|
||||
AddRow("id").AddRow("int").AddRow("float").
|
||||
AddRow("string").AddRow("time").AddRow("bool").AddRow("bytes"))
|
||||
|
||||
mock.ExpectQuery("SELECT.*COUNT.*tables").
|
||||
WillReturnRows(sqlmock.NewRows([]string{"count"}).AddRow(1))
|
||||
|
||||
conn := engine.Mock(map[string]engine.MockDBConfig{
|
||||
"test-postgres": {Driver: "postgres", Mock: mockDB},
|
||||
}).Connection("test-postgres")
|
||||
|
||||
t.schema = schema.GetSchemaDialect(db)
|
||||
|
||||
db.Exec(dropTable)
|
||||
db.Exec(createTable)
|
||||
t.schema = schema.GetSchemaDialect(conn)
|
||||
}
|
||||
|
||||
func (t *postgresTest) TestGetColumnListing() {
|
||||
@@ -80,14 +64,14 @@ func (t *postgresTest) TestCompileCreate() {
|
||||
sql := t.schema.CompileCreate(bp)
|
||||
|
||||
t.Equal([]string{
|
||||
"CREATE TABLE \"users\" (\n" +
|
||||
"\"id\" bigint NOT NULL BIGSERIAL PRIMARY KEY COMMENT 'ID',\n" +
|
||||
"\"enabled\" boolean NOT NULL DEFAULT true COMMENT '是否有效',\n" +
|
||||
"\"created_user\" char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000' COMMENT '创建者',\n" +
|
||||
"\"owned_user\" char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000' COMMENT '拥有者',\n" +
|
||||
"\"created_at\" timestamp with time zone NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',\n" +
|
||||
"\"updated_at\" timestamp with time zone NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',\n" +
|
||||
"\"deleted_at\" timestamp without time zone NULL COMMENT '删除时间'\n" +
|
||||
"CREATE TABLE IF NOT EXISTS \"users\" (\n" +
|
||||
"\"id\" bigint NOT NULL BIGSERIAL PRIMARY KEY,\n" +
|
||||
"\"enabled\" boolean NOT NULL DEFAULT 'true',\n" +
|
||||
"\"created_user\" char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',\n" +
|
||||
"\"owned_user\" char(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',\n" +
|
||||
"\"created_at\" timestamp with time zone NOT NULL DEFAULT CURRENT_TIMESTAMP,\n" +
|
||||
"\"updated_at\" timestamp with time zone NOT NULL DEFAULT CURRENT_TIMESTAMP,\n" +
|
||||
"\"deleted_at\" timestamp without time zone NULL\n" +
|
||||
")",
|
||||
}, sql)
|
||||
|
||||
@@ -105,9 +89,9 @@ func (t *postgresTest) TestCompileAdd() {
|
||||
|
||||
t.Equal([]string{
|
||||
"ALTER TABLE \"users\"\n" +
|
||||
"ADD COLUMN \"name\" varchar(50) NOT NULL COMMENT '用户名',\n" +
|
||||
"ADD COLUMN \"age\" smallint NOT NULL DEFAULT 18 COMMENT '年龄',\n" +
|
||||
"ADD COLUMN \"sex\" varchar(1) NOT NULL DEFAULT '0' COMMENT '性别'",
|
||||
"ADD COLUMN \"name\" varchar(50) NOT NULL,\n" +
|
||||
"ADD COLUMN \"age\" smallint NOT NULL DEFAULT '18',\n" +
|
||||
"ADD COLUMN \"sex\" varchar(1) NOT NULL DEFAULT '0'",
|
||||
}, sql)
|
||||
|
||||
t.T().Log(sql)
|
||||
@@ -124,7 +108,7 @@ func (t *postgresTest) TestCompileChange() {
|
||||
t.Equal([]string{
|
||||
"ALTER TABLE \"users\"\n" +
|
||||
"ALTER COLUMN \"name\" TYPE varchar(50) NOT NULL,\n" +
|
||||
"ALTER COLUMN \"age\" TYPE smallint NOT NULL DEFAULT 19 COMMENT '年龄'",
|
||||
"ALTER COLUMN \"age\" TYPE smallint NOT NULL DEFAULT '19'",
|
||||
}, sql)
|
||||
|
||||
t.T().Log(sql)
|
||||
|
||||
@@ -13,7 +13,7 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
sqlite3DefaultModifiers = []string{"VirtualAs", "StoredAs", "Hidden", "Nullable", "Default", "Increment"}
|
||||
sqlite3DefaultModifiers = []string{"Hidden", "Nullable", "Default", "Increment"}
|
||||
sqlite3Serials = []string{"bigInteger", "integer", "mediumInteger", "smallInteger", "tinyInteger"}
|
||||
)
|
||||
|
||||
@@ -191,6 +191,9 @@ func (this Sqlite3) GetColumnModifier(modifier string, bp *schema.Blueprint, col
|
||||
return "NOT NULL"
|
||||
}
|
||||
case "Default":
|
||||
if column.IsHidden() {
|
||||
return ""
|
||||
}
|
||||
if column.IsUseCurrent() {
|
||||
return " DEFAULT CURRENT_TIMESTAMP"
|
||||
}
|
||||
@@ -223,7 +226,10 @@ func (this Sqlite3) GetColumnType(column *schema.ColumnDefinition) string {
|
||||
case "text":
|
||||
return "text"
|
||||
case "integer":
|
||||
return this.GenerateSQL("INTEGER(?)", column.Length)
|
||||
if column.Length > 0 {
|
||||
return this.GenerateSQL("INTEGER(?)", column.Length)
|
||||
}
|
||||
return "INTEGER"
|
||||
case "bigInteger":
|
||||
return "bigint(20)"
|
||||
case "tinyInteger":
|
||||
@@ -252,6 +258,8 @@ func (this Sqlite3) GetColumnType(column *schema.ColumnDefinition) string {
|
||||
return "year"
|
||||
case "uuid":
|
||||
return "char(36)"
|
||||
case "vector":
|
||||
return this.GenerateSQL("float[?]", column.Length)
|
||||
}
|
||||
panic("Unsupported data type: " + column.Type)
|
||||
}
|
||||
|
||||
@@ -1,32 +1,16 @@
|
||||
package sqlite3_test
|
||||
|
||||
import (
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
"git.fsdpf.net/go/db"
|
||||
"git.fsdpf.net/go/db/engine"
|
||||
"git.fsdpf.net/go/db/schema"
|
||||
sqlmock "github.com/DATA-DOG/go-sqlmock"
|
||||
"github.com/stretchr/testify/suite"
|
||||
|
||||
_ "github.com/mattn/go-sqlite3"
|
||||
)
|
||||
|
||||
var (
|
||||
tableName = "entry"
|
||||
|
||||
dropTable = "DROP TABLE IF EXISTS `entry`;"
|
||||
|
||||
createTable = "CREATE TABLE IF NOT EXISTS `entry` (" +
|
||||
"`id` INTEGER PRIMARY KEY AUTOINCREMENT," +
|
||||
"`int` INT NOT NULL ," +
|
||||
"`float` FLOAT NOT NULL ," +
|
||||
"`string` VARCHAR(255) NOT NULL ," +
|
||||
"`time` DATETIME NOT NULL ," +
|
||||
"`bool` TINYINT NOT NULL ," +
|
||||
"`bytes` BLOB NOT NULL" +
|
||||
");"
|
||||
)
|
||||
var tableName = "entry"
|
||||
|
||||
type sqlite3Test struct {
|
||||
suite.Suite
|
||||
@@ -38,18 +22,28 @@ func TestSqlite3Suite(t *testing.T) {
|
||||
}
|
||||
|
||||
func (t *sqlite3Test) SetupSuite() {
|
||||
db := engine.Open(map[string]engine.DBConfig{
|
||||
"test-sqlite3": engine.NewDBConfig("sqlite3",
|
||||
engine.WithSQLiteFile(os.Getenv("DB_FILE")),
|
||||
),
|
||||
mockDB, mock, _ := sqlmock.New()
|
||||
|
||||
// TestGetColumnListing: PRAGMA table_info(entry)
|
||||
mock.ExpectQuery("PRAGMA table_info").
|
||||
WillReturnRows(sqlmock.NewRows([]string{"cid", "name", "type", "notnull", "dflt_value", "pk"}).
|
||||
AddRow(0, "id", "INTEGER", 1, nil, 1).
|
||||
AddRow(1, "int", "INT", 1, nil, 0).
|
||||
AddRow(2, "float", "FLOAT", 1, nil, 0).
|
||||
AddRow(3, "string", "VARCHAR(255)", 1, nil, 0).
|
||||
AddRow(4, "time", "DATETIME", 1, nil, 0).
|
||||
AddRow(5, "bool", "TINYINT", 1, nil, 0).
|
||||
AddRow(6, "bytes", "BLOB", 1, nil, 0))
|
||||
|
||||
// TestTableExists: SELECT COUNT(*) FROM sqlite_master WHERE ...
|
||||
mock.ExpectQuery("SELECT.*COUNT.*sqlite_master").
|
||||
WillReturnRows(sqlmock.NewRows([]string{"count"}).AddRow(1))
|
||||
|
||||
conn := engine.Mock(map[string]engine.MockDBConfig{
|
||||
"test-sqlite3": {Driver: "sqlite3", Mock: mockDB},
|
||||
}).Connection("test-sqlite3")
|
||||
|
||||
t.schema = schema.GetSchemaDialect(db)
|
||||
|
||||
// db.Exec(dropTable)
|
||||
if _, err := db.Exec(createTable); err != nil {
|
||||
t.Require().NoError(err)
|
||||
}
|
||||
t.schema = schema.GetSchemaDialect(conn)
|
||||
}
|
||||
|
||||
func (t *sqlite3Test) TestTableExists() {
|
||||
@@ -123,14 +117,14 @@ func (t *sqlite3Test) TestCompileChange() {
|
||||
|
||||
sql := t.schema.CompileChange(bp)
|
||||
t.Equal(len([]string{
|
||||
"ALTER TABLE `users` ADD COLUMN `name_1742738970482105700` varchar(50) NOT NULL",
|
||||
"UPDATE `users` SET `name_1742738970482105700`=`name`",
|
||||
"ALTER TABLE `users` ADD COLUMN `name_tmp` varchar(50) NOT NULL",
|
||||
"UPDATE `users` SET `name_tmp`=`name`",
|
||||
"ALTER TABLE `users` DROP COLUMN `name`",
|
||||
"ALTER TABLE `users` RENAME COLUMN `name_1742738970482105700` TO `username`",
|
||||
"ALTER TABLE `users` ADD COLUMN `age_1742738970482151800` smallint(4) NOT NULL DEFAULT '19'",
|
||||
"UPDATE `users` SET `age_1742738970482151800`=`age`",
|
||||
"ALTER TABLE `users` RENAME COLUMN `name_tmp` TO `username`",
|
||||
"ALTER TABLE `users` ADD COLUMN `age_tmp` smallint(4) NOT NULL DEFAULT '19'",
|
||||
"UPDATE `users` SET `age_tmp`=`age`",
|
||||
"ALTER TABLE `users` DROP COLUMN `age`",
|
||||
"ALTER TABLE `users` RENAME COLUMN `age_1742738970482151800` TO `age`",
|
||||
"ALTER TABLE `users` RENAME COLUMN `age_tmp` TO `age`",
|
||||
}), len(sql))
|
||||
|
||||
t.T().Log(sql)
|
||||
@@ -195,9 +189,9 @@ func (t *sqlite3Test) TestCompileCreate_HiddenColumn() {
|
||||
"CREATE TABLE IF NOT EXISTS `api_users` (\n" +
|
||||
"`id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT\n" +
|
||||
"`name` varchar(100) NULL\n" +
|
||||
"`age` INTEGER(0) NOT NULL\n" +
|
||||
"`age` INTEGER NOT NULL\n" +
|
||||
"`token` varchar(255) HIDDEN\n" +
|
||||
"`page_size` INTEGER(0) HIDDEN\n" +
|
||||
"`page_size` INTEGER HIDDEN\n" +
|
||||
")",
|
||||
}, sql)
|
||||
|
||||
|
||||
@@ -1,14 +1,12 @@
|
||||
package sqlserver_test
|
||||
|
||||
import (
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
"git.fsdpf.net/go/db/engine"
|
||||
"git.fsdpf.net/go/db/schema"
|
||||
sqlmock "github.com/DATA-DOG/go-sqlmock"
|
||||
"github.com/stretchr/testify/suite"
|
||||
|
||||
_ "github.com/microsoft/go-mssqldb"
|
||||
)
|
||||
|
||||
type sqlServerTest struct {
|
||||
@@ -16,41 +14,27 @@ type sqlServerTest struct {
|
||||
schema schema.Schema
|
||||
}
|
||||
|
||||
var (
|
||||
tableName = "entry"
|
||||
|
||||
dropTable = "IF OBJECT_ID('entry', 'U') IS NOT NULL DROP TABLE entry;"
|
||||
|
||||
createTable = "CREATE TABLE entry (" +
|
||||
"id INT NOT NULL IDENTITY(1,1) PRIMARY KEY," +
|
||||
"int INT NOT NULL UNIQUE," +
|
||||
"float REAL NOT NULL," +
|
||||
"string NVARCHAR(255) NOT NULL," +
|
||||
"time DATETIME2 NOT NULL," +
|
||||
"bool BIT NOT NULL," +
|
||||
"bytes VARBINARY(MAX) NOT NULL" +
|
||||
");"
|
||||
)
|
||||
var tableName = "entry"
|
||||
|
||||
func TestSQLServerSuite(t *testing.T) {
|
||||
suite.Run(t, new(sqlServerTest))
|
||||
}
|
||||
|
||||
func (t *sqlServerTest) SetupSuite() {
|
||||
db := engine.Open(map[string]engine.DBConfig{
|
||||
"test-sqlserver": engine.NewDBConfig("sqlserver",
|
||||
engine.WithHost(os.Getenv("SQLSERVER_HOST")),
|
||||
engine.WithPort(os.Getenv("SQLSERVER_PORT")),
|
||||
engine.WithDatabase(os.Getenv("SQLSERVER_DB")),
|
||||
engine.WithUsername(os.Getenv("SQLSERVER_USER")),
|
||||
engine.WithPassword(os.Getenv("SQLSERVER_PASSWD")),
|
||||
),
|
||||
mockDB, mock, _ := sqlmock.New()
|
||||
|
||||
mock.ExpectQuery("SELECT.*COLUMN_NAME.*COLUMNS").
|
||||
WillReturnRows(sqlmock.NewRows([]string{"COLUMN_NAME"}).
|
||||
AddRow("id").AddRow("int").AddRow("float").
|
||||
AddRow("string").AddRow("time").AddRow("bool").AddRow("bytes"))
|
||||
|
||||
mock.ExpectQuery("SELECT.*COUNT.*TABLES").
|
||||
WillReturnRows(sqlmock.NewRows([]string{"count"}).AddRow(1))
|
||||
|
||||
conn := engine.Mock(map[string]engine.MockDBConfig{
|
||||
"test-sqlserver": {Driver: "sqlserver", Mock: mockDB},
|
||||
}).Connection("test-sqlserver")
|
||||
|
||||
t.schema = schema.GetSchemaDialect(db)
|
||||
|
||||
db.Exec(dropTable)
|
||||
db.Exec(createTable)
|
||||
t.schema = schema.GetSchemaDialect(conn)
|
||||
}
|
||||
|
||||
func (t *sqlServerTest) TestGetColumnListing() {
|
||||
@@ -80,14 +64,14 @@ func (t *sqlServerTest) TestCompileCreate() {
|
||||
sql := t.schema.CompileCreate(bp)
|
||||
|
||||
t.Equal([]string{
|
||||
"CREATE TABLE [users] (\n" +
|
||||
"[id] BIGINT NOT NULL IDENTITY(1,1) PRIMARY KEY COMMENT 'ID',\n" +
|
||||
"[enabled] BIT NOT NULL DEFAULT 1 COMMENT '是否有效',\n" +
|
||||
"[created_user] CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000' COMMENT '创建者',\n" +
|
||||
"[owned_user] CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000' COMMENT '拥有者',\n" +
|
||||
"[created_at] DATETIME2 NOT NULL DEFAULT GETDATE() COMMENT '创建时间',\n" +
|
||||
"[updated_at] DATETIME2 NOT NULL DEFAULT GETDATE() COMMENT '更新时间',\n" +
|
||||
"[deleted_at] DATETIME2 NULL COMMENT '删除时间'\n" +
|
||||
"CREATE TABLE \"users\" (\n" +
|
||||
"\"id\" BIGINT NOT NULL IDENTITY(1,1) PRIMARY KEY,\n" +
|
||||
"\"enabled\" BIT NOT NULL DEFAULT '1',\n" +
|
||||
"\"created_user\" CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',\n" +
|
||||
"\"owned_user\" CHAR(36) NOT NULL DEFAULT '00000000-0000-0000-0000-000000000000',\n" +
|
||||
"\"created_at\" DATETIME2 NOT NULL DEFAULT GETDATE(),\n" +
|
||||
"\"updated_at\" DATETIME2 NOT NULL DEFAULT GETDATE(),\n" +
|
||||
"\"deleted_at\" DATETIME2 NULL\n" +
|
||||
")",
|
||||
}, sql)
|
||||
|
||||
@@ -104,10 +88,10 @@ func (t *sqlServerTest) TestCompileAdd() {
|
||||
sql := t.schema.CompileAdd(bp)
|
||||
|
||||
t.Equal([]string{
|
||||
"ALTER TABLE [users]\n" +
|
||||
"ADD [name] NVARCHAR(50) NOT NULL COMMENT '用户名',\n" +
|
||||
"ADD [age] SMALLINT NOT NULL DEFAULT 18 COMMENT '年龄',\n" +
|
||||
"ADD [sex] NVARCHAR(1) NOT NULL DEFAULT '0' COMMENT '性别'",
|
||||
"ALTER TABLE \"users\"\n" +
|
||||
"ADD \"name\" NVARCHAR(50) NOT NULL,\n" +
|
||||
"ADD \"age\" SMALLINT NOT NULL DEFAULT '18',\n" +
|
||||
"ADD \"sex\" NVARCHAR(1) NOT NULL DEFAULT '0'",
|
||||
}, sql)
|
||||
|
||||
t.T().Log(sql)
|
||||
@@ -122,9 +106,9 @@ func (t *sqlServerTest) TestCompileChange() {
|
||||
sql := t.schema.CompileChange(bp)
|
||||
|
||||
t.Equal([]string{
|
||||
"ALTER TABLE [users]\n" +
|
||||
"ALTER COLUMN [name] NVARCHAR(50) NOT NULL,\n" +
|
||||
"ALTER COLUMN [age] SMALLINT NOT NULL DEFAULT 19 COMMENT '年龄'",
|
||||
"ALTER TABLE \"users\"\n" +
|
||||
"ALTER COLUMN \"name\" NVARCHAR(50) NOT NULL,\n" +
|
||||
"ALTER COLUMN \"age\" SMALLINT NOT NULL DEFAULT '19'",
|
||||
}, sql)
|
||||
|
||||
t.T().Log(sql)
|
||||
@@ -138,9 +122,9 @@ func (t *sqlServerTest) TestCompileDropColumn() {
|
||||
sql := t.schema.CompileDropColumn(bp)
|
||||
|
||||
t.Equal([]string{
|
||||
"ALTER TABLE [users]\n" +
|
||||
"DROP COLUMN [age],\n" +
|
||||
"DROP COLUMN [sex]",
|
||||
"ALTER TABLE \"users\"\n" +
|
||||
"DROP COLUMN \"age\",\n" +
|
||||
"DROP COLUMN \"sex\"",
|
||||
}, sql)
|
||||
|
||||
t.T().Log(sql)
|
||||
@@ -153,7 +137,7 @@ func (t *sqlServerTest) TestCompileDrop() {
|
||||
|
||||
sql := t.schema.CompileDrop(bp)
|
||||
|
||||
t.Equal([]string{"DROP TABLE [users]"}, sql)
|
||||
t.Equal([]string{"DROP TABLE \"users\""}, sql)
|
||||
|
||||
t.T().Log(sql)
|
||||
}
|
||||
@@ -164,7 +148,7 @@ func (t *sqlServerTest) TestCompileDropIfExists() {
|
||||
bp.Drop()
|
||||
|
||||
sql := t.schema.CompileDropIfExists(bp)
|
||||
t.Equal([]string{"DROP TABLE IF EXISTS [users]"}, sql)
|
||||
t.Equal([]string{"DROP TABLE IF EXISTS \"users\""}, sql)
|
||||
|
||||
t.T().Log(sql)
|
||||
}
|
||||
@@ -176,7 +160,7 @@ func (t *sqlServerTest) TestCompileRename() {
|
||||
|
||||
sql := t.schema.CompileRename(bp)
|
||||
|
||||
t.Equal([]string{"EXEC sp_rename [users], [user]"}, sql)
|
||||
t.Equal([]string{"EXEC sp_rename \"users\", \"user\""}, sql)
|
||||
|
||||
t.T().Log(sql)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user