Add HasDefault column metadata
This commit is contained in:
parent
f55edafc0b
commit
b7904cde4e
8 changed files with 120 additions and 11 deletions
|
|
@ -8,8 +8,11 @@ import (
|
|||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/go-jet/jet/v2/generator/metadata"
|
||||
"github.com/go-jet/jet/v2/generator/mysql"
|
||||
"github.com/go-jet/jet/v2/generator/template"
|
||||
"github.com/go-jet/jet/v2/internal/testutils"
|
||||
mysql2 "github.com/go-jet/jet/v2/mysql"
|
||||
"github.com/go-jet/jet/v2/tests/dbconfig"
|
||||
)
|
||||
|
||||
|
|
@ -39,6 +42,39 @@ func TestGenerator(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
}
|
||||
|
||||
func TestGenerator_TableMetadata(t *testing.T) {
|
||||
var schema metadata.Schema
|
||||
err := mysql.Generate(genTestDir3, dbConnection("dvds"),
|
||||
template.Default(mysql2.Dialect).UseSchema(func(m metadata.Schema) template.Schema {
|
||||
schema = m
|
||||
return template.DefaultSchema(m)
|
||||
}))
|
||||
require.NoError(t, err)
|
||||
|
||||
// Spot check the actor table and assert that the emitted
|
||||
// properties are as expected.
|
||||
var got metadata.Table
|
||||
for _, table := range schema.TablesMetaData {
|
||||
if table.Name == "actor" {
|
||||
got = table
|
||||
}
|
||||
}
|
||||
|
||||
want := metadata.Table{
|
||||
Name: "actor",
|
||||
Columns: []metadata.Column{
|
||||
{Name: "actor_id", IsPrimaryKey: true, IsNullable: false, IsGenerated: false, HasDefault: false, DataType: metadata.DataType{Name: "smallint", Kind: "base", IsUnsigned: true}, Comment: ""},
|
||||
{Name: "first_name", IsPrimaryKey: false, IsNullable: false, IsGenerated: false, HasDefault: false, DataType: metadata.DataType{Name: "varchar", Kind: "base", IsUnsigned: false}, Comment: ""},
|
||||
{Name: "last_name", IsPrimaryKey: false, IsNullable: false, IsGenerated: false, HasDefault: false, DataType: metadata.DataType{Name: "varchar", Kind: "base", IsUnsigned: false}, Comment: ""},
|
||||
{Name: "last_update", IsPrimaryKey: false, IsNullable: false, IsGenerated: false, HasDefault: true, DataType: metadata.DataType{Name: "timestamp", Kind: "base", IsUnsigned: false}, Comment: ""},
|
||||
},
|
||||
}
|
||||
require.Equal(t, want, got)
|
||||
|
||||
err = os.RemoveAll(genTestDirRoot)
|
||||
require.NoError(t, err)
|
||||
}
|
||||
|
||||
func TestCmdGenerator(t *testing.T) {
|
||||
err := os.RemoveAll(genTestDir3)
|
||||
require.NoError(t, err)
|
||||
|
|
|
|||
|
|
@ -3,6 +3,9 @@ package postgres
|
|||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"path"
|
||||
"testing"
|
||||
|
||||
"github.com/go-jet/jet/v2/generator/metadata"
|
||||
"github.com/go-jet/jet/v2/generator/postgres"
|
||||
"github.com/go-jet/jet/v2/generator/template"
|
||||
|
|
@ -13,8 +16,6 @@ import (
|
|||
"github.com/go-jet/jet/v2/tests/dbconfig"
|
||||
file2 "github.com/go-jet/jet/v2/tests/internal/utils/file"
|
||||
"github.com/stretchr/testify/require"
|
||||
"path"
|
||||
"testing"
|
||||
)
|
||||
|
||||
const tempTestDir = "./.tempTestDir"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ package postgres
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/go-jet/jet/v2/tests/internal/utils/file"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
|
|
@ -12,11 +11,14 @@ import (
|
|||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/go-jet/jet/v2/generator/metadata"
|
||||
"github.com/go-jet/jet/v2/generator/postgres"
|
||||
"github.com/go-jet/jet/v2/generator/template"
|
||||
"github.com/go-jet/jet/v2/internal/testutils"
|
||||
"github.com/go-jet/jet/v2/tests/dbconfig"
|
||||
|
||||
postgres2 "github.com/go-jet/jet/v2/postgres"
|
||||
"github.com/go-jet/jet/v2/tests/.gentestdata/jetdb/dvds/model"
|
||||
"github.com/go-jet/jet/v2/tests/dbconfig"
|
||||
"github.com/go-jet/jet/v2/tests/internal/utils/file"
|
||||
)
|
||||
|
||||
func dsn(host string, port int, dbName, user, password string) string {
|
||||
|
|
@ -208,6 +210,36 @@ func TestGenerator(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
}
|
||||
|
||||
func TestGenerator_TableMetadata(t *testing.T) {
|
||||
var schema metadata.Schema
|
||||
err := postgres.GenerateDSN(defaultDSN(), "dvds", genTestDir2,
|
||||
template.Default(postgres2.Dialect).UseSchema(func(m metadata.Schema) template.Schema {
|
||||
schema = m
|
||||
return template.DefaultSchema(m)
|
||||
}))
|
||||
require.NoError(t, err)
|
||||
|
||||
// Spot check the actor table and assert that the emitted
|
||||
// properties are as expected.
|
||||
var got metadata.Table
|
||||
for _, table := range schema.TablesMetaData {
|
||||
if table.Name == "actor" {
|
||||
got = table
|
||||
}
|
||||
}
|
||||
|
||||
want := metadata.Table{
|
||||
Name: "actor",
|
||||
Columns: []metadata.Column{
|
||||
{Name: "actor_id", IsPrimaryKey: true, IsNullable: false, IsGenerated: false, HasDefault: true, DataType: metadata.DataType{Name: "int4", Kind: "base", IsUnsigned: false}, Comment: ""},
|
||||
{Name: "first_name", IsPrimaryKey: false, IsNullable: false, IsGenerated: false, HasDefault: false, DataType: metadata.DataType{Name: "varchar", Kind: "base", IsUnsigned: false}, Comment: ""},
|
||||
{Name: "last_name", IsPrimaryKey: false, IsNullable: false, IsGenerated: false, HasDefault: false, DataType: metadata.DataType{Name: "varchar", Kind: "base", IsUnsigned: false}, Comment: ""},
|
||||
{Name: "last_update", IsPrimaryKey: false, IsNullable: false, IsGenerated: false, HasDefault: false, DataType: metadata.DataType{Name: "timestamp", Kind: "base", IsUnsigned: false}, Comment: ""},
|
||||
},
|
||||
}
|
||||
require.Equal(t, want, got)
|
||||
}
|
||||
|
||||
func TestGeneratorSpecialCharacters(t *testing.T) {
|
||||
t.SkipNow()
|
||||
err := postgres.Generate(genTestDir2, postgres.DBConnection{
|
||||
|
|
|
|||
|
|
@ -8,8 +8,11 @@ import (
|
|||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/go-jet/jet/v2/generator/metadata"
|
||||
"github.com/go-jet/jet/v2/generator/sqlite"
|
||||
"github.com/go-jet/jet/v2/generator/template"
|
||||
"github.com/go-jet/jet/v2/internal/testutils"
|
||||
sqlite2 "github.com/go-jet/jet/v2/sqlite"
|
||||
"github.com/go-jet/jet/v2/tests/.gentestdata/sqlite/sakila/model"
|
||||
"github.com/go-jet/jet/v2/tests/internal/utils/repo"
|
||||
)
|
||||
|
|
@ -58,6 +61,36 @@ func TestGenerator(t *testing.T) {
|
|||
require.NoError(t, err)
|
||||
}
|
||||
|
||||
func TestGenerator_TableMetadata(t *testing.T) {
|
||||
var schema metadata.Schema
|
||||
err := sqlite.GenerateDSN(testDatabaseFilePath, genDestDir,
|
||||
template.Default(sqlite2.Dialect).UseSchema(func(m metadata.Schema) template.Schema {
|
||||
schema = m
|
||||
return template.DefaultSchema(m)
|
||||
}))
|
||||
require.NoError(t, err)
|
||||
|
||||
// Spot check the actor table and assert that the emitted
|
||||
// properties are as expected.
|
||||
var got metadata.Table
|
||||
for _, table := range schema.TablesMetaData {
|
||||
if table.Name == "actor" {
|
||||
got = table
|
||||
}
|
||||
}
|
||||
|
||||
want := metadata.Table{
|
||||
Name: "actor",
|
||||
Columns: []metadata.Column{
|
||||
{Name: "actor_id", IsPrimaryKey: true, IsNullable: false, IsGenerated: false, HasDefault: false, DataType: metadata.DataType{Name: "INTEGER", Kind: "base", IsUnsigned: false}, Comment: ""},
|
||||
{Name: "first_name", IsPrimaryKey: false, IsNullable: false, IsGenerated: false, HasDefault: false, DataType: metadata.DataType{Name: "VARCHAR", Kind: "base", IsUnsigned: false}, Comment: ""},
|
||||
{Name: "last_name", IsPrimaryKey: false, IsNullable: false, IsGenerated: false, HasDefault: false, DataType: metadata.DataType{Name: "VARCHAR", Kind: "base", IsUnsigned: false}, Comment: ""},
|
||||
{Name: "last_update", IsPrimaryKey: false, IsNullable: false, IsGenerated: false, HasDefault: true, DataType: metadata.DataType{Name: "TIMESTAMP", Kind: "base", IsUnsigned: false}, Comment: ""},
|
||||
},
|
||||
}
|
||||
require.Equal(t, want, got)
|
||||
}
|
||||
|
||||
func TestCmdGenerator(t *testing.T) {
|
||||
cmd := exec.Command("jet", "-source=SQLite", "-dsn=file://"+testDatabaseFilePath, "-path="+genDestDir)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue