Fix the imports I botched really badly

Apparently I don't understand how go modules work.
This commit is contained in:
Eli Ribble 2026-05-14 17:04:09 +00:00
parent 44d981fbfc
commit 41fe97d336
No known key found for this signature in database
169 changed files with 365 additions and 362 deletions

View file

@ -138,7 +138,7 @@ type {{$modelTableTemplate.TypeName}} struct {
var enumSQLBuilderTemplate = `package {{package}}
import "source.gleipnir.technology/Gleipnir/jet/{{dialect.PackageName}}"
import "source.gleipnir.technology/Gleipnir/jet/v2/{{dialect.PackageName}}"
{{golangComment .Comment}}
var {{enumTemplate.InstanceName}} = &struct {

View file

@ -1,8 +1,8 @@
package template
import (
"source.gleipnir.technology/Gleipnir/jet/generator/metadata"
"source.gleipnir.technology/Gleipnir/jet/internal/jet"
"source.gleipnir.technology/Gleipnir/jet/v2/generator/metadata"
"source.gleipnir.technology/Gleipnir/jet/v2/internal/jet"
)
// Template is generator template used for file generation

View file

@ -11,8 +11,8 @@ import (
"github.com/google/uuid"
"github.com/jackc/pgtype"
"source.gleipnir.technology/Gleipnir/jet/generator/metadata"
"source.gleipnir.technology/Gleipnir/jet/internal/utils/dbidentifier"
"source.gleipnir.technology/Gleipnir/jet/v2/generator/metadata"
"source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/dbidentifier"
)
// Model is template for model files generation

View file

@ -1,7 +1,7 @@
package template
import (
"source.gleipnir.technology/Gleipnir/jet/generator/metadata"
"source.gleipnir.technology/Gleipnir/jet/v2/generator/metadata"
"github.com/stretchr/testify/require"
"testing"
)

View file

@ -10,10 +10,10 @@ import (
"strings"
"text/template"
"source.gleipnir.technology/Gleipnir/jet/internal/utils/filesys"
"source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/filesys"
"source.gleipnir.technology/Gleipnir/jet/generator/metadata"
"source.gleipnir.technology/Gleipnir/jet/internal/jet"
"source.gleipnir.technology/Gleipnir/jet/v2/generator/metadata"
"source.gleipnir.technology/Gleipnir/jet/v2/internal/jet"
)
type Dialect = jet.Dialect

View file

@ -7,9 +7,9 @@ import (
"strings"
"unicode"
"source.gleipnir.technology/Gleipnir/jet/generator/metadata"
"source.gleipnir.technology/Gleipnir/jet/internal/jet"
"source.gleipnir.technology/Gleipnir/jet/internal/utils/dbidentifier"
"source.gleipnir.technology/Gleipnir/jet/v2/generator/metadata"
"source.gleipnir.technology/Gleipnir/jet/v2/internal/jet"
"source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/dbidentifier"
)
// SQLBuilder is template for generating sql builder files
@ -162,7 +162,7 @@ func renameIfReserved(name string) string {
func DefaultTableSQLBuilderColumn(dialect jet.Dialect, columnMetaData metadata.Column) TableSQLBuilderColumn {
package_name := dialect.PackageName()
return TableSQLBuilderColumn{
Import: "source.gleipnir.technology/Gleipnir/jet/" + package_name,
Import: "source.gleipnir.technology/Gleipnir/jet/v2/" + package_name,
Name: renameIfReserved(dbidentifier.ToGoIdentifier(columnMetaData.Name)),
PackageName: package_name,
Type: "Column" + getSqlBuilderColumnType(columnMetaData),

View file

@ -1,7 +1,8 @@
package template
import (
"source.gleipnir.technology/Gleipnir/jet/generator/metadata"
"source.gleipnir.technology/Gleipnir/jet/v2/internal/jet"
"source.gleipnir.technology/Gleipnir/jet/v2/generator/metadata"
"github.com/stretchr/testify/require"
"testing"
)
@ -26,9 +27,11 @@ func TestColumnRenameReserved(t *testing.T) {
{col: "OtherColumn", want: "OtherColumn"},
}
for _, tt := range tests {
t.Run(tt.col, func(t *testing.T) {
builder := DefaultTableSQLBuilderColumn(metadata.Column{
dialect := jet.NewDialect(jet.DialectParams{})
builder := DefaultTableSQLBuilderColumn(dialect, metadata.Column{
Name: tt.col,
})
require.Equal(t, builder.Name, tt.want)