Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e1df3b7cee |
@@ -6,7 +6,6 @@ import (
|
|||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/buildinfo"
|
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/models"
|
"git.warky.dev/wdevs/relspecgo/pkg/models"
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/writers"
|
"git.warky.dev/wdevs/relspecgo/pkg/writers"
|
||||||
)
|
)
|
||||||
@@ -14,7 +13,6 @@ import (
|
|||||||
// TemplateData represents the data passed to the template for code generation
|
// TemplateData represents the data passed to the template for code generation
|
||||||
type TemplateData struct {
|
type TemplateData struct {
|
||||||
PackageName string
|
PackageName string
|
||||||
GeneratedBy string
|
|
||||||
Imports []string
|
Imports []string
|
||||||
Models []*ModelData
|
Models []*ModelData
|
||||||
Config *MethodConfig
|
Config *MethodConfig
|
||||||
@@ -167,7 +165,6 @@ func NewTemplateData(packageName string, config *MethodConfig) *TemplateData {
|
|||||||
|
|
||||||
return &TemplateData{
|
return &TemplateData{
|
||||||
PackageName: packageName,
|
PackageName: packageName,
|
||||||
GeneratedBy: buildinfo.GeneratedComment(),
|
|
||||||
Imports: make([]string, 0),
|
Imports: make([]string, 0),
|
||||||
Models: make([]*ModelData, 0),
|
Models: make([]*ModelData, 0),
|
||||||
Config: config,
|
Config: config,
|
||||||
|
|||||||
@@ -7,8 +7,7 @@ import (
|
|||||||
|
|
||||||
// modelTemplate defines the template for generating Bun models
|
// modelTemplate defines the template for generating Bun models
|
||||||
const modelTemplate = `// Code generated by relspecgo. DO NOT EDIT.
|
const modelTemplate = `// Code generated by relspecgo. DO NOT EDIT.
|
||||||
{{if .GeneratedBy}}// {{.GeneratedBy}}
|
package {{.PackageName}}
|
||||||
{{end}}package {{.PackageName}}
|
|
||||||
|
|
||||||
{{if .Imports -}}
|
{{if .Imports -}}
|
||||||
import (
|
import (
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/buildinfo"
|
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/models"
|
"git.warky.dev/wdevs/relspecgo/pkg/models"
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/writers"
|
"git.warky.dev/wdevs/relspecgo/pkg/writers"
|
||||||
)
|
)
|
||||||
@@ -121,7 +120,7 @@ func TestWriter_WriteTable_MultilineDescriptionProducesValidGo(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestWriter_WriteTable_EmbedsRelspecVersionHeader(t *testing.T) {
|
func TestWriter_WriteTable_HeaderIsVersionFree(t *testing.T) {
|
||||||
table := models.InitTable("users", "public")
|
table := models.InitTable("users", "public")
|
||||||
table.Columns["id"] = &models.Column{Name: "id", Type: "bigint", IsPrimaryKey: true, NotNull: true, Sequence: 1}
|
table.Columns["id"] = &models.Column{Name: "id", Type: "bigint", IsPrimaryKey: true, NotNull: true, Sequence: 1}
|
||||||
|
|
||||||
@@ -141,19 +140,14 @@ func TestWriter_WriteTable_EmbedsRelspecVersionHeader(t *testing.T) {
|
|||||||
t.Fatalf("generated code is invalid Go: %v\n%s", err, src)
|
t.Fatalf("generated code is invalid Go: %v\n%s", err, src)
|
||||||
}
|
}
|
||||||
|
|
||||||
wantHeader := "// " + buildinfo.GeneratedComment()
|
// Output must be reproducible: no version or build date in the header.
|
||||||
if !strings.Contains(src, wantHeader) {
|
if strings.Contains(src, "(built: ") || strings.Contains(src, "RelSpec ") {
|
||||||
t.Errorf("generated code missing RelSpec version header %q\n%s", wantHeader, src)
|
t.Errorf("generated code still carries a version header\n%s", src)
|
||||||
}
|
}
|
||||||
// The provenance comment must sit between the "Code generated" marker and the package clause.
|
// The "Code generated" marker must sit directly above the package clause.
|
||||||
genIdx := strings.Index(src, "// Code generated by relspecgo. DO NOT EDIT.")
|
want := "// Code generated by relspecgo. DO NOT EDIT.\npackage models"
|
||||||
hdrIdx := strings.Index(src, wantHeader)
|
if !strings.Contains(src, want) {
|
||||||
pkgIdx := strings.Index(src, "package models")
|
t.Errorf("header not immediately followed by package clause\n%s", src)
|
||||||
if genIdx < 0 || hdrIdx < 0 || pkgIdx < 0 || !(genIdx < hdrIdx && hdrIdx < pkgIdx) {
|
|
||||||
t.Errorf("RelSpec version header is misplaced (gen=%d hdr=%d pkg=%d)\n%s", genIdx, hdrIdx, pkgIdx, src)
|
|
||||||
}
|
|
||||||
if !strings.Contains(wantHeader, "RelSpec ") || !strings.Contains(wantHeader, "(built: ") {
|
|
||||||
t.Errorf("version header not in expected 'RelSpec <version> (built: <date>)' form: %q", wantHeader)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,13 +4,11 @@ import (
|
|||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/buildinfo"
|
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/models"
|
"git.warky.dev/wdevs/relspecgo/pkg/models"
|
||||||
)
|
)
|
||||||
|
|
||||||
// TemplateData represents the data passed to the template for code generation
|
// TemplateData represents the data passed to the template for code generation
|
||||||
type TemplateData struct {
|
type TemplateData struct {
|
||||||
GeneratedBy string
|
|
||||||
Imports []string
|
Imports []string
|
||||||
Enums []*EnumData
|
Enums []*EnumData
|
||||||
Tables []*TableData
|
Tables []*TableData
|
||||||
@@ -61,7 +59,6 @@ type IndexData struct {
|
|||||||
// NewTemplateData creates a new TemplateData
|
// NewTemplateData creates a new TemplateData
|
||||||
func NewTemplateData() *TemplateData {
|
func NewTemplateData() *TemplateData {
|
||||||
return &TemplateData{
|
return &TemplateData{
|
||||||
GeneratedBy: buildinfo.GeneratedComment(),
|
|
||||||
Imports: make([]string, 0),
|
Imports: make([]string, 0),
|
||||||
Enums: make([]*EnumData, 0),
|
Enums: make([]*EnumData, 0),
|
||||||
Tables: make([]*TableData, 0),
|
Tables: make([]*TableData, 0),
|
||||||
|
|||||||
@@ -7,8 +7,7 @@ import (
|
|||||||
|
|
||||||
// schemaTemplate defines the template for generating Drizzle schemas
|
// schemaTemplate defines the template for generating Drizzle schemas
|
||||||
const schemaTemplate = `// Code generated by relspecgo. DO NOT EDIT.
|
const schemaTemplate = `// Code generated by relspecgo. DO NOT EDIT.
|
||||||
{{if .GeneratedBy}}// {{.GeneratedBy}}
|
{{range .Imports}}{{.}}
|
||||||
{{end}}{{range .Imports}}{{.}}
|
|
||||||
{{end}}
|
{{end}}
|
||||||
{{if .Enums}}
|
{{if .Enums}}
|
||||||
// Enums
|
// Enums
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import (
|
|||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/buildinfo"
|
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/models"
|
"git.warky.dev/wdevs/relspecgo/pkg/models"
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/writers"
|
"git.warky.dev/wdevs/relspecgo/pkg/writers"
|
||||||
)
|
)
|
||||||
@@ -12,7 +11,6 @@ import (
|
|||||||
// TemplateData represents the data passed to the template for code generation
|
// TemplateData represents the data passed to the template for code generation
|
||||||
type TemplateData struct {
|
type TemplateData struct {
|
||||||
PackageName string
|
PackageName string
|
||||||
GeneratedBy string
|
|
||||||
Imports []string
|
Imports []string
|
||||||
Models []*ModelData
|
Models []*ModelData
|
||||||
Config *MethodConfig
|
Config *MethodConfig
|
||||||
@@ -81,7 +79,6 @@ func NewTemplateData(packageName string, config *MethodConfig) *TemplateData {
|
|||||||
|
|
||||||
return &TemplateData{
|
return &TemplateData{
|
||||||
PackageName: packageName,
|
PackageName: packageName,
|
||||||
GeneratedBy: buildinfo.GeneratedComment(),
|
|
||||||
Imports: make([]string, 0),
|
Imports: make([]string, 0),
|
||||||
Models: make([]*ModelData, 0),
|
Models: make([]*ModelData, 0),
|
||||||
Config: config,
|
Config: config,
|
||||||
|
|||||||
@@ -7,8 +7,7 @@ import (
|
|||||||
|
|
||||||
// modelTemplate defines the template for generating GORM models
|
// modelTemplate defines the template for generating GORM models
|
||||||
const modelTemplate = `// Code generated by relspecgo. DO NOT EDIT.
|
const modelTemplate = `// Code generated by relspecgo. DO NOT EDIT.
|
||||||
{{if .GeneratedBy}}// {{.GeneratedBy}}
|
package {{.PackageName}}
|
||||||
{{end}}package {{.PackageName}}
|
|
||||||
|
|
||||||
{{if .Imports -}}
|
{{if .Imports -}}
|
||||||
import (
|
import (
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ import (
|
|||||||
|
|
||||||
_ "github.com/microsoft/go-mssqldb" // MSSQL driver
|
_ "github.com/microsoft/go-mssqldb" // MSSQL driver
|
||||||
|
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/buildinfo"
|
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/models"
|
"git.warky.dev/wdevs/relspecgo/pkg/models"
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/mssql"
|
"git.warky.dev/wdevs/relspecgo/pkg/mssql"
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/writers"
|
"git.warky.dev/wdevs/relspecgo/pkg/writers"
|
||||||
@@ -69,7 +68,7 @@ func (w *Writer) WriteDatabase(db *models.Database) error {
|
|||||||
// Write header comment
|
// Write header comment
|
||||||
fmt.Fprintf(w.writer, "-- MSSQL Database Schema\n")
|
fmt.Fprintf(w.writer, "-- MSSQL Database Schema\n")
|
||||||
fmt.Fprintf(w.writer, "-- Database: %s\n", db.Name)
|
fmt.Fprintf(w.writer, "-- Database: %s\n", db.Name)
|
||||||
fmt.Fprintf(w.writer, "-- Generated by %s\n\n", buildinfo.GeneratedComment())
|
fmt.Fprintf(w.writer, "-- Generated by RelSpec\n\n")
|
||||||
|
|
||||||
// Process each schema in the database
|
// Process each schema in the database
|
||||||
for _, schema := range db.Schemas {
|
for _, schema := range db.Schemas {
|
||||||
@@ -478,7 +477,7 @@ func (w *Writer) executeDatabaseSQL(db *models.Database, connString string) erro
|
|||||||
statements := []string{}
|
statements := []string{}
|
||||||
statements = append(statements, "-- MSSQL Database Schema")
|
statements = append(statements, "-- MSSQL Database Schema")
|
||||||
statements = append(statements, fmt.Sprintf("-- Database: %s", db.Name))
|
statements = append(statements, fmt.Sprintf("-- Database: %s", db.Name))
|
||||||
statements = append(statements, "-- Generated by "+buildinfo.GeneratedComment())
|
statements = append(statements, "-- Generated by RelSpec")
|
||||||
|
|
||||||
for _, schema := range db.Schemas {
|
for _, schema := range db.Schemas {
|
||||||
if err := w.generateSchemaStatements(schema, &statements); err != nil {
|
if err := w.generateSchemaStatements(schema, &statements); err != nil {
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import (
|
|||||||
"sort"
|
"sort"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/buildinfo"
|
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/models"
|
"git.warky.dev/wdevs/relspecgo/pkg/models"
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/pgsql"
|
"git.warky.dev/wdevs/relspecgo/pkg/pgsql"
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/writers"
|
"git.warky.dev/wdevs/relspecgo/pkg/writers"
|
||||||
@@ -144,7 +143,7 @@ func (w *MigrationWriter) WriteMigration(model, current *models.Database) error
|
|||||||
|
|
||||||
// Write header
|
// Write header
|
||||||
fmt.Fprintf(w.writer, "-- PostgreSQL Migration Script\n")
|
fmt.Fprintf(w.writer, "-- PostgreSQL Migration Script\n")
|
||||||
fmt.Fprintf(w.writer, "-- Generated by %s\n", buildinfo.GeneratedComment())
|
fmt.Fprintf(w.writer, "-- Generated by RelSpec\n")
|
||||||
fmt.Fprintf(w.writer, "-- Source: %s -> %s\n", current.Name, model.Name)
|
fmt.Fprintf(w.writer, "-- Source: %s -> %s\n", current.Name, model.Name)
|
||||||
if w.options.ContinueOnError {
|
if w.options.ContinueOnError {
|
||||||
fmt.Fprintf(w.writer, "\\set ON_ERROR_STOP off\n")
|
fmt.Fprintf(w.writer, "\\set ON_ERROR_STOP off\n")
|
||||||
|
|||||||
@@ -12,7 +12,6 @@ import (
|
|||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/buildinfo"
|
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/models"
|
"git.warky.dev/wdevs/relspecgo/pkg/models"
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/pgsql"
|
"git.warky.dev/wdevs/relspecgo/pkg/pgsql"
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/writers"
|
"git.warky.dev/wdevs/relspecgo/pkg/writers"
|
||||||
@@ -102,7 +101,7 @@ func (w *Writer) WriteDatabase(db *models.Database) error {
|
|||||||
// Write header comment
|
// Write header comment
|
||||||
fmt.Fprintf(w.writer, "-- PostgreSQL Database Schema\n")
|
fmt.Fprintf(w.writer, "-- PostgreSQL Database Schema\n")
|
||||||
fmt.Fprintf(w.writer, "-- Database: %s\n", db.Name)
|
fmt.Fprintf(w.writer, "-- Database: %s\n", db.Name)
|
||||||
fmt.Fprintf(w.writer, "-- Generated by %s\n", buildinfo.GeneratedComment())
|
fmt.Fprintf(w.writer, "-- Generated by RelSpec\n")
|
||||||
if w.options.ContinueOnError {
|
if w.options.ContinueOnError {
|
||||||
fmt.Fprintf(w.writer, "\\set ON_ERROR_STOP off\n")
|
fmt.Fprintf(w.writer, "\\set ON_ERROR_STOP off\n")
|
||||||
}
|
}
|
||||||
@@ -126,7 +125,7 @@ func (w *Writer) GenerateDatabaseStatements(db *models.Database) ([]string, erro
|
|||||||
// Add header comment
|
// Add header comment
|
||||||
statements = append(statements, "-- PostgreSQL Database Schema")
|
statements = append(statements, "-- PostgreSQL Database Schema")
|
||||||
statements = append(statements, fmt.Sprintf("-- Database: %s", db.Name))
|
statements = append(statements, fmt.Sprintf("-- Database: %s", db.Name))
|
||||||
statements = append(statements, "-- Generated by "+buildinfo.GeneratedComment())
|
statements = append(statements, "-- Generated by RelSpec")
|
||||||
|
|
||||||
// Process each schema in the database
|
// Process each schema in the database
|
||||||
for _, schema := range db.Schemas {
|
for _, schema := range db.Schemas {
|
||||||
@@ -570,7 +569,7 @@ func (w *Writer) GenerateAddColumnsForDatabase(db *models.Database) ([]string, e
|
|||||||
|
|
||||||
statements = append(statements, "-- Add missing columns to existing tables")
|
statements = append(statements, "-- Add missing columns to existing tables")
|
||||||
statements = append(statements, fmt.Sprintf("-- Database: %s", db.Name))
|
statements = append(statements, fmt.Sprintf("-- Database: %s", db.Name))
|
||||||
statements = append(statements, "-- Generated by "+buildinfo.GeneratedComment())
|
statements = append(statements, "-- Generated by RelSpec")
|
||||||
|
|
||||||
for _, schema := range db.Schemas {
|
for _, schema := range db.Schemas {
|
||||||
schemaStatements, err := w.GenerateAddColumnStatements(schema)
|
schemaStatements, err := w.GenerateAddColumnStatements(schema)
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ import (
|
|||||||
|
|
||||||
_ "modernc.org/sqlite" // SQLite driver
|
_ "modernc.org/sqlite" // SQLite driver
|
||||||
|
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/buildinfo"
|
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/models"
|
"git.warky.dev/wdevs/relspecgo/pkg/models"
|
||||||
"git.warky.dev/wdevs/relspecgo/pkg/writers"
|
"git.warky.dev/wdevs/relspecgo/pkg/writers"
|
||||||
)
|
)
|
||||||
@@ -73,7 +72,7 @@ func (w *Writer) writeContent(db *models.Database) error {
|
|||||||
// Write header comment
|
// Write header comment
|
||||||
fmt.Fprintf(w.writer, "-- SQLite Database Schema\n")
|
fmt.Fprintf(w.writer, "-- SQLite Database Schema\n")
|
||||||
fmt.Fprintf(w.writer, "-- Database: %s\n", db.Name)
|
fmt.Fprintf(w.writer, "-- Database: %s\n", db.Name)
|
||||||
fmt.Fprintf(w.writer, "-- Generated by %s\n", buildinfo.GeneratedComment())
|
fmt.Fprintf(w.writer, "-- Generated by RelSpec\n")
|
||||||
fmt.Fprintf(w.writer, "-- Note: SQLite has no schema concept; non-default schema names are flattened into table name prefixes (e.g., auth.sessions -> auth_sessions)\n\n")
|
fmt.Fprintf(w.writer, "-- Note: SQLite has no schema concept; non-default schema names are flattened into table name prefixes (e.g., auth.sessions -> auth_sessions)\n\n")
|
||||||
|
|
||||||
// Enable foreign keys
|
// Enable foreign keys
|
||||||
|
|||||||
Reference in New Issue
Block a user