diff --git a/cmd/jet/main.go b/cmd/jet/main.go index f8b36aa..5771674 100644 --- a/cmd/jet/main.go +++ b/cmd/jet/main.go @@ -13,18 +13,18 @@ import ( _ "github.com/lib/pq" _ "github.com/mattn/go-sqlite3" - "source.gleipnir.technology/Gleipnir/jet/generator/metadata" - mysqlgen "source.gleipnir.technology/Gleipnir/jet/generator/mysql" - postgresgen "source.gleipnir.technology/Gleipnir/jet/generator/postgres" - sqlitegen "source.gleipnir.technology/Gleipnir/jet/generator/sqlite" - "source.gleipnir.technology/Gleipnir/jet/generator/template" - "source.gleipnir.technology/Gleipnir/jet/internal/3rdparty/snaker" - "source.gleipnir.technology/Gleipnir/jet/internal/jet" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/errfmt" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/strslice" - "source.gleipnir.technology/Gleipnir/jet/mysql" - postgres2 "source.gleipnir.technology/Gleipnir/jet/postgres" - "source.gleipnir.technology/Gleipnir/jet/sqlite" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/metadata" + mysqlgen "source.gleipnir.technology/Gleipnir/jet/v2/generator/mysql" + postgresgen "source.gleipnir.technology/Gleipnir/jet/v2/generator/postgres" + sqlitegen "source.gleipnir.technology/Gleipnir/jet/v2/generator/sqlite" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/template" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/3rdparty/snaker" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/errfmt" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/strslice" + "source.gleipnir.technology/Gleipnir/jet/v2/mysql" + postgres2 "source.gleipnir.technology/Gleipnir/jet/v2/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/sqlite" ) var ( diff --git a/doc.go b/doc.go index f2824c9..3262daa 100644 --- a/doc.go +++ b/doc.go @@ -38,7 +38,7 @@ Before we can write SQL queries in Go, we need to import generated SQL builder a To write postgres SQL queries we import: - . "source.gleipnir.technology/Gleipnir/jet/postgres" // Dot import is used so that Go code resemble as much as native SQL. It is not mandatory. + . "source.gleipnir.technology/Gleipnir/jet/v2/postgres" // Dot import is used so that Go code resemble as much as native SQL. It is not mandatory. Then we can write the SQL query: diff --git a/examples/quick-start/.gen/jetdb/dvds/enum/mpaa_rating.go b/examples/quick-start/.gen/jetdb/dvds/enum/mpaa_rating.go index e11a3fc..765337b 100644 --- a/examples/quick-start/.gen/jetdb/dvds/enum/mpaa_rating.go +++ b/examples/quick-start/.gen/jetdb/dvds/enum/mpaa_rating.go @@ -7,7 +7,7 @@ package enum -import "source.gleipnir.technology/Gleipnir/jet/postgres" +import "source.gleipnir.technology/Gleipnir/jet/v2/postgres" var MpaaRating = &struct { G postgres.StringExpression diff --git a/examples/quick-start/.gen/jetdb/dvds/table/actor.go b/examples/quick-start/.gen/jetdb/dvds/table/actor.go index 6eec9a3..84377e9 100644 --- a/examples/quick-start/.gen/jetdb/dvds/table/actor.go +++ b/examples/quick-start/.gen/jetdb/dvds/table/actor.go @@ -8,7 +8,7 @@ package table import ( - "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/postgres" ) var Actor = newActorTable("dvds", "actor", "") diff --git a/examples/quick-start/.gen/jetdb/dvds/table/category.go b/examples/quick-start/.gen/jetdb/dvds/table/category.go index 48c55bd..2bf38b4 100644 --- a/examples/quick-start/.gen/jetdb/dvds/table/category.go +++ b/examples/quick-start/.gen/jetdb/dvds/table/category.go @@ -8,7 +8,7 @@ package table import ( - "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/postgres" ) var Category = newCategoryTable("dvds", "category", "") diff --git a/examples/quick-start/.gen/jetdb/dvds/table/film.go b/examples/quick-start/.gen/jetdb/dvds/table/film.go index f80ddd0..a0a7dc5 100644 --- a/examples/quick-start/.gen/jetdb/dvds/table/film.go +++ b/examples/quick-start/.gen/jetdb/dvds/table/film.go @@ -8,7 +8,7 @@ package table import ( - "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/postgres" ) var Film = newFilmTable("dvds", "film", "") diff --git a/examples/quick-start/.gen/jetdb/dvds/table/film_actor.go b/examples/quick-start/.gen/jetdb/dvds/table/film_actor.go index c469077..5e5e5c5 100644 --- a/examples/quick-start/.gen/jetdb/dvds/table/film_actor.go +++ b/examples/quick-start/.gen/jetdb/dvds/table/film_actor.go @@ -8,7 +8,7 @@ package table import ( - "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/postgres" ) var FilmActor = newFilmActorTable("dvds", "film_actor", "") diff --git a/examples/quick-start/.gen/jetdb/dvds/table/film_category.go b/examples/quick-start/.gen/jetdb/dvds/table/film_category.go index 9053b32..e4b261c 100644 --- a/examples/quick-start/.gen/jetdb/dvds/table/film_category.go +++ b/examples/quick-start/.gen/jetdb/dvds/table/film_category.go @@ -8,7 +8,7 @@ package table import ( - "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/postgres" ) var FilmCategory = newFilmCategoryTable("dvds", "film_category", "") diff --git a/examples/quick-start/.gen/jetdb/dvds/table/language.go b/examples/quick-start/.gen/jetdb/dvds/table/language.go index be2e729..eaaed84 100644 --- a/examples/quick-start/.gen/jetdb/dvds/table/language.go +++ b/examples/quick-start/.gen/jetdb/dvds/table/language.go @@ -8,7 +8,7 @@ package table import ( - "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/postgres" ) var Language = newLanguageTable("dvds", "language", "") diff --git a/examples/quick-start/.gen/jetdb/dvds/view/actor_info.go b/examples/quick-start/.gen/jetdb/dvds/view/actor_info.go index c346317..0a1907a 100644 --- a/examples/quick-start/.gen/jetdb/dvds/view/actor_info.go +++ b/examples/quick-start/.gen/jetdb/dvds/view/actor_info.go @@ -8,7 +8,7 @@ package view import ( - "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/postgres" ) var ActorInfo = newActorInfoTable("dvds", "actor_info", "") diff --git a/examples/quick-start/.gen/jetdb/dvds/view/customer_list.go b/examples/quick-start/.gen/jetdb/dvds/view/customer_list.go index ea4eba9..bdd2d06 100644 --- a/examples/quick-start/.gen/jetdb/dvds/view/customer_list.go +++ b/examples/quick-start/.gen/jetdb/dvds/view/customer_list.go @@ -8,7 +8,7 @@ package view import ( - "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/postgres" ) var CustomerList = newCustomerListTable("dvds", "customer_list", "") diff --git a/examples/quick-start/quick-start.go b/examples/quick-start/quick-start.go index 325a93f..ed64baa 100644 --- a/examples/quick-start/quick-start.go +++ b/examples/quick-start/quick-start.go @@ -11,7 +11,7 @@ import ( // dot import so that jet go code would resemble as much as native SQL // dot import is not mandatory . "source.gleipnir.technology/Gleipnir/jet/examples/quick-start/.gen/jetdb/dvds/table" - . "source.gleipnir.technology/Gleipnir/jet/postgres" + . "source.gleipnir.technology/Gleipnir/jet/v2/postgres" "source.gleipnir.technology/Gleipnir/jet/examples/quick-start/.gen/jetdb/dvds/enum" "source.gleipnir.technology/Gleipnir/jet/examples/quick-start/.gen/jetdb/dvds/model" diff --git a/generator/mysql/mysql_generator.go b/generator/mysql/mysql_generator.go index 1a64589..86a94fa 100644 --- a/generator/mysql/mysql_generator.go +++ b/generator/mysql/mysql_generator.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "source.gleipnir.technology/Gleipnir/jet/generator/metadata" - "source.gleipnir.technology/Gleipnir/jet/generator/template" - "source.gleipnir.technology/Gleipnir/jet/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/metadata" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/template" + "source.gleipnir.technology/Gleipnir/jet/v2/mysql" mysqldr "github.com/go-sql-driver/mysql" ) diff --git a/generator/mysql/query_set.go b/generator/mysql/query_set.go index 0784ab6..cc77901 100644 --- a/generator/mysql/query_set.go +++ b/generator/mysql/query_set.go @@ -6,8 +6,8 @@ import ( "fmt" "strings" - "source.gleipnir.technology/Gleipnir/jet/generator/metadata" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/metadata" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" ) // mySqlQuerySet is dialect query set for MySQL diff --git a/generator/postgres/postgres_generator.go b/generator/postgres/postgres_generator.go index b4dcddb..03c9428 100644 --- a/generator/postgres/postgres_generator.go +++ b/generator/postgres/postgres_generator.go @@ -7,9 +7,9 @@ import ( "path/filepath" "strconv" - "source.gleipnir.technology/Gleipnir/jet/generator/metadata" - "source.gleipnir.technology/Gleipnir/jet/generator/template" - "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/metadata" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/template" + "source.gleipnir.technology/Gleipnir/jet/v2/postgres" ) // DBConnection contains postgres connection details diff --git a/generator/postgres/query_set.go b/generator/postgres/query_set.go index fda055a..a6896aa 100644 --- a/generator/postgres/query_set.go +++ b/generator/postgres/query_set.go @@ -5,8 +5,8 @@ import ( "database/sql" "fmt" - "source.gleipnir.technology/Gleipnir/jet/generator/metadata" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/metadata" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" ) // postgresQuerySet is dialect query set for PostgreSQL diff --git a/generator/sqlite/query_set.go b/generator/sqlite/query_set.go index 68a6a70..a93128f 100644 --- a/generator/sqlite/query_set.go +++ b/generator/sqlite/query_set.go @@ -6,9 +6,9 @@ import ( "fmt" "strings" - "source.gleipnir.technology/Gleipnir/jet/generator/metadata" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/semantic" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/metadata" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/semantic" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" ) // sqliteQuerySet is dialect query set for SQLite diff --git a/generator/sqlite/sqlite_generator.go b/generator/sqlite/sqlite_generator.go index 754a698..db990ac 100644 --- a/generator/sqlite/sqlite_generator.go +++ b/generator/sqlite/sqlite_generator.go @@ -4,9 +4,9 @@ import ( "database/sql" "fmt" - "source.gleipnir.technology/Gleipnir/jet/generator/metadata" - "source.gleipnir.technology/Gleipnir/jet/generator/template" - "source.gleipnir.technology/Gleipnir/jet/sqlite" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/metadata" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/template" + "source.gleipnir.technology/Gleipnir/jet/v2/sqlite" ) // GenerateDSN generates jet files using dsn connection string diff --git a/generator/template/file_templates.go b/generator/template/file_templates.go index 878fa06..8427b13 100644 --- a/generator/template/file_templates.go +++ b/generator/template/file_templates.go @@ -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 { diff --git a/generator/template/generator_template.go b/generator/template/generator_template.go index 76516bf..605caf2 100644 --- a/generator/template/generator_template.go +++ b/generator/template/generator_template.go @@ -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 diff --git a/generator/template/model_template.go b/generator/template/model_template.go index 936d679..f078ad5 100644 --- a/generator/template/model_template.go +++ b/generator/template/model_template.go @@ -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 diff --git a/generator/template/model_template_test.go b/generator/template/model_template_test.go index 38c5a59..8795873 100644 --- a/generator/template/model_template_test.go +++ b/generator/template/model_template_test.go @@ -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" ) diff --git a/generator/template/process.go b/generator/template/process.go index e5bcea6..e0642d4 100644 --- a/generator/template/process.go +++ b/generator/template/process.go @@ -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 diff --git a/generator/template/sql_builder_template.go b/generator/template/sql_builder_template.go index 8749aef..07fceb4 100644 --- a/generator/template/sql_builder_template.go +++ b/generator/template/sql_builder_template.go @@ -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), diff --git a/generator/template/sql_builder_template_test.go b/generator/template/sql_builder_template_test.go index 5b3d489..3e552a0 100644 --- a/generator/template/sql_builder_template_test.go +++ b/generator/template/sql_builder_template_test.go @@ -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) diff --git a/go.mod b/go.mod index a57e994..6bcdd77 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module source.gleipnir.technology/Gleipnir/jet +module source.gleipnir.technology/Gleipnir/jet/v2 go 1.24.0 diff --git a/internal/jet/clause.go b/internal/jet/clause.go index 6c17543..2aeaa72 100644 --- a/internal/jet/clause.go +++ b/internal/jet/clause.go @@ -1,6 +1,6 @@ package jet -import "source.gleipnir.technology/Gleipnir/jet/internal/utils/is" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/is" // Clause interface type Clause interface { diff --git a/internal/jet/column_expression_geometry_impl.go b/internal/jet/column_expression_geometry_impl.go index a531833..e4c2cfa 100644 --- a/internal/jet/column_expression_geometry_impl.go +++ b/internal/jet/column_expression_geometry_impl.go @@ -1,7 +1,7 @@ package jet import ( - "source.gleipnir.technology/Gleipnir/jet/internal/3rdparty/snaker" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/3rdparty/snaker" ) diff --git a/internal/jet/column_expression_impl.go b/internal/jet/column_expression_impl.go index 87643f1..d876a56 100644 --- a/internal/jet/column_expression_impl.go +++ b/internal/jet/column_expression_impl.go @@ -3,7 +3,7 @@ package jet import ( - "source.gleipnir.technology/Gleipnir/jet/internal/3rdparty/snaker" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/3rdparty/snaker" ) diff --git a/internal/jet/logger.go b/internal/jet/logger.go index 8d82841..e491374 100644 --- a/internal/jet/logger.go +++ b/internal/jet/logger.go @@ -71,7 +71,7 @@ func (q QueryInfo) Caller() (file string, line int, function string) { } funcDetails := runtime.FuncForPC(pc) - if !strings.Contains(funcDetails.Name(), "source.gleipnir.technology/Gleipnir/jet/internal") { + if !strings.Contains(funcDetails.Name(), "source.gleipnir.technology/Gleipnir/jet/v2/internal") { function = funcDetails.Name() return } diff --git a/internal/jet/sql_builder.go b/internal/jet/sql_builder.go index ff3a88f..1836898 100644 --- a/internal/jet/sql_builder.go +++ b/internal/jet/sql_builder.go @@ -4,8 +4,8 @@ import ( "bytes" "database/sql/driver" "fmt" - "source.gleipnir.technology/Gleipnir/jet/internal/3rdparty/pq" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/is" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/3rdparty/pq" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/is" "github.com/google/uuid" "reflect" "sort" diff --git a/internal/jet/statement.go b/internal/jet/statement.go index 91af610..d19cf1d 100644 --- a/internal/jet/statement.go +++ b/internal/jet/statement.go @@ -3,7 +3,7 @@ package jet import ( "context" "database/sql" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" "time" ) diff --git a/internal/jet/table.go b/internal/jet/table.go index 15fa7b8..5ffa5da 100644 --- a/internal/jet/table.go +++ b/internal/jet/table.go @@ -1,6 +1,6 @@ package jet -import "source.gleipnir.technology/Gleipnir/jet/internal/utils/is" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/is" // SerializerTable interface type SerializerTable interface { diff --git a/internal/jet/utils.go b/internal/jet/utils.go index 43e05cb..781dff6 100644 --- a/internal/jet/utils.go +++ b/internal/jet/utils.go @@ -4,8 +4,8 @@ import ( "reflect" "strings" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/dbidentifier" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/must" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/dbidentifier" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/must" ) // SerializeClauseList func diff --git a/internal/testutils/test_utils.go b/internal/testutils/test_utils.go index 8a5a049..a971b83 100644 --- a/internal/testutils/test_utils.go +++ b/internal/testutils/test_utils.go @@ -5,10 +5,10 @@ import ( "context" "encoding/json" "fmt" - "source.gleipnir.technology/Gleipnir/jet/internal/jet" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/throw" - "source.gleipnir.technology/Gleipnir/jet/qrm" - "source.gleipnir.technology/Gleipnir/jet/stmtcache" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/throw" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/stmtcache" "github.com/google/go-cmp/cmp" "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/internal/testutils/time_utils.go b/internal/testutils/time_utils.go index e96a3ae..a77c092 100644 --- a/internal/testutils/time_utils.go +++ b/internal/testutils/time_utils.go @@ -1,7 +1,7 @@ package testutils import ( - "source.gleipnir.technology/Gleipnir/jet/internal/utils/throw" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/throw" "strings" "time" ) diff --git a/internal/utils/datetime/duration.go b/internal/utils/datetime/duration.go index 76436d6..3af8a10 100644 --- a/internal/utils/datetime/duration.go +++ b/internal/utils/datetime/duration.go @@ -1,7 +1,7 @@ package datetime import ( - //"source.gleipnir.technology/Gleipnir/jet/internal/utils/min" + //"source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/min" "time" ) diff --git a/internal/utils/dbidentifier/dbidentifier.go b/internal/utils/dbidentifier/dbidentifier.go index f10d13a..b96f0eb 100644 --- a/internal/utils/dbidentifier/dbidentifier.go +++ b/internal/utils/dbidentifier/dbidentifier.go @@ -1,7 +1,7 @@ package dbidentifier import ( - "source.gleipnir.technology/Gleipnir/jet/internal/3rdparty/snaker" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/3rdparty/snaker" "strings" "unicode" ) diff --git a/internal/utils/errfmt/errfmt.go b/internal/utils/errfmt/errfmt.go index 52ee954..8f44b39 100644 --- a/internal/utils/errfmt/errfmt.go +++ b/internal/utils/errfmt/errfmt.go @@ -1,7 +1,7 @@ package errfmt import ( - "source.gleipnir.technology/Gleipnir/jet/internal/utils/is" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/is" "strings" ) diff --git a/internal/utils/must/must.go b/internal/utils/must/must.go index 6a623ca..1e6e1e5 100644 --- a/internal/utils/must/must.go +++ b/internal/utils/must/must.go @@ -1,7 +1,7 @@ package must import ( - "source.gleipnir.technology/Gleipnir/jet/internal/utils/is" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/is" "reflect" ) diff --git a/mysql/cast.go b/mysql/cast.go index ae1a279..75e23e4 100644 --- a/mysql/cast.go +++ b/mysql/cast.go @@ -3,7 +3,7 @@ package mysql import ( "strconv" - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" ) // CAST function converts an expr (of any type) into later specified datatype. diff --git a/mysql/columns.go b/mysql/columns.go index c72fc35..d618ec5 100644 --- a/mysql/columns.go +++ b/mysql/columns.go @@ -1,6 +1,6 @@ package mysql -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // Column is common column interface for all types of columns. type Column = jet.ColumnExpression diff --git a/mysql/delete_statement.go b/mysql/delete_statement.go index cd7446a..8fbbc67 100644 --- a/mysql/delete_statement.go +++ b/mysql/delete_statement.go @@ -1,6 +1,6 @@ package mysql -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // DeleteStatement is interface for MySQL DELETE statement type DeleteStatement interface { diff --git a/mysql/dialect.go b/mysql/dialect.go index 5d6cd10..923ef46 100644 --- a/mysql/dialect.go +++ b/mysql/dialect.go @@ -4,7 +4,7 @@ import ( "encoding/hex" "fmt" - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" ) // Dialect is implementation of MySQL dialect for SQL Builder serialization. diff --git a/mysql/expressions.go b/mysql/expressions.go index 472162f..bd8e23c 100644 --- a/mysql/expressions.go +++ b/mysql/expressions.go @@ -1,6 +1,6 @@ package mysql -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // Expression is common interface for all expressions. // Can be Bool, Int, Float, String, Date, Time or Timestamp expressions. diff --git a/mysql/functions.go b/mysql/functions.go index 109cb75..197f26b 100644 --- a/mysql/functions.go +++ b/mysql/functions.go @@ -1,6 +1,6 @@ package mysql -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // This functions can be used, instead of its method counterparts, to have a better indentation of a complex condition // in the Go code and in the generated SQL. diff --git a/mysql/insert_statement.go b/mysql/insert_statement.go index cc4c9b1..054ce35 100644 --- a/mysql/insert_statement.go +++ b/mysql/insert_statement.go @@ -1,6 +1,6 @@ package mysql -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // InsertStatement is interface for SQL INSERT statements type InsertStatement interface { diff --git a/mysql/interval_literal.go b/mysql/interval_literal.go index cc146bd..d324d9d 100644 --- a/mysql/interval_literal.go +++ b/mysql/interval_literal.go @@ -5,9 +5,9 @@ import ( "regexp" "time" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/datetime" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/datetime" - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" ) type unitType string diff --git a/mysql/lateral.go b/mysql/lateral.go index 8c48800..a5d0549 100644 --- a/mysql/lateral.go +++ b/mysql/lateral.go @@ -1,6 +1,6 @@ package mysql -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // LATERAL derived tables constructor from select statement func LATERAL(selectStmt SelectStatement) lateralImpl { diff --git a/mysql/literal.go b/mysql/literal.go index 0610195..956da99 100644 --- a/mysql/literal.go +++ b/mysql/literal.go @@ -3,7 +3,7 @@ package mysql import ( "time" - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" ) // Keywords diff --git a/mysql/lock_statement.go b/mysql/lock_statement.go index 3c9ae1c..2bfab84 100644 --- a/mysql/lock_statement.go +++ b/mysql/lock_statement.go @@ -1,6 +1,6 @@ package mysql -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // LockStatement is interface for MySQL LOCK tables type LockStatement interface { diff --git a/mysql/operators.go b/mysql/operators.go index e309141..507e517 100644 --- a/mysql/operators.go +++ b/mysql/operators.go @@ -1,6 +1,6 @@ package mysql -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // NOT returns negation of bool expression result var NOT = jet.NOT diff --git a/mysql/optimizer_hints.go b/mysql/optimizer_hints.go index 8bae2b6..ee193b1 100644 --- a/mysql/optimizer_hints.go +++ b/mysql/optimizer_hints.go @@ -2,7 +2,7 @@ package mysql import ( "fmt" - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" ) // OptimizerHint provides a way to optimize query execution per-statement basis diff --git a/mysql/select_json.go b/mysql/select_json.go index 43902a4..eb1baad 100644 --- a/mysql/select_json.go +++ b/mysql/select_json.go @@ -1,7 +1,7 @@ package mysql import ( - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" ) // SelectJsonStatement is an interface for MySQL statements that generate JSON on the server. diff --git a/mysql/select_statement.go b/mysql/select_statement.go index 064aece..1934be1 100644 --- a/mysql/select_statement.go +++ b/mysql/select_statement.go @@ -1,7 +1,7 @@ package mysql import ( - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" ) // RowLock is interface for SELECT statement row lock types diff --git a/mysql/select_statement_test.go b/mysql/select_statement_test.go index 3de0933..e24ad2b 100644 --- a/mysql/select_statement_test.go +++ b/mysql/select_statement_test.go @@ -1,7 +1,7 @@ package mysql import ( - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" "testing" ) diff --git a/mysql/select_table.go b/mysql/select_table.go index 5972f92..2333408 100644 --- a/mysql/select_table.go +++ b/mysql/select_table.go @@ -1,6 +1,6 @@ package mysql -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // SelectTable is interface for MySQL sub-queries type SelectTable interface { diff --git a/mysql/set_statement.go b/mysql/set_statement.go index bd0d503..12e8bba 100644 --- a/mysql/set_statement.go +++ b/mysql/set_statement.go @@ -1,6 +1,6 @@ package mysql -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // UNION effectively appends the result of sub-queries(select statements) into single query. // It eliminates duplicate rows from its result. diff --git a/mysql/statement.go b/mysql/statement.go index 8b41b23..3b61287 100644 --- a/mysql/statement.go +++ b/mysql/statement.go @@ -1,7 +1,7 @@ package mysql import ( - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" ) // RawStatement creates new sql statements from raw query and optional map of named arguments diff --git a/mysql/table.go b/mysql/table.go index 6f0b324..041a079 100644 --- a/mysql/table.go +++ b/mysql/table.go @@ -1,6 +1,6 @@ package mysql -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // Table is interface for MySQL tables type Table interface { diff --git a/mysql/types.go b/mysql/types.go index 73f757f..ee2f4e3 100644 --- a/mysql/types.go +++ b/mysql/types.go @@ -1,6 +1,6 @@ package mysql -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // Statement is common interface for all statements(SELECT, INSERT, UPDATE, DELETE, LOCK) type Statement = jet.Statement diff --git a/mysql/update_statement.go b/mysql/update_statement.go index 0e7d40f..6fc1348 100644 --- a/mysql/update_statement.go +++ b/mysql/update_statement.go @@ -1,6 +1,6 @@ package mysql -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // UpdateStatement is interface of SQL UPDATE statement type UpdateStatement interface { diff --git a/mysql/utils_test.go b/mysql/utils_test.go index b43bf8d..8d944c1 100644 --- a/mysql/utils_test.go +++ b/mysql/utils_test.go @@ -1,8 +1,8 @@ package mysql import ( - "source.gleipnir.technology/Gleipnir/jet/internal/jet" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" "testing" ) diff --git a/mysql/values.go b/mysql/values.go index 3ddfaa5..8d50440 100644 --- a/mysql/values.go +++ b/mysql/values.go @@ -1,6 +1,6 @@ package mysql -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" type values struct { jet.Values diff --git a/mysql/with_statement.go b/mysql/with_statement.go index e8292c8..01932bc 100644 --- a/mysql/with_statement.go +++ b/mysql/with_statement.go @@ -1,6 +1,6 @@ package mysql -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // CommonTableExpression defines set of interface methods for postgres CTEs type CommonTableExpression interface { diff --git a/postgres/array_columns.go b/postgres/array_columns.go index dd46344..c426f8c 100755 --- a/postgres/array_columns.go +++ b/postgres/array_columns.go @@ -1,6 +1,6 @@ package postgres -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // Interfaces for different postgres array column types type ( diff --git a/postgres/cast.go b/postgres/cast.go index 41a9a0e..2340393 100644 --- a/postgres/cast.go +++ b/postgres/cast.go @@ -4,7 +4,7 @@ import ( "fmt" "strconv" - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" ) // CAST function converts an expr (of any type) into later specified datatype. diff --git a/postgres/clause.go b/postgres/clause.go index 5ebe2aa..e6c8ca8 100644 --- a/postgres/clause.go +++ b/postgres/clause.go @@ -1,8 +1,8 @@ package postgres import ( - "source.gleipnir.technology/Gleipnir/jet/internal/jet" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/is" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/is" ) type onConflict interface { diff --git a/postgres/columns.go b/postgres/columns.go index 98207d5..cf3f504 100644 --- a/postgres/columns.go +++ b/postgres/columns.go @@ -1,7 +1,7 @@ package postgres import ( - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" ) // Column is common column interface for all types of columns. diff --git a/postgres/conflict_action.go b/postgres/conflict_action.go index f70c6b2..8532816 100644 --- a/postgres/conflict_action.go +++ b/postgres/conflict_action.go @@ -1,6 +1,6 @@ package postgres -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" type conflictAction interface { jet.Serializer diff --git a/postgres/delete_statement.go b/postgres/delete_statement.go index 3b84fc4..f8cfd32 100644 --- a/postgres/delete_statement.go +++ b/postgres/delete_statement.go @@ -1,6 +1,6 @@ package postgres -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // DeleteStatement is interface for PostgreSQL DELETE statement type DeleteStatement interface { diff --git a/postgres/dialect.go b/postgres/dialect.go index 34fe457..e69359b 100644 --- a/postgres/dialect.go +++ b/postgres/dialect.go @@ -5,7 +5,7 @@ import ( "fmt" "strconv" - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" ) // Dialect is implementation of postgres dialect for SQL Builder serialisation. diff --git a/postgres/expressions.go b/postgres/expressions.go index c7e035d..d05b9fb 100644 --- a/postgres/expressions.go +++ b/postgres/expressions.go @@ -1,6 +1,6 @@ package postgres -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // Expression is a common interface for all expressions. // Can be Bool, Int, Float, String, Date, Time, Timez, Timestamp or Timestampz expressions. diff --git a/postgres/functions.go b/postgres/functions.go index 1bd012a..9cb4773 100644 --- a/postgres/functions.go +++ b/postgres/functions.go @@ -1,7 +1,7 @@ package postgres import ( - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" ) // This functions can be used, instead of its method counterparts, to have a better indentation of a complex condition diff --git a/postgres/insert_statement.go b/postgres/insert_statement.go index a0b734a..0565fc1 100644 --- a/postgres/insert_statement.go +++ b/postgres/insert_statement.go @@ -1,6 +1,6 @@ package postgres -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // InsertStatement is interface for SQL INSERT statements type InsertStatement interface { diff --git a/postgres/interval_literal.go b/postgres/interval_literal.go index 46e3b1a..4fbce8c 100644 --- a/postgres/interval_literal.go +++ b/postgres/interval_literal.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "source.gleipnir.technology/Gleipnir/jet/internal/jet" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/datetime" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/datetime" ) type quantityAndUnit = float64 diff --git a/postgres/keywords.go b/postgres/keywords.go index f96945e..d9822e3 100644 --- a/postgres/keywords.go +++ b/postgres/keywords.go @@ -1,6 +1,6 @@ package postgres -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" const ( // DEFAULT is jet equivalent of SQL DEFAULT diff --git a/postgres/lateral.go b/postgres/lateral.go index 287a629..8f7fb56 100644 --- a/postgres/lateral.go +++ b/postgres/lateral.go @@ -1,6 +1,6 @@ package postgres -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // LATERAL derived tables constructor from select statement func LATERAL(selectStmt SelectStatement) lateralImpl { diff --git a/postgres/literal.go b/postgres/literal.go index b7525a8..ca42709 100644 --- a/postgres/literal.go +++ b/postgres/literal.go @@ -6,7 +6,7 @@ import ( "github.com/lib/pq" - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" ) // Bool is boolean literal constructor diff --git a/postgres/lock_statement.go b/postgres/lock_statement.go index 59034f7..a86f267 100644 --- a/postgres/lock_statement.go +++ b/postgres/lock_statement.go @@ -1,6 +1,6 @@ package postgres -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // TableLockMode is a type of possible SQL table lock type TableLockMode string diff --git a/postgres/operators.go b/postgres/operators.go index b12b800..20def39 100644 --- a/postgres/operators.go +++ b/postgres/operators.go @@ -1,6 +1,6 @@ package postgres -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // NOT returns negation of bool expression result var NOT = jet.NOT diff --git a/postgres/select_json.go b/postgres/select_json.go index 77221af..f83291a 100644 --- a/postgres/select_json.go +++ b/postgres/select_json.go @@ -1,7 +1,7 @@ package postgres import ( - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" "strings" ) diff --git a/postgres/select_statement.go b/postgres/select_statement.go index 4f53854..92d25f5 100644 --- a/postgres/select_statement.go +++ b/postgres/select_statement.go @@ -3,7 +3,7 @@ package postgres import ( "math" - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" ) // RowLock is interface for SELECT statement row lock types diff --git a/postgres/select_table.go b/postgres/select_table.go index 6a8ba94..a85d4e6 100644 --- a/postgres/select_table.go +++ b/postgres/select_table.go @@ -1,6 +1,6 @@ package postgres -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // SelectTable is interface for postgres temporary tables like sub-queries, VALUES, CTEs etc... type SelectTable interface { diff --git a/postgres/set_statement.go b/postgres/set_statement.go index b4b72be..d01b6b8 100644 --- a/postgres/set_statement.go +++ b/postgres/set_statement.go @@ -1,6 +1,6 @@ package postgres -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // UNION effectively appends the result of sub-queries(select statements) into single query. // It eliminates duplicate rows from its result. diff --git a/postgres/statement.go b/postgres/statement.go index dc37697..1796786 100644 --- a/postgres/statement.go +++ b/postgres/statement.go @@ -1,7 +1,7 @@ package postgres import ( - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" ) // RawStatement creates new sql statements from raw query and optional map of named arguments diff --git a/postgres/table.go b/postgres/table.go index 825fe05..9f40c80 100644 --- a/postgres/table.go +++ b/postgres/table.go @@ -1,6 +1,6 @@ package postgres -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // Table is interface for MySQL tables type Table interface { diff --git a/postgres/types.go b/postgres/types.go index 3174838..a98b0b8 100644 --- a/postgres/types.go +++ b/postgres/types.go @@ -1,6 +1,6 @@ package postgres -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // Statement is common interface for all statements(SELECT, INSERT, UPDATE, DELETE, LOCK) type Statement = jet.Statement diff --git a/postgres/update_statement.go b/postgres/update_statement.go index e6d3efb..3b74775 100644 --- a/postgres/update_statement.go +++ b/postgres/update_statement.go @@ -1,7 +1,7 @@ package postgres import ( - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" ) // UpdateStatement is interface of SQL UPDATE statement diff --git a/postgres/utils_test.go b/postgres/utils_test.go index 9678f6a..9137d20 100644 --- a/postgres/utils_test.go +++ b/postgres/utils_test.go @@ -3,8 +3,8 @@ package postgres import ( "testing" - "source.gleipnir.technology/Gleipnir/jet/internal/jet" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" ) var table1Col1 = IntegerColumn("col1") diff --git a/postgres/values.go b/postgres/values.go index 7f83b95..202b230 100644 --- a/postgres/values.go +++ b/postgres/values.go @@ -1,6 +1,6 @@ package postgres -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" type values struct { jet.Values diff --git a/postgres/with_statement.go b/postgres/with_statement.go index fdb7592..e161eb9 100644 --- a/postgres/with_statement.go +++ b/postgres/with_statement.go @@ -1,6 +1,6 @@ package postgres -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // CommonTableExpression defines set of interface methods for postgres CTEs type CommonTableExpression interface { diff --git a/qrm/internal/null_types.go b/qrm/internal/null_types.go index 82c6b02..b8ac237 100644 --- a/qrm/internal/null_types.go +++ b/qrm/internal/null_types.go @@ -4,7 +4,7 @@ import ( "database/sql" "database/sql/driver" "fmt" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/datetime" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/datetime" "reflect" "strconv" ) diff --git a/qrm/qrm.go b/qrm/qrm.go index e0fdc2d..d575da3 100644 --- a/qrm/qrm.go +++ b/qrm/qrm.go @@ -8,7 +8,7 @@ import ( "fmt" "reflect" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/must" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/must" ) // Config holds the configuration settings for QRM scanning behavior. diff --git a/qrm/utill.go b/qrm/utill.go index 9d5309f..a98ec38 100644 --- a/qrm/utill.go +++ b/qrm/utill.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/must" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/strslice" - "source.gleipnir.technology/Gleipnir/jet/qrm/internal" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/must" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/strslice" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm/internal" "github.com/google/uuid" ) diff --git a/sqlite/cast.go b/sqlite/cast.go index 6cb0230..b84061e 100644 --- a/sqlite/cast.go +++ b/sqlite/cast.go @@ -1,7 +1,7 @@ package sqlite import ( - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" ) // CAST function converts an expr (of any type) into later specified datatype. diff --git a/sqlite/columns.go b/sqlite/columns.go index 9f560aa..ddf2765 100644 --- a/sqlite/columns.go +++ b/sqlite/columns.go @@ -1,6 +1,6 @@ package sqlite -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // Column is common column interface for all types of columns. type Column = jet.ColumnExpression diff --git a/sqlite/delete_statement.go b/sqlite/delete_statement.go index 977c51a..c7750fb 100644 --- a/sqlite/delete_statement.go +++ b/sqlite/delete_statement.go @@ -1,6 +1,6 @@ package sqlite -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // DeleteStatement is interface for MySQL DELETE statement type DeleteStatement interface { diff --git a/sqlite/dialect.go b/sqlite/dialect.go index d93e544..f8567ed 100644 --- a/sqlite/dialect.go +++ b/sqlite/dialect.go @@ -3,7 +3,7 @@ package sqlite import ( "encoding/hex" "fmt" - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" ) // Dialect is implementation of SQL Builder for SQLite databases. diff --git a/sqlite/expressions.go b/sqlite/expressions.go index 7c7e227..164e47b 100644 --- a/sqlite/expressions.go +++ b/sqlite/expressions.go @@ -1,6 +1,6 @@ package sqlite -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // Expression is common interface for all expressions. // Can be Bool, Int, Float, String, Date, Time or Timestamp expressions. diff --git a/sqlite/functions.go b/sqlite/functions.go index 5e57ecf..b41983d 100644 --- a/sqlite/functions.go +++ b/sqlite/functions.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" ) // This functions can be used, instead of its method counterparts, to have a better indentation of a complex condition diff --git a/sqlite/insert_statement.go b/sqlite/insert_statement.go index ba1eb4f..331dd98 100644 --- a/sqlite/insert_statement.go +++ b/sqlite/insert_statement.go @@ -1,6 +1,6 @@ package sqlite -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // InsertStatement is interface for SQL INSERT statements type InsertStatement interface { diff --git a/sqlite/literal.go b/sqlite/literal.go index aca69ba..65ffd0c 100644 --- a/sqlite/literal.go +++ b/sqlite/literal.go @@ -1,7 +1,7 @@ package sqlite import ( - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" "time" ) diff --git a/sqlite/on_conflict_clause.go b/sqlite/on_conflict_clause.go index d530a44..dfd8c98 100644 --- a/sqlite/on_conflict_clause.go +++ b/sqlite/on_conflict_clause.go @@ -1,8 +1,8 @@ package sqlite import ( - "source.gleipnir.technology/Gleipnir/jet/internal/jet" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/is" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/is" ) type onConflict interface { diff --git a/sqlite/operators.go b/sqlite/operators.go index 6f9632b..257da24 100644 --- a/sqlite/operators.go +++ b/sqlite/operators.go @@ -1,6 +1,6 @@ package sqlite -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // NOT returns negation of bool expression result var NOT = jet.NOT diff --git a/sqlite/select_statement.go b/sqlite/select_statement.go index fe635ef..83691c2 100644 --- a/sqlite/select_statement.go +++ b/sqlite/select_statement.go @@ -1,7 +1,7 @@ package sqlite import ( - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" ) // RowLock is interface for SELECT statement row lock types diff --git a/sqlite/select_statement_test.go b/sqlite/select_statement_test.go index 4decbab..9fa2e3b 100644 --- a/sqlite/select_statement_test.go +++ b/sqlite/select_statement_test.go @@ -1,7 +1,7 @@ package sqlite import ( - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" "testing" ) diff --git a/sqlite/select_table.go b/sqlite/select_table.go index bcaa7b3..054b3b2 100644 --- a/sqlite/select_table.go +++ b/sqlite/select_table.go @@ -1,6 +1,6 @@ package sqlite -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // SelectTable is interface for MySQL sub-queries type SelectTable interface { diff --git a/sqlite/set_statement.go b/sqlite/set_statement.go index 33708c1..529064d 100644 --- a/sqlite/set_statement.go +++ b/sqlite/set_statement.go @@ -1,6 +1,6 @@ package sqlite -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // UNION effectively appends the result of sub-queries(select statements) into single query. // It eliminates duplicate rows from its result. diff --git a/sqlite/statement.go b/sqlite/statement.go index 68ce418..c35d52f 100644 --- a/sqlite/statement.go +++ b/sqlite/statement.go @@ -1,7 +1,7 @@ package sqlite import ( - "source.gleipnir.technology/Gleipnir/jet/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" ) // RawStatement creates new sql statements from raw query and optional map of named arguments diff --git a/sqlite/table.go b/sqlite/table.go index 3b5ab4e..a052c85 100644 --- a/sqlite/table.go +++ b/sqlite/table.go @@ -1,6 +1,6 @@ package sqlite -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // Table is interface for MySQL tables type Table interface { diff --git a/sqlite/types.go b/sqlite/types.go index 8b6770e..58aea4a 100644 --- a/sqlite/types.go +++ b/sqlite/types.go @@ -1,6 +1,6 @@ package sqlite -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // Statement is common interface for all statements(SELECT, INSERT, UPDATE, DELETE, LOCK) type Statement = jet.Statement diff --git a/sqlite/update_statement.go b/sqlite/update_statement.go index 3f7fbf0..bb2f553 100644 --- a/sqlite/update_statement.go +++ b/sqlite/update_statement.go @@ -1,6 +1,6 @@ package sqlite -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // UpdateStatement is interface of SQL UPDATE statement type UpdateStatement interface { diff --git a/sqlite/utils_test.go b/sqlite/utils_test.go index 7d06bc5..199ac7a 100644 --- a/sqlite/utils_test.go +++ b/sqlite/utils_test.go @@ -1,8 +1,8 @@ package sqlite import ( - "source.gleipnir.technology/Gleipnir/jet/internal/jet" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" "testing" ) diff --git a/sqlite/values.go b/sqlite/values.go index 4e01305..ec6ad10 100644 --- a/sqlite/values.go +++ b/sqlite/values.go @@ -1,6 +1,6 @@ package sqlite -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" type values struct { jet.Values diff --git a/sqlite/with_statement.go b/sqlite/with_statement.go index 04d5447..23deb37 100644 --- a/sqlite/with_statement.go +++ b/sqlite/with_statement.go @@ -1,6 +1,6 @@ package sqlite -import "source.gleipnir.technology/Gleipnir/jet/internal/jet" +import "source.gleipnir.technology/Gleipnir/jet/v2/internal/jet" // CommonTableExpression defines set of interface methods for postgres CTEs type CommonTableExpression interface { diff --git a/tests/init/init.go b/tests/init/init.go index 8171926..6991a39 100644 --- a/tests/init/init.go +++ b/tests/init/init.go @@ -6,10 +6,10 @@ import ( "errors" "flag" "fmt" - "source.gleipnir.technology/Gleipnir/jet/generator/mysql" - "source.gleipnir.technology/Gleipnir/jet/generator/postgres" - "source.gleipnir.technology/Gleipnir/jet/generator/sqlite" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/errfmt" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/sqlite" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/errfmt" "source.gleipnir.technology/Gleipnir/jet/v2/tests/internal/utils/repo" "os" "os/exec" diff --git a/tests/mysql/alltypes_test.go b/tests/mysql/alltypes_test.go index 5b052e5..c9f8a38 100644 --- a/tests/mysql/alltypes_test.go +++ b/tests/mysql/alltypes_test.go @@ -5,19 +5,19 @@ import ( "testing" "time" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/ptr" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/ptr" "github.com/shopspring/decimal" "github.com/stretchr/testify/require" "github.com/google/uuid" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/test_sample/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/test_sample/table" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/test_sample/view" "source.gleipnir.technology/Gleipnir/jet/v2/tests/testdata/results/common" - . "source.gleipnir.technology/Gleipnir/jet/mysql" + . "source.gleipnir.technology/Gleipnir/jet/v2/mysql" ) func TestAllTypes(t *testing.T) { diff --git a/tests/mysql/bench_test.go b/tests/mysql/bench_test.go index 8c29f50..8e1948c 100644 --- a/tests/mysql/bench_test.go +++ b/tests/mysql/bench_test.go @@ -4,8 +4,8 @@ package mysql import ( - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/mysql" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/dvds/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/dvds/table" "github.com/stretchr/testify/require" diff --git a/tests/mysql/cast_test.go b/tests/mysql/cast_test.go index 80720b3..8152f53 100644 --- a/tests/mysql/cast_test.go +++ b/tests/mysql/cast_test.go @@ -1,8 +1,8 @@ package mysql import ( - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/mysql" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/test_sample/table" "github.com/stretchr/testify/require" "testing" diff --git a/tests/mysql/delete_test.go b/tests/mysql/delete_test.go index 23676cb..4968012 100644 --- a/tests/mysql/delete_test.go +++ b/tests/mysql/delete_test.go @@ -2,9 +2,9 @@ package mysql import ( "context" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/mysql" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/dvds/table" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/test_sample/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/test_sample/table" diff --git a/tests/mysql/generator_template_test.go b/tests/mysql/generator_template_test.go index 6f05914..d6c3476 100644 --- a/tests/mysql/generator_template_test.go +++ b/tests/mysql/generator_template_test.go @@ -3,12 +3,12 @@ package mysql import ( "database/sql" "fmt" - "source.gleipnir.technology/Gleipnir/jet/generator/metadata" - mysql2 "source.gleipnir.technology/Gleipnir/jet/generator/mysql" - "source.gleipnir.technology/Gleipnir/jet/generator/template" - "source.gleipnir.technology/Gleipnir/jet/internal/3rdparty/snaker" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/dbidentifier" - "source.gleipnir.technology/Gleipnir/jet/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/metadata" + mysql2 "source.gleipnir.technology/Gleipnir/jet/v2/generator/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/template" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/3rdparty/snaker" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/dbidentifier" + "source.gleipnir.technology/Gleipnir/jet/v2/mysql" "source.gleipnir.technology/Gleipnir/jet/v2/tests/dbconfig" file2 "source.gleipnir.technology/Gleipnir/jet/v2/tests/internal/utils/file" "github.com/stretchr/testify/require" diff --git a/tests/mysql/generator_test.go b/tests/mysql/generator_test.go index c502847..a9ae1f7 100644 --- a/tests/mysql/generator_test.go +++ b/tests/mysql/generator_test.go @@ -10,11 +10,11 @@ import ( "github.com/stretchr/testify/require" - "source.gleipnir.technology/Gleipnir/jet/generator/metadata" - "source.gleipnir.technology/Gleipnir/jet/generator/mysql" - "source.gleipnir.technology/Gleipnir/jet/generator/template" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - mysql2 "source.gleipnir.technology/Gleipnir/jet/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/metadata" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/template" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + mysql2 "source.gleipnir.technology/Gleipnir/jet/v2/mysql" "source.gleipnir.technology/Gleipnir/jet/v2/tests/dbconfig" ) @@ -246,7 +246,7 @@ func TestSQLBuilderColumnComment(t *testing.T) { package table import ( - "source.gleipnir.technology/Gleipnir/jet/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/mysql" ) var Link = newLinkTable("test_sample", "link", "") @@ -336,7 +336,7 @@ var mpaaRatingEnumFile = ` package enum -import "source.gleipnir.technology/Gleipnir/jet/mysql" +import "source.gleipnir.technology/Gleipnir/jet/v2/mysql" var FilmRating = &struct { G mysql.StringExpression @@ -364,7 +364,7 @@ var actorSQLBuilderFile = ` package table import ( - "source.gleipnir.technology/Gleipnir/jet/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/mysql" ) var Actor = newActorTable("dvds", "actor", "") @@ -508,7 +508,7 @@ var actorInfoSQLBuilderFile = ` package view import ( - "source.gleipnir.technology/Gleipnir/jet/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/mysql" ) var ActorInfo = newActorInfoTable("dvds", "actor_info", "") @@ -643,7 +643,7 @@ var allTypesEnum = ` package enum -import "source.gleipnir.technology/Gleipnir/jet/mysql" +import "source.gleipnir.technology/Gleipnir/jet/v2/mysql" var AllTypesEnum = &struct { Value1 mysql.StringExpression @@ -748,7 +748,7 @@ var allTypesTableContent = ` package table import ( - "source.gleipnir.technology/Gleipnir/jet/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/mysql" ) var AllTypes = newAllTypesTable("test_sample", "all_types", "") diff --git a/tests/mysql/insert_test.go b/tests/mysql/insert_test.go index 79b19ae..ab2ec4b 100644 --- a/tests/mysql/insert_test.go +++ b/tests/mysql/insert_test.go @@ -2,10 +2,10 @@ package mysql import ( "context" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/ptr" - . "source.gleipnir.technology/Gleipnir/jet/mysql" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/ptr" + . "source.gleipnir.technology/Gleipnir/jet/v2/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/test_sample/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/test_sample/table" diff --git a/tests/mysql/lock_test.go b/tests/mysql/lock_test.go index 469df46..3979de7 100644 --- a/tests/mysql/lock_test.go +++ b/tests/mysql/lock_test.go @@ -1,8 +1,8 @@ package mysql import ( - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/mysql" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/dvds/table" "github.com/stretchr/testify/require" "testing" diff --git a/tests/mysql/main_test.go b/tests/mysql/main_test.go index 6f02190..7230ef8 100644 --- a/tests/mysql/main_test.go +++ b/tests/mysql/main_test.go @@ -4,9 +4,9 @@ import ( "context" "database/sql" "fmt" - "source.gleipnir.technology/Gleipnir/jet/mysql" - jetmysql "source.gleipnir.technology/Gleipnir/jet/mysql" - "source.gleipnir.technology/Gleipnir/jet/stmtcache" + "source.gleipnir.technology/Gleipnir/jet/v2/mysql" + jetmysql "source.gleipnir.technology/Gleipnir/jet/v2/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/stmtcache" "source.gleipnir.technology/Gleipnir/jet/v2/tests/dbconfig" "source.gleipnir.technology/Gleipnir/jet/v2/tests/internal/utils/repo" _ "github.com/go-sql-driver/mysql" diff --git a/tests/mysql/raw_statement_test.go b/tests/mysql/raw_statement_test.go index d47823e..3a52708 100644 --- a/tests/mysql/raw_statement_test.go +++ b/tests/mysql/raw_statement_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/require" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/dvds/model" - . "source.gleipnir.technology/Gleipnir/jet/mysql" + . "source.gleipnir.technology/Gleipnir/jet/v2/mysql" ) func TestRawStatementSelect(t *testing.T) { diff --git a/tests/mysql/sample_test.go b/tests/mysql/sample_test.go index 84e6e90..566f92c 100644 --- a/tests/mysql/sample_test.go +++ b/tests/mysql/sample_test.go @@ -1,13 +1,13 @@ package mysql import ( - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/ptr" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/ptr" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" "github.com/stretchr/testify/require" "testing" - . "source.gleipnir.technology/Gleipnir/jet/mysql" + . "source.gleipnir.technology/Gleipnir/jet/v2/mysql" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/test_sample/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/test_sample/table" diff --git a/tests/mysql/select_json_test.go b/tests/mysql/select_json_test.go index 3f02b02..7d1bcd3 100644 --- a/tests/mysql/select_json_test.go +++ b/tests/mysql/select_json_test.go @@ -6,10 +6,10 @@ import ( "strings" "testing" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/mysql" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/dvds/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/dvds/table" diff --git a/tests/mysql/select_test.go b/tests/mysql/select_test.go index 2408dcb..eafffa1 100644 --- a/tests/mysql/select_test.go +++ b/tests/mysql/select_test.go @@ -2,14 +2,14 @@ package mysql import ( "context" - "source.gleipnir.technology/Gleipnir/jet/postgres" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" "strings" "testing" "time" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/mysql" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/dvds/enum" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/dvds/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/dvds/table" diff --git a/tests/mysql/stmtcache_test.go b/tests/mysql/stmtcache_test.go index 4519ad5..a82ac4a 100644 --- a/tests/mysql/stmtcache_test.go +++ b/tests/mysql/stmtcache_test.go @@ -3,9 +3,9 @@ package mysql import ( "context" "database/sql" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/mysql" - "source.gleipnir.technology/Gleipnir/jet/stmtcache" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/stmtcache" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/dvds/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/dvds/table" "github.com/stretchr/testify/require" diff --git a/tests/mysql/update_dvds_test.go b/tests/mysql/update_dvds_test.go index 06481c4..3d4a504 100644 --- a/tests/mysql/update_dvds_test.go +++ b/tests/mysql/update_dvds_test.go @@ -3,8 +3,8 @@ package mysql import ( "testing" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/mysql" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/dvds/table" ) diff --git a/tests/mysql/update_test.go b/tests/mysql/update_test.go index a52a454..e70b811 100644 --- a/tests/mysql/update_test.go +++ b/tests/mysql/update_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" "github.com/stretchr/testify/require" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/mysql" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/test_sample/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/test_sample/table" ) diff --git a/tests/mysql/values_test.go b/tests/mysql/values_test.go index 2cd294d..ff1c7a5 100644 --- a/tests/mysql/values_test.go +++ b/tests/mysql/values_test.go @@ -1,13 +1,13 @@ package mysql import ( - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" "github.com/stretchr/testify/require" "strings" "testing" "time" - . "source.gleipnir.technology/Gleipnir/jet/mysql" + . "source.gleipnir.technology/Gleipnir/jet/v2/mysql" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/dvds/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/dvds/table" diff --git a/tests/mysql/with_test.go b/tests/mysql/with_test.go index e9f7367..3036c36 100644 --- a/tests/mysql/with_test.go +++ b/tests/mysql/with_test.go @@ -1,8 +1,8 @@ package mysql import ( - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/mysql" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/mysql" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/mysql/dvds/table" "github.com/stretchr/testify/require" "strings" diff --git a/tests/postgres/alltypes_test.go b/tests/postgres/alltypes_test.go index 3fa3209..e57d36f 100644 --- a/tests/postgres/alltypes_test.go +++ b/tests/postgres/alltypes_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/ptr" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/ptr" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" "github.com/lib/pq" "github.com/stretchr/testify/assert" @@ -16,8 +16,8 @@ import ( "github.com/google/uuid" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/postgres" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/test_sample/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/test_sample/table" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/test_sample/view" @@ -1855,21 +1855,21 @@ Column type: *jet.timestampColumnImpl Column type: *jet.timestampzColumnImpl Column type: *jet.intervalColumnImpl Column type: *jet.blobColumnImpl -Column type: *jet.arrayColumnImpl[source.gleipnir.technology/Gleipnir/jet/internal/jet.BoolExpression] -Column type: *jet.arrayColumnImpl[source.gleipnir.technology/Gleipnir/jet/internal/jet.IntegerExpression] -Column type: *jet.arrayColumnImpl[source.gleipnir.technology/Gleipnir/jet/internal/jet.StringExpression] -Column type: *jet.arrayColumnImpl[source.gleipnir.technology/Gleipnir/jet/internal/jet.DateExpression] -Column type: *jet.arrayColumnImpl[source.gleipnir.technology/Gleipnir/jet/internal/jet.TimeExpression] -Column type: *jet.arrayColumnImpl[source.gleipnir.technology/Gleipnir/jet/internal/jet.TimezExpression] -Column type: *jet.arrayColumnImpl[source.gleipnir.technology/Gleipnir/jet/internal/jet.TimestampExpression] -Column type: *jet.arrayColumnImpl[source.gleipnir.technology/Gleipnir/jet/internal/jet.TimestampzExpression] -Column type: *jet.arrayColumnImpl[source.gleipnir.technology/Gleipnir/jet/internal/jet.IntervalExpression] -Column type: *jet.arrayColumnImpl[source.gleipnir.technology/Gleipnir/jet/internal/jet.BlobExpression] -Column type: *jet.rangeColumnImpl[source.gleipnir.technology/Gleipnir/jet/internal/jet.IntegerExpression] -Column type: *jet.rangeColumnImpl[source.gleipnir.technology/Gleipnir/jet/internal/jet.DateExpression] -Column type: *jet.rangeColumnImpl[source.gleipnir.technology/Gleipnir/jet/internal/jet.NumericExpression] -Column type: *jet.rangeColumnImpl[source.gleipnir.technology/Gleipnir/jet/internal/jet.TimestampExpression] -Column type: *jet.rangeColumnImpl[source.gleipnir.technology/Gleipnir/jet/internal/jet.TimestampzExpression] +Column type: *jet.arrayColumnImpl[source.gleipnir.technology/Gleipnir/jet/v2/internal/jet.BoolExpression] +Column type: *jet.arrayColumnImpl[source.gleipnir.technology/Gleipnir/jet/v2/internal/jet.IntegerExpression] +Column type: *jet.arrayColumnImpl[source.gleipnir.technology/Gleipnir/jet/v2/internal/jet.StringExpression] +Column type: *jet.arrayColumnImpl[source.gleipnir.technology/Gleipnir/jet/v2/internal/jet.DateExpression] +Column type: *jet.arrayColumnImpl[source.gleipnir.technology/Gleipnir/jet/v2/internal/jet.TimeExpression] +Column type: *jet.arrayColumnImpl[source.gleipnir.technology/Gleipnir/jet/v2/internal/jet.TimezExpression] +Column type: *jet.arrayColumnImpl[source.gleipnir.technology/Gleipnir/jet/v2/internal/jet.TimestampExpression] +Column type: *jet.arrayColumnImpl[source.gleipnir.technology/Gleipnir/jet/v2/internal/jet.TimestampzExpression] +Column type: *jet.arrayColumnImpl[source.gleipnir.technology/Gleipnir/jet/v2/internal/jet.IntervalExpression] +Column type: *jet.arrayColumnImpl[source.gleipnir.technology/Gleipnir/jet/v2/internal/jet.BlobExpression] +Column type: *jet.rangeColumnImpl[source.gleipnir.technology/Gleipnir/jet/v2/internal/jet.IntegerExpression] +Column type: *jet.rangeColumnImpl[source.gleipnir.technology/Gleipnir/jet/v2/internal/jet.DateExpression] +Column type: *jet.rangeColumnImpl[source.gleipnir.technology/Gleipnir/jet/v2/internal/jet.NumericExpression] +Column type: *jet.rangeColumnImpl[source.gleipnir.technology/Gleipnir/jet/v2/internal/jet.TimestampExpression] +Column type: *jet.rangeColumnImpl[source.gleipnir.technology/Gleipnir/jet/v2/internal/jet.TimestampzExpression] `) stmt := SELECT( diff --git a/tests/postgres/array_test.go b/tests/postgres/array_test.go index f50182d..6f693b5 100644 --- a/tests/postgres/array_test.go +++ b/tests/postgres/array_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/ptr" - . "source.gleipnir.technology/Gleipnir/jet/postgres" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/ptr" + . "source.gleipnir.technology/Gleipnir/jet/v2/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/test_sample/enum" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/test_sample/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/test_sample/table" diff --git a/tests/postgres/chinook_db_test.go b/tests/postgres/chinook_db_test.go index 004fb93..c63df12 100644 --- a/tests/postgres/chinook_db_test.go +++ b/tests/postgres/chinook_db_test.go @@ -6,9 +6,9 @@ import ( "time" "github.com/bytedance/sonic" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/ptr" - . "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/ptr" + . "source.gleipnir.technology/Gleipnir/jet/v2/postgres" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/chinook/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/chinook/table" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/chinook2/table" diff --git a/tests/postgres/delete_test.go b/tests/postgres/delete_test.go index 20560a5..86ec1b1 100644 --- a/tests/postgres/delete_test.go +++ b/tests/postgres/delete_test.go @@ -2,9 +2,9 @@ package postgres import ( "context" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/postgres" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" model2 "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/dvds/model" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/dvds/table" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/test_sample/model" diff --git a/tests/postgres/generator_template_test.go b/tests/postgres/generator_template_test.go index af88586..52f0c3b 100644 --- a/tests/postgres/generator_template_test.go +++ b/tests/postgres/generator_template_test.go @@ -8,13 +8,13 @@ import ( "github.com/stretchr/testify/require" - "source.gleipnir.technology/Gleipnir/jet/generator/metadata" - "source.gleipnir.technology/Gleipnir/jet/generator/postgres" - "source.gleipnir.technology/Gleipnir/jet/generator/template" - "source.gleipnir.technology/Gleipnir/jet/internal/3rdparty/snaker" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/dbidentifier" - postgres2 "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/metadata" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/template" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/3rdparty/snaker" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/dbidentifier" + postgres2 "source.gleipnir.technology/Gleipnir/jet/v2/postgres" "source.gleipnir.technology/Gleipnir/jet/v2/tests/dbconfig" file2 "source.gleipnir.technology/Gleipnir/jet/v2/tests/internal/utils/file" ) @@ -569,7 +569,7 @@ func TestRenameEnumValueName(t *testing.T) { package enum -import "source.gleipnir.technology/Gleipnir/jet/postgres" +import "source.gleipnir.technology/Gleipnir/jet/v2/postgres" var MpaaRating = &struct { GRating postgres.StringExpression diff --git a/tests/postgres/generator_test.go b/tests/postgres/generator_test.go index 91108e3..cd4ab09 100644 --- a/tests/postgres/generator_test.go +++ b/tests/postgres/generator_test.go @@ -14,11 +14,11 @@ import ( "github.com/stretchr/testify/require" - "source.gleipnir.technology/Gleipnir/jet/generator/metadata" - "source.gleipnir.technology/Gleipnir/jet/generator/postgres" - "source.gleipnir.technology/Gleipnir/jet/generator/template" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - postgres2 "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/metadata" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/template" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + postgres2 "source.gleipnir.technology/Gleipnir/jet/v2/postgres" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/dvds/model" "source.gleipnir.technology/Gleipnir/jet/v2/tests/dbconfig" "source.gleipnir.technology/Gleipnir/jet/v2/tests/internal/utils/file" @@ -479,7 +479,7 @@ var mpaaRatingEnumFile = ` package enum -import "source.gleipnir.technology/Gleipnir/jet/postgres" +import "source.gleipnir.technology/Gleipnir/jet/v2/postgres" var MpaaRating = &struct { G postgres.StringExpression @@ -507,7 +507,7 @@ var actorSQLBuilderFile = ` package table import ( - "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/postgres" ) var Actor = newActorTable("dvds", "actor", "") @@ -650,7 +650,7 @@ var actorInfoSQLBuilderFile = ` package view import ( - "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/postgres" ) var ActorInfo = newActorInfoTable("dvds", "actor_info", "") @@ -827,7 +827,7 @@ var moodEnumContent = ` package enum -import "source.gleipnir.technology/Gleipnir/jet/postgres" +import "source.gleipnir.technology/Gleipnir/jet/v2/postgres" var Mood = &struct { Sad postgres.StringExpression @@ -850,7 +850,7 @@ var levelEnumContent = ` package enum -import "source.gleipnir.technology/Gleipnir/jet/postgres" +import "source.gleipnir.technology/Gleipnir/jet/v2/postgres" // Level enum var Level = &struct { @@ -981,7 +981,7 @@ var allTypesTableContent = ` package table import ( - "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/postgres" ) var AllTypes = newAllTypesTable("test_sample", "all_types", "") @@ -1248,7 +1248,7 @@ var sampleRangeTableContent = ` package table import ( - "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/postgres" ) var SampleRanges = newSampleRangesTable("test_sample", "sample_ranges", "") @@ -1344,7 +1344,7 @@ var linkTableContent = ` package table import ( - "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/postgres" ) var Link = newLinkTable("test_sample", "link", "") @@ -1783,7 +1783,7 @@ type SampleArrays struct { package table import ( - "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/postgres" ) var SampleArrays = newSampleArraysTable("test_sample", "sample_arrays", "") diff --git a/tests/postgres/insert_test.go b/tests/postgres/insert_test.go index abab63c..8f8b99e 100644 --- a/tests/postgres/insert_test.go +++ b/tests/postgres/insert_test.go @@ -2,9 +2,9 @@ package postgres import ( "context" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/postgres" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/test_sample/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/test_sample/table" "github.com/stretchr/testify/require" diff --git a/tests/postgres/json_test.go b/tests/postgres/json_test.go index 9bc0313..08f4317 100644 --- a/tests/postgres/json_test.go +++ b/tests/postgres/json_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - . "source.gleipnir.technology/Gleipnir/jet/postgres" + . "source.gleipnir.technology/Gleipnir/jet/v2/postgres" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/test_sample/table" ) diff --git a/tests/postgres/lock_test.go b/tests/postgres/lock_test.go index ab11a0f..27c602e 100644 --- a/tests/postgres/lock_test.go +++ b/tests/postgres/lock_test.go @@ -2,12 +2,12 @@ package postgres import ( "context" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" "github.com/stretchr/testify/require" "testing" "time" - . "source.gleipnir.technology/Gleipnir/jet/postgres" + . "source.gleipnir.technology/Gleipnir/jet/v2/postgres" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/dvds/table" ) diff --git a/tests/postgres/main_test.go b/tests/postgres/main_test.go index 361c645..f967ee8 100644 --- a/tests/postgres/main_test.go +++ b/tests/postgres/main_test.go @@ -9,12 +9,12 @@ import ( "runtime" "testing" - "source.gleipnir.technology/Gleipnir/jet/qrm" - "source.gleipnir.technology/Gleipnir/jet/stmtcache" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/stmtcache" "source.gleipnir.technology/Gleipnir/jet/v2/tests/internal/utils/repo" "github.com/jackc/pgx/v5/stdlib" - "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/postgres" "source.gleipnir.technology/Gleipnir/jet/v2/tests/dbconfig" _ "github.com/lib/pq" "github.com/pkg/profile" diff --git a/tests/postgres/northwind_test.go b/tests/postgres/northwind_test.go index 37d97da..51100a3 100644 --- a/tests/postgres/northwind_test.go +++ b/tests/postgres/northwind_test.go @@ -2,8 +2,8 @@ package postgres import ( "github.com/bytedance/sonic" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/postgres" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/northwind/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/northwind/table" "github.com/stretchr/testify/require" diff --git a/tests/postgres/range_test.go b/tests/postgres/range_test.go index 5e184ef..a86f649 100644 --- a/tests/postgres/range_test.go +++ b/tests/postgres/range_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" "github.com/google/go-cmp/cmp" "github.com/jackc/pgtype" "github.com/stretchr/testify/require" - . "source.gleipnir.technology/Gleipnir/jet/postgres" + . "source.gleipnir.technology/Gleipnir/jet/v2/postgres" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/test_sample/model" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/test_sample/table" ) diff --git a/tests/postgres/raw_statements_test.go b/tests/postgres/raw_statements_test.go index 8c50896..71e5c53 100644 --- a/tests/postgres/raw_statements_test.go +++ b/tests/postgres/raw_statements_test.go @@ -2,17 +2,17 @@ package postgres import ( "context" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" "testing" "time" "github.com/stretchr/testify/require" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/dvds/model" model2 "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/test_sample/model" - . "source.gleipnir.technology/Gleipnir/jet/postgres" + . "source.gleipnir.technology/Gleipnir/jet/v2/postgres" ) func TestRawStatementSelect(t *testing.T) { diff --git a/tests/postgres/sample_test.go b/tests/postgres/sample_test.go index 4d89993..ce7c700 100644 --- a/tests/postgres/sample_test.go +++ b/tests/postgres/sample_test.go @@ -3,14 +3,14 @@ package postgres import ( "testing" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/ptr" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/ptr" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" "github.com/google/uuid" "github.com/stretchr/testify/require" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/postgres" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/test_sample/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/test_sample/table" diff --git a/tests/postgres/scan_test.go b/tests/postgres/scan_test.go index 2667725..b084f8b 100644 --- a/tests/postgres/scan_test.go +++ b/tests/postgres/scan_test.go @@ -2,7 +2,7 @@ package postgres import ( "context" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/ptr" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/ptr" "github.com/lib/pq" "gopkg.in/guregu/null.v4" "testing" @@ -11,9 +11,9 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/postgres" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/dvds/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/dvds/table" ) diff --git a/tests/postgres/select_json_test.go b/tests/postgres/select_json_test.go index 98cf809..172dede 100644 --- a/tests/postgres/select_json_test.go +++ b/tests/postgres/select_json_test.go @@ -4,13 +4,13 @@ import ( "testing" "time" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/ptr" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/ptr" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/dvds/view" "github.com/stretchr/testify/require" - . "source.gleipnir.technology/Gleipnir/jet/postgres" + . "source.gleipnir.technology/Gleipnir/jet/v2/postgres" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/dvds/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/dvds/table" ) diff --git a/tests/postgres/select_test.go b/tests/postgres/select_test.go index 4e7c82b..2179497 100644 --- a/tests/postgres/select_test.go +++ b/tests/postgres/select_test.go @@ -3,18 +3,18 @@ package postgres import ( "context" "database/sql" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/ptr" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/ptr" "github.com/lib/pq" "gopkg.in/guregu/null.v4" "testing" "time" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" "github.com/stretchr/testify/require" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/postgres" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/dvds/enum" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/dvds/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/dvds/table" diff --git a/tests/postgres/stmtcache_test.go b/tests/postgres/stmtcache_test.go index 6297a0a..fc8fc51 100644 --- a/tests/postgres/stmtcache_test.go +++ b/tests/postgres/stmtcache_test.go @@ -3,9 +3,9 @@ package postgres import ( "context" "database/sql" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/postgres" - "source.gleipnir.technology/Gleipnir/jet/stmtcache" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/stmtcache" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/dvds/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/dvds/table" "github.com/stretchr/testify/require" diff --git a/tests/postgres/update_test.go b/tests/postgres/update_test.go index ce02e94..7dd7e28 100644 --- a/tests/postgres/update_test.go +++ b/tests/postgres/update_test.go @@ -2,9 +2,9 @@ package postgres import ( "context" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/postgres" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" model2 "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/dvds/model" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/dvds/table" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/test_sample/model" diff --git a/tests/postgres/values_test.go b/tests/postgres/values_test.go index 70120bc..4aecadc 100644 --- a/tests/postgres/values_test.go +++ b/tests/postgres/values_test.go @@ -1,9 +1,9 @@ package postgres import ( - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/postgres" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/dvds/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/dvds/table" "github.com/stretchr/testify/assert" diff --git a/tests/postgres/with_test.go b/tests/postgres/with_test.go index 6571765..1964f5a 100644 --- a/tests/postgres/with_test.go +++ b/tests/postgres/with_test.go @@ -2,8 +2,8 @@ package postgres import ( "context" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/postgres" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/postgres" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/northwind/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/jetdb/northwind/table" "github.com/stretchr/testify/require" diff --git a/tests/sqlite/alltypes_test.go b/tests/sqlite/alltypes_test.go index 80590ab..6ed7ebd 100644 --- a/tests/sqlite/alltypes_test.go +++ b/tests/sqlite/alltypes_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/ptr" - . "source.gleipnir.technology/Gleipnir/jet/sqlite" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/ptr" + . "source.gleipnir.technology/Gleipnir/jet/v2/sqlite" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/test_sample/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/test_sample/table" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/test_sample/view" diff --git a/tests/sqlite/cast_test.go b/tests/sqlite/cast_test.go index 134d753..ac66b4c 100644 --- a/tests/sqlite/cast_test.go +++ b/tests/sqlite/cast_test.go @@ -1,8 +1,8 @@ package sqlite import ( - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/sqlite" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/sqlite" "github.com/stretchr/testify/require" "testing" ) diff --git a/tests/sqlite/delete_test.go b/tests/sqlite/delete_test.go index 8fc3db2..84f438a 100644 --- a/tests/sqlite/delete_test.go +++ b/tests/sqlite/delete_test.go @@ -2,12 +2,12 @@ package sqlite import ( "context" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" "testing" "time" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/sqlite" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/sqlite" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/test_sample/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/test_sample/table" "github.com/stretchr/testify/require" diff --git a/tests/sqlite/generator_test.go b/tests/sqlite/generator_test.go index d9afd67..b1b64ed 100644 --- a/tests/sqlite/generator_test.go +++ b/tests/sqlite/generator_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/require" - "source.gleipnir.technology/Gleipnir/jet/generator/metadata" - "source.gleipnir.technology/Gleipnir/jet/generator/sqlite" - "source.gleipnir.technology/Gleipnir/jet/generator/template" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - sqlite2 "source.gleipnir.technology/Gleipnir/jet/sqlite" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/metadata" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/sqlite" + "source.gleipnir.technology/Gleipnir/jet/v2/generator/template" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + sqlite2 "source.gleipnir.technology/Gleipnir/jet/v2/sqlite" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/sakila/model" "source.gleipnir.technology/Gleipnir/jet/v2/tests/internal/utils/repo" ) @@ -170,7 +170,7 @@ const actorSQLBuilderFile = ` package table import ( - "source.gleipnir.technology/Gleipnir/jet/sqlite" + "source.gleipnir.technology/Gleipnir/jet/v2/sqlite" ) var Actor = newActorTable("", "actor", "") @@ -291,7 +291,7 @@ const filmListSQLBuilderFile = ` package view import ( - "source.gleipnir.technology/Gleipnir/jet/sqlite" + "source.gleipnir.technology/Gleipnir/jet/v2/sqlite" ) var FilmList = newFilmListTable("", "film_list", "") diff --git a/tests/sqlite/insert_test.go b/tests/sqlite/insert_test.go index 7f144c7..69274d7 100644 --- a/tests/sqlite/insert_test.go +++ b/tests/sqlite/insert_test.go @@ -2,15 +2,15 @@ package sqlite import ( "context" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/ptr" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/ptr" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" "math/rand" "testing" "time" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/sqlite" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/sqlite" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/test_sample/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/test_sample/table" "github.com/stretchr/testify/require" diff --git a/tests/sqlite/main_test.go b/tests/sqlite/main_test.go index c399cd5..8911e3f 100644 --- a/tests/sqlite/main_test.go +++ b/tests/sqlite/main_test.go @@ -8,10 +8,10 @@ import ( "runtime" "testing" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/throw" - "source.gleipnir.technology/Gleipnir/jet/qrm" - "source.gleipnir.technology/Gleipnir/jet/sqlite" - "source.gleipnir.technology/Gleipnir/jet/stmtcache" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/throw" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/sqlite" + "source.gleipnir.technology/Gleipnir/jet/v2/stmtcache" "source.gleipnir.technology/Gleipnir/jet/v2/tests/dbconfig" "github.com/pkg/profile" "github.com/stretchr/testify/require" diff --git a/tests/sqlite/raw_statement_test.go b/tests/sqlite/raw_statement_test.go index 8a23a6e..b81bd06 100644 --- a/tests/sqlite/raw_statement_test.go +++ b/tests/sqlite/raw_statement_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/sqlite" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/sqlite" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/sakila/model" "github.com/stretchr/testify/require" ) diff --git a/tests/sqlite/sample_test.go b/tests/sqlite/sample_test.go index a083042..1b013d3 100644 --- a/tests/sqlite/sample_test.go +++ b/tests/sqlite/sample_test.go @@ -1,13 +1,13 @@ package sqlite import ( - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/ptr" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/ptr" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" "github.com/stretchr/testify/require" "testing" - . "source.gleipnir.technology/Gleipnir/jet/sqlite" + . "source.gleipnir.technology/Gleipnir/jet/v2/sqlite" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/test_sample/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/test_sample/table" ) diff --git a/tests/sqlite/select_test.go b/tests/sqlite/select_test.go index 65396f1..05728b7 100644 --- a/tests/sqlite/select_test.go +++ b/tests/sqlite/select_test.go @@ -6,12 +6,12 @@ import ( "testing" "time" - "source.gleipnir.technology/Gleipnir/jet/internal/utils/ptr" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/utils/ptr" model2 "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/chinook/model" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/chinook/table" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/sqlite" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/sqlite" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/sakila/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/sakila/table" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/sakila/view" diff --git a/tests/sqlite/stmtcache_test.go b/tests/sqlite/stmtcache_test.go index ffd2a44..668707d 100644 --- a/tests/sqlite/stmtcache_test.go +++ b/tests/sqlite/stmtcache_test.go @@ -3,9 +3,9 @@ package sqlite import ( "context" "database/sql" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/sqlite" - "source.gleipnir.technology/Gleipnir/jet/stmtcache" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/sqlite" + "source.gleipnir.technology/Gleipnir/jet/v2/stmtcache" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/sakila/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/sakila/table" "source.gleipnir.technology/Gleipnir/jet/v2/tests/dbconfig" diff --git a/tests/sqlite/update_test.go b/tests/sqlite/update_test.go index 621c857..4c4c38f 100644 --- a/tests/sqlite/update_test.go +++ b/tests/sqlite/update_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" model2 "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/sakila/model" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/sakila/table" - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/sqlite" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/sqlite" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/test_sample/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/test_sample/table" "github.com/stretchr/testify/require" diff --git a/tests/sqlite/values_test.go b/tests/sqlite/values_test.go index 1cc521c..72821a5 100644 --- a/tests/sqlite/values_test.go +++ b/tests/sqlite/values_test.go @@ -1,14 +1,14 @@ package sqlite import ( - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - "source.gleipnir.technology/Gleipnir/jet/qrm" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + "source.gleipnir.technology/Gleipnir/jet/v2/qrm" "github.com/stretchr/testify/require" "strings" "testing" "time" - . "source.gleipnir.technology/Gleipnir/jet/sqlite" + . "source.gleipnir.technology/Gleipnir/jet/v2/sqlite" "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/sakila/model" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/sakila/table" ) diff --git a/tests/sqlite/with_test.go b/tests/sqlite/with_test.go index 92a224a..e397459 100644 --- a/tests/sqlite/with_test.go +++ b/tests/sqlite/with_test.go @@ -1,8 +1,8 @@ package sqlite import ( - "source.gleipnir.technology/Gleipnir/jet/internal/testutils" - . "source.gleipnir.technology/Gleipnir/jet/sqlite" + "source.gleipnir.technology/Gleipnir/jet/v2/internal/testutils" + . "source.gleipnir.technology/Gleipnir/jet/v2/sqlite" . "source.gleipnir.technology/Gleipnir/jet/v2/tests/.gentestdata/sqlite/sakila/table" "github.com/stretchr/testify/require" "strings"