diff --git a/binding/dal.go b/binding/dal.go index 1a00223..af15ee9 100644 --- a/binding/dal.go +++ b/binding/dal.go @@ -8,7 +8,7 @@ import ( "strings" "unsafe" - "github.com/nesterow/dal/pkg/facade" + "l12.xyz/x/dal/pkg/facade" _ "github.com/mattn/go-sqlite3" ) diff --git a/binding/go.mod b/binding/go.mod index 017122d..b81c80b 100644 --- a/binding/go.mod +++ b/binding/go.mod @@ -2,32 +2,14 @@ module binding go 1.22.6 -replace github.com/nesterow/dal/pkg/adapter => ../pkg/adapter - -replace github.com/nesterow/dal/pkg/proto => ../pkg/proto - -replace github.com/nesterow/dal/pkg/builder => ../pkg/builder - -replace github.com/nesterow/dal/pkg/filters => ../pkg/filters - -replace github.com/nesterow/dal/pkg/utils => ../pkg/utils - -replace github.com/nesterow/dal/pkg/handler => ../pkg/handler - -replace github.com/nesterow/dal/pkg/facade => ../pkg/facade +replace l12.xyz/x/dal => ../ require ( github.com/mattn/go-sqlite3 v1.14.22 - github.com/nesterow/dal/pkg/facade v0.0.0-20240820230908-3f75eedbfcb1 + l12.xyz/x/dal v0.0.0 ) require ( - github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181 // indirect - github.com/nesterow/dal/pkg/builder v0.0.0-20240820192515-7a408c994181 // indirect - github.com/nesterow/dal/pkg/filters v0.0.0-20240820192515-7a408c994181 // indirect - github.com/nesterow/dal/pkg/handler v0.0.0-20240823050743-ae641b7ee894 // indirect - github.com/nesterow/dal/pkg/proto v0.0.0-20240820230328-f8e28d2a2e42 // indirect - github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181 // indirect github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/tinylib/msgp v1.2.0 // indirect diff --git a/dal/__test__/srv/go.mod b/dal/__test__/srv/go.mod index 84826c2..64a074c 100644 --- a/dal/__test__/srv/go.mod +++ b/dal/__test__/srv/go.mod @@ -2,19 +2,14 @@ module srv go 1.22.6 -replace github.com/nesterow/dal/pkg/handler => ../../../pkg/handler +replace l12.xyz/x/dal => ../../../ require ( github.com/mattn/go-sqlite3 v1.14.22 - github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181 - github.com/nesterow/dal/pkg/handler v0.0.0-20240820192515-7a408c994181 + l12.xyz/x/dal v0.0.0 ) require ( - github.com/nesterow/dal/pkg/builder v0.0.0-20240820192515-7a408c994181 // indirect - github.com/nesterow/dal/pkg/filters v0.0.0-20240820192515-7a408c994181 // indirect - github.com/nesterow/dal/pkg/proto v0.0.0-20240820192515-7a408c994181 // indirect - github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181 // indirect github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/tinylib/msgp v1.2.0 // indirect diff --git a/dal/__test__/srv/go.sum b/dal/__test__/srv/go.sum index 4aca4bf..5cf32ca 100644 --- a/dal/__test__/srv/go.sum +++ b/dal/__test__/srv/go.sum @@ -1,15 +1,5 @@ github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= -github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181 h1:wwWMAG/Uu/layF1wu6dJiUej0zisaVQRfyTNqjJpxac= -github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181/go.mod h1:TCkoNn14Hgl+iVENr73GHaDVEuAg8KizH0oXaV2qMKs= -github.com/nesterow/dal/pkg/builder v0.0.0-20240820192515-7a408c994181 h1:Ex2XjUB7o4IRSWcgh8qgac8JQ2gbn6M+jUfom4zZccY= -github.com/nesterow/dal/pkg/builder v0.0.0-20240820192515-7a408c994181/go.mod h1:mVt1QOFEeGLdi+ZbMLzVw3LVtFB2tYWxZRouhkOThJU= -github.com/nesterow/dal/pkg/filters v0.0.0-20240820192515-7a408c994181 h1:Vi6v1T68/oayGfoX8k/FpgvfMsCUqxMsowTHKXY70VE= -github.com/nesterow/dal/pkg/filters v0.0.0-20240820192515-7a408c994181/go.mod h1:6aUr+2+D+184FTSXgziW6r1bvcKTY+Ie3TW4iET0g6I= -github.com/nesterow/dal/pkg/proto v0.0.0-20240820192515-7a408c994181 h1:HcGM9fagbbGa0r/6TRrg+lzRbW79sOr6yTczYkO1miw= -github.com/nesterow/dal/pkg/proto v0.0.0-20240820192515-7a408c994181/go.mod h1:MUS8KEmlNqjUuhNyK4TOkUwjT9893jmNm++ukVz2hzU= -github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181 h1:b/D2uq18D6CzAh+NUyD1cM7s/q/aQZEpXy57iKyzg8k= -github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181/go.mod h1:0XWmrxZfyoEAZoCOxP3quEOP7ZNK2Lhvtpeux8C74mw= github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 h1:jYi87L8j62qkXzaYHAQAhEapgukhenIMZRBKTNRLHJ4= github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= diff --git a/dal/__test__/srv/main.go b/dal/__test__/srv/main.go index 6891ef7..6b8fb58 100644 --- a/dal/__test__/srv/main.go +++ b/dal/__test__/srv/main.go @@ -7,8 +7,8 @@ import ( "os/signal" "syscall" - "github.com/nesterow/dal/pkg/adapter" - "github.com/nesterow/dal/pkg/handler" + "l12.xyz/x/dal/pkg/adapter" + "l12.xyz/x/dal/pkg/handler" _ "github.com/mattn/go-sqlite3" ) diff --git a/go.mod b/go.mod index f12af7f..210c443 100644 --- a/go.mod +++ b/go.mod @@ -1,19 +1,11 @@ -module github.com/nesterow/dal +module l12.xyz/x/dal go 1.22.6 -require github.com/nesterow/dal/pkg/facade v0.0.0-20240823050743-ae641b7ee894 - -require github.com/mattn/go-sqlite3 v1.14.22 - require ( - github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181 // indirect - github.com/nesterow/dal/pkg/builder v0.0.0-20240820192515-7a408c994181 // indirect - github.com/nesterow/dal/pkg/filters v0.0.0-20240820192515-7a408c994181 // indirect - github.com/nesterow/dal/pkg/handler v0.0.0-20240823050743-ae641b7ee894 // indirect - github.com/nesterow/dal/pkg/proto v0.0.0-20240820230328-f8e28d2a2e42 // indirect - github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181 // indirect - github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect - github.com/pkg/errors v0.9.1 // indirect - github.com/tinylib/msgp v1.2.0 // indirect + github.com/mattn/go-sqlite3 v1.14.22 + github.com/pkg/errors v0.9.1 + github.com/tinylib/msgp v1.2.0 ) + +require github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect diff --git a/go.sum b/go.sum index 5c61fbe..5cf32ca 100644 --- a/go.sum +++ b/go.sum @@ -1,19 +1,5 @@ github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= -github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181 h1:wwWMAG/Uu/layF1wu6dJiUej0zisaVQRfyTNqjJpxac= -github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181/go.mod h1:TCkoNn14Hgl+iVENr73GHaDVEuAg8KizH0oXaV2qMKs= -github.com/nesterow/dal/pkg/builder v0.0.0-20240820192515-7a408c994181 h1:Ex2XjUB7o4IRSWcgh8qgac8JQ2gbn6M+jUfom4zZccY= -github.com/nesterow/dal/pkg/builder v0.0.0-20240820192515-7a408c994181/go.mod h1:mVt1QOFEeGLdi+ZbMLzVw3LVtFB2tYWxZRouhkOThJU= -github.com/nesterow/dal/pkg/facade v0.0.0-20240823050743-ae641b7ee894 h1:MkHuizDCwVhyvVa/9sSBFsX7MiWZQAeOODS50GTe9nU= -github.com/nesterow/dal/pkg/facade v0.0.0-20240823050743-ae641b7ee894/go.mod h1:MKaLSkZocQXy/wFqBzl+Bu7lb4xSCeItbTC7vjOPE0Q= -github.com/nesterow/dal/pkg/filters v0.0.0-20240820192515-7a408c994181 h1:Vi6v1T68/oayGfoX8k/FpgvfMsCUqxMsowTHKXY70VE= -github.com/nesterow/dal/pkg/filters v0.0.0-20240820192515-7a408c994181/go.mod h1:6aUr+2+D+184FTSXgziW6r1bvcKTY+Ie3TW4iET0g6I= -github.com/nesterow/dal/pkg/handler v0.0.0-20240823050743-ae641b7ee894 h1:nPlCoVDXzpFGX4cmInLOKoAB7cTpcnjGDevCahF1Db8= -github.com/nesterow/dal/pkg/handler v0.0.0-20240823050743-ae641b7ee894/go.mod h1:aUueTAR2yb5ZCcXqgm4euJTTlScTCqTyT187oNQN5zY= -github.com/nesterow/dal/pkg/proto v0.0.0-20240820230328-f8e28d2a2e42 h1:bUnae1O6MEYWEZepd2ir3iSkydfX9/8DLRoH0U+EWHM= -github.com/nesterow/dal/pkg/proto v0.0.0-20240820230328-f8e28d2a2e42/go.mod h1:YGGcF6rUmoknTFR3csZyLjJhpuFBw9S+DQa61P8B8kY= -github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181 h1:b/D2uq18D6CzAh+NUyD1cM7s/q/aQZEpXy57iKyzg8k= -github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181/go.mod h1:0XWmrxZfyoEAZoCOxP3quEOP7ZNK2Lhvtpeux8C74mw= github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 h1:jYi87L8j62qkXzaYHAQAhEapgukhenIMZRBKTNRLHJ4= github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= diff --git a/main.go b/main.go index 1ba204b..56a59fe 100644 --- a/main.go +++ b/main.go @@ -1,9 +1,8 @@ package main import ( - "github.com/nesterow/dal/pkg/facade" - _ "github.com/mattn/go-sqlite3" + "l12.xyz/x/dal/pkg/facade" ) func main() { diff --git a/package.json b/package.json index 4fa010d..674a263 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@nesterow/dal", "version": "0.0.2", - "repository": "https://github.com/nesterow/dal.git", + "repository": "https://l12.xyz/x/dal.git", "publishConfig": { "registry": "https://npm.pkg.github.com" }, diff --git a/pkg/__test__/adapter_test.go b/pkg/__test__/adapter_test.go index ba8e2a6..7797f18 100644 --- a/pkg/__test__/adapter_test.go +++ b/pkg/__test__/adapter_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/nesterow/dal/pkg/adapter" + "l12.xyz/x/dal/pkg/adapter" _ "github.com/mattn/go-sqlite3" ) diff --git a/pkg/__test__/builder_test.go b/pkg/__test__/builder_test.go index 6a0e09f..5b3ebf7 100644 --- a/pkg/__test__/builder_test.go +++ b/pkg/__test__/builder_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/nesterow/dal/pkg/adapter" - "github.com/nesterow/dal/pkg/builder" + "l12.xyz/x/dal/pkg/adapter" + "l12.xyz/x/dal/pkg/builder" _ "github.com/mattn/go-sqlite3" ) diff --git a/pkg/__test__/go.mod b/pkg/__test__/go.mod index 1b43367..8a47e5c 100644 --- a/pkg/__test__/go.mod +++ b/pkg/__test__/go.mod @@ -2,19 +2,15 @@ module pkg/tests go 1.22.6 +replace l12.xyz/x/dal => ../../ + require ( - github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181 - github.com/nesterow/dal/pkg/proto v0.0.0-20240820192515-7a408c994181 - github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181 // indirect github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect github.com/tinylib/msgp v1.2.0 // indirect + l12.xyz/x/dal v0.0.0 ) require ( github.com/mattn/go-sqlite3 v1.14.22 github.com/pkg/errors v0.9.1 // indirect ) - -require github.com/nesterow/dal/pkg/builder v0.0.0-20240820191021-7dcd046e6ca0 - -require github.com/nesterow/dal/pkg/filters v0.0.0-20240820191021-7dcd046e6ca0 // indirect diff --git a/pkg/__test__/go.sum b/pkg/__test__/go.sum index d438343..5cf32ca 100644 --- a/pkg/__test__/go.sum +++ b/pkg/__test__/go.sum @@ -1,15 +1,5 @@ github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= -github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181 h1:wwWMAG/Uu/layF1wu6dJiUej0zisaVQRfyTNqjJpxac= -github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181/go.mod h1:TCkoNn14Hgl+iVENr73GHaDVEuAg8KizH0oXaV2qMKs= -github.com/nesterow/dal/pkg/builder v0.0.0-20240820191021-7dcd046e6ca0 h1:S37CEWRRLdeLA3V8J4XEa8CmmO4Z+auifYf1GfNRo64= -github.com/nesterow/dal/pkg/builder v0.0.0-20240820191021-7dcd046e6ca0/go.mod h1:EmozdaZEPYE2+4qpK1cw0eIS8yx9LcrVRKstvq2dgCg= -github.com/nesterow/dal/pkg/filters v0.0.0-20240820191021-7dcd046e6ca0 h1:2CDPDKwR+PSGCI6dMbSqI5Zf8Ugg9nY2CMN87BDZ1Xg= -github.com/nesterow/dal/pkg/filters v0.0.0-20240820191021-7dcd046e6ca0/go.mod h1:1wKJbE/13P756EjkLU8xzbdhR+dJYfn6Vlw4J2jFJaA= -github.com/nesterow/dal/pkg/proto v0.0.0-20240820192515-7a408c994181 h1:HcGM9fagbbGa0r/6TRrg+lzRbW79sOr6yTczYkO1miw= -github.com/nesterow/dal/pkg/proto v0.0.0-20240820192515-7a408c994181/go.mod h1:MUS8KEmlNqjUuhNyK4TOkUwjT9893jmNm++ukVz2hzU= -github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181 h1:b/D2uq18D6CzAh+NUyD1cM7s/q/aQZEpXy57iKyzg8k= -github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181/go.mod h1:0XWmrxZfyoEAZoCOxP3quEOP7ZNK2Lhvtpeux8C74mw= github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 h1:jYi87L8j62qkXzaYHAQAhEapgukhenIMZRBKTNRLHJ4= github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= diff --git a/pkg/__test__/proto_test.go b/pkg/__test__/proto_test.go index 43318ff..41a4bd1 100644 --- a/pkg/__test__/proto_test.go +++ b/pkg/__test__/proto_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/nesterow/dal/pkg/adapter" - "github.com/nesterow/dal/pkg/proto" + "l12.xyz/x/dal/pkg/adapter" + "l12.xyz/x/dal/pkg/proto" _ "github.com/mattn/go-sqlite3" ) diff --git a/pkg/adapter/CommonDialect.go b/pkg/adapter/CommonDialect.go index 9d82c55..73299a9 100644 --- a/pkg/adapter/CommonDialect.go +++ b/pkg/adapter/CommonDialect.go @@ -4,7 +4,7 @@ import ( "strconv" "strings" - "github.com/nesterow/dal/pkg/utils" + "l12.xyz/x/dal/pkg/utils" ) /* diff --git a/pkg/adapter/go.mod b/pkg/adapter/go.mod deleted file mode 100644 index f232263..0000000 --- a/pkg/adapter/go.mod +++ /dev/null @@ -1,7 +0,0 @@ -module github.com/nesterow/dal/pkg/adapter - -go 1.22.6 - -require github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181 - -require github.com/pkg/errors v0.9.1 // indirect diff --git a/pkg/adapter/go.sum b/pkg/adapter/go.sum deleted file mode 100644 index 106c5c8..0000000 --- a/pkg/adapter/go.sum +++ /dev/null @@ -1,4 +0,0 @@ -github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181 h1:b/D2uq18D6CzAh+NUyD1cM7s/q/aQZEpXy57iKyzg8k= -github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181/go.mod h1:0XWmrxZfyoEAZoCOxP3quEOP7ZNK2Lhvtpeux8C74mw= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/pkg/builder/convert_conflict.go b/pkg/builder/convert_conflict.go index 00d6d60..7bed277 100644 --- a/pkg/builder/convert_conflict.go +++ b/pkg/builder/convert_conflict.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/nesterow/dal/pkg/utils" + "l12.xyz/x/dal/pkg/utils" ) func convertConflict(ctx Dialect, fields ...string) string { diff --git a/pkg/builder/convert_find.go b/pkg/builder/convert_find.go index ec77075..8e96dbe 100644 --- a/pkg/builder/convert_find.go +++ b/pkg/builder/convert_find.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/nesterow/dal/pkg/filters" + "l12.xyz/x/dal/pkg/filters" ) type Values = []interface{} diff --git a/pkg/builder/convert_group.go b/pkg/builder/convert_group.go index 79d6aab..8107643 100644 --- a/pkg/builder/convert_group.go +++ b/pkg/builder/convert_group.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/nesterow/dal/pkg/utils" + "l12.xyz/x/dal/pkg/utils" ) func convertGroup(ctx Dialect, keys []string) string { diff --git a/pkg/builder/go.mod b/pkg/builder/go.mod deleted file mode 100644 index 6f6b17d..0000000 --- a/pkg/builder/go.mod +++ /dev/null @@ -1,11 +0,0 @@ -module github.com/nesterow/dal/pkg/builder - -go 1.22.6 - -require ( - github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181 - github.com/nesterow/dal/pkg/filters v0.0.0-20240820192515-7a408c994181 - github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181 -) - -require github.com/pkg/errors v0.9.1 // indirect diff --git a/pkg/builder/go.sum b/pkg/builder/go.sum deleted file mode 100644 index 68c2384..0000000 --- a/pkg/builder/go.sum +++ /dev/null @@ -1,8 +0,0 @@ -github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181 h1:wwWMAG/Uu/layF1wu6dJiUej0zisaVQRfyTNqjJpxac= -github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181/go.mod h1:TCkoNn14Hgl+iVENr73GHaDVEuAg8KizH0oXaV2qMKs= -github.com/nesterow/dal/pkg/filters v0.0.0-20240820192515-7a408c994181 h1:Vi6v1T68/oayGfoX8k/FpgvfMsCUqxMsowTHKXY70VE= -github.com/nesterow/dal/pkg/filters v0.0.0-20240820192515-7a408c994181/go.mod h1:6aUr+2+D+184FTSXgziW6r1bvcKTY+Ie3TW4iET0g6I= -github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181 h1:b/D2uq18D6CzAh+NUyD1cM7s/q/aQZEpXy57iKyzg8k= -github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181/go.mod h1:0XWmrxZfyoEAZoCOxP3quEOP7ZNK2Lhvtpeux8C74mw= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/pkg/builder/types.go b/pkg/builder/types.go index fcb848a..2f4da06 100644 --- a/pkg/builder/types.go +++ b/pkg/builder/types.go @@ -1,8 +1,8 @@ package builder import ( - "github.com/nesterow/dal/pkg/adapter" - "github.com/nesterow/dal/pkg/filters" + "l12.xyz/x/dal/pkg/adapter" + "l12.xyz/x/dal/pkg/filters" ) type RawSql = map[string]interface{} diff --git a/pkg/facade/SQLIteShared.go b/pkg/facade/SQLIteShared.go index 4ea2c30..0fb96b8 100644 --- a/pkg/facade/SQLIteShared.go +++ b/pkg/facade/SQLIteShared.go @@ -4,8 +4,8 @@ import ( "database/sql" "reflect" - "github.com/nesterow/dal/pkg/adapter" - "github.com/nesterow/dal/pkg/proto" + "l12.xyz/x/dal/pkg/adapter" + "l12.xyz/x/dal/pkg/proto" ) var db adapter.DBAdapter diff --git a/pkg/facade/SQLiteServer.go b/pkg/facade/SQLiteServer.go index ff59105..e21d836 100644 --- a/pkg/facade/SQLiteServer.go +++ b/pkg/facade/SQLiteServer.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "github.com/nesterow/dal/pkg/adapter" - "github.com/nesterow/dal/pkg/handler" + "l12.xyz/x/dal/pkg/adapter" + "l12.xyz/x/dal/pkg/handler" ) type SQLiteServer struct { diff --git a/pkg/facade/go.mod b/pkg/facade/go.mod deleted file mode 100644 index f445755..0000000 --- a/pkg/facade/go.mod +++ /dev/null @@ -1,18 +0,0 @@ -module github.com/nesterow/dal/pkg/facade - -go 1.22.6 - -require ( - github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181 - github.com/nesterow/dal/pkg/handler v0.0.0-20240823050743-ae641b7ee894 - github.com/nesterow/dal/pkg/proto v0.0.0-20240820230328-f8e28d2a2e42 -) - -require ( - github.com/nesterow/dal/pkg/builder v0.0.0-20240820192515-7a408c994181 // indirect - github.com/nesterow/dal/pkg/filters v0.0.0-20240820192515-7a408c994181 // indirect - github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181 // indirect - github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect - github.com/pkg/errors v0.9.1 // indirect - github.com/tinylib/msgp v1.2.0 // indirect -) diff --git a/pkg/facade/go.sum b/pkg/facade/go.sum deleted file mode 100644 index 3db7445..0000000 --- a/pkg/facade/go.sum +++ /dev/null @@ -1,20 +0,0 @@ -github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= -github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= -github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181 h1:wwWMAG/Uu/layF1wu6dJiUej0zisaVQRfyTNqjJpxac= -github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181/go.mod h1:TCkoNn14Hgl+iVENr73GHaDVEuAg8KizH0oXaV2qMKs= -github.com/nesterow/dal/pkg/builder v0.0.0-20240820192515-7a408c994181 h1:Ex2XjUB7o4IRSWcgh8qgac8JQ2gbn6M+jUfom4zZccY= -github.com/nesterow/dal/pkg/builder v0.0.0-20240820192515-7a408c994181/go.mod h1:mVt1QOFEeGLdi+ZbMLzVw3LVtFB2tYWxZRouhkOThJU= -github.com/nesterow/dal/pkg/filters v0.0.0-20240820192515-7a408c994181 h1:Vi6v1T68/oayGfoX8k/FpgvfMsCUqxMsowTHKXY70VE= -github.com/nesterow/dal/pkg/filters v0.0.0-20240820192515-7a408c994181/go.mod h1:6aUr+2+D+184FTSXgziW6r1bvcKTY+Ie3TW4iET0g6I= -github.com/nesterow/dal/pkg/handler v0.0.0-20240823050743-ae641b7ee894 h1:nPlCoVDXzpFGX4cmInLOKoAB7cTpcnjGDevCahF1Db8= -github.com/nesterow/dal/pkg/handler v0.0.0-20240823050743-ae641b7ee894/go.mod h1:aUueTAR2yb5ZCcXqgm4euJTTlScTCqTyT187oNQN5zY= -github.com/nesterow/dal/pkg/proto v0.0.0-20240820230328-f8e28d2a2e42 h1:bUnae1O6MEYWEZepd2ir3iSkydfX9/8DLRoH0U+EWHM= -github.com/nesterow/dal/pkg/proto v0.0.0-20240820230328-f8e28d2a2e42/go.mod h1:YGGcF6rUmoknTFR3csZyLjJhpuFBw9S+DQa61P8B8kY= -github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181 h1:b/D2uq18D6CzAh+NUyD1cM7s/q/aQZEpXy57iKyzg8k= -github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181/go.mod h1:0XWmrxZfyoEAZoCOxP3quEOP7ZNK2Lhvtpeux8C74mw= -github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 h1:jYi87L8j62qkXzaYHAQAhEapgukhenIMZRBKTNRLHJ4= -github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/tinylib/msgp v1.2.0 h1:0uKB/662twsVBpYUPbokj4sTSKhWFKB7LopO2kWK8lY= -github.com/tinylib/msgp v1.2.0/go.mod h1:2vIGs3lcUo8izAATNobrCHevYZC/LMsJtw4JPiYPHro= diff --git a/pkg/filters/Between.go b/pkg/filters/Between.go index 243a3a6..45ada79 100644 --- a/pkg/filters/Between.go +++ b/pkg/filters/Between.go @@ -3,7 +3,7 @@ package filters import ( "fmt" - "github.com/nesterow/dal/pkg/utils" + "l12.xyz/x/dal/pkg/utils" ) type Between struct { diff --git a/pkg/filters/In.go b/pkg/filters/In.go index f178989..af362ce 100644 --- a/pkg/filters/In.go +++ b/pkg/filters/In.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/nesterow/dal/pkg/utils" + "l12.xyz/x/dal/pkg/utils" ) type In struct { diff --git a/pkg/filters/NotBetween.go b/pkg/filters/NotBetween.go index 75bf0b9..332c14a 100644 --- a/pkg/filters/NotBetween.go +++ b/pkg/filters/NotBetween.go @@ -3,7 +3,7 @@ package filters import ( "fmt" - "github.com/nesterow/dal/pkg/utils" + "l12.xyz/x/dal/pkg/utils" ) type NotBetween struct { diff --git a/pkg/filters/NotIn.go b/pkg/filters/NotIn.go index 532ae4d..40279a0 100644 --- a/pkg/filters/NotIn.go +++ b/pkg/filters/NotIn.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/nesterow/dal/pkg/utils" + "l12.xyz/x/dal/pkg/utils" ) type NotIn struct { diff --git a/pkg/filters/go.mod b/pkg/filters/go.mod deleted file mode 100644 index 0f2aa2a..0000000 --- a/pkg/filters/go.mod +++ /dev/null @@ -1,10 +0,0 @@ -module github.com/nesterow/dal/pkg/filters - -go 1.22.6 - -require github.com/pkg/errors v0.9.1 // indirect - -require ( - github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181 - github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181 -) diff --git a/pkg/filters/go.sum b/pkg/filters/go.sum deleted file mode 100644 index 785a8a1..0000000 --- a/pkg/filters/go.sum +++ /dev/null @@ -1,6 +0,0 @@ -github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181 h1:wwWMAG/Uu/layF1wu6dJiUej0zisaVQRfyTNqjJpxac= -github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181/go.mod h1:TCkoNn14Hgl+iVENr73GHaDVEuAg8KizH0oXaV2qMKs= -github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181 h1:b/D2uq18D6CzAh+NUyD1cM7s/q/aQZEpXy57iKyzg8k= -github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181/go.mod h1:0XWmrxZfyoEAZoCOxP3quEOP7ZNK2Lhvtpeux8C74mw= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/pkg/filters/types.go b/pkg/filters/types.go index 84e5a2a..d880cff 100644 --- a/pkg/filters/types.go +++ b/pkg/filters/types.go @@ -1,6 +1,6 @@ package filters -import "github.com/nesterow/dal/pkg/adapter" +import "l12.xyz/x/dal/pkg/adapter" type DialectOpts = adapter.DialectOpts type Dialect = adapter.Dialect diff --git a/pkg/filters/unit_test.go b/pkg/filters/unit_test.go index 5e66eba..2045fb8 100644 --- a/pkg/filters/unit_test.go +++ b/pkg/filters/unit_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/nesterow/dal/pkg/adapter" + "l12.xyz/x/dal/pkg/adapter" ) type SQLiteContext = adapter.CommonDialect diff --git a/pkg/handler/go.mod b/pkg/handler/go.mod deleted file mode 100644 index 166bb25..0000000 --- a/pkg/handler/go.mod +++ /dev/null @@ -1,22 +0,0 @@ -module github.com/nesterow/dal/pkg/handler - -go 1.22.6 - -require ( - github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181 - github.com/nesterow/dal/pkg/proto v0.0.0-20240820192515-7a408c994181 -) - -require ( - github.com/nesterow/dal/pkg/builder v0.0.0-20240820192515-7a408c994181 // indirect - github.com/nesterow/dal/pkg/filters v0.0.0-20240820192515-7a408c994181 // indirect - github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181 // indirect -) - -require ( - github.com/mattn/go-sqlite3 v1.14.22 - github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect - github.com/pkg/errors v0.9.1 // indirect - github.com/tinylib/msgp v1.2.0 // indirect - -) diff --git a/pkg/handler/go.sum b/pkg/handler/go.sum deleted file mode 100644 index 4aca4bf..0000000 --- a/pkg/handler/go.sum +++ /dev/null @@ -1,18 +0,0 @@ -github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= -github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= -github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181 h1:wwWMAG/Uu/layF1wu6dJiUej0zisaVQRfyTNqjJpxac= -github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181/go.mod h1:TCkoNn14Hgl+iVENr73GHaDVEuAg8KizH0oXaV2qMKs= -github.com/nesterow/dal/pkg/builder v0.0.0-20240820192515-7a408c994181 h1:Ex2XjUB7o4IRSWcgh8qgac8JQ2gbn6M+jUfom4zZccY= -github.com/nesterow/dal/pkg/builder v0.0.0-20240820192515-7a408c994181/go.mod h1:mVt1QOFEeGLdi+ZbMLzVw3LVtFB2tYWxZRouhkOThJU= -github.com/nesterow/dal/pkg/filters v0.0.0-20240820192515-7a408c994181 h1:Vi6v1T68/oayGfoX8k/FpgvfMsCUqxMsowTHKXY70VE= -github.com/nesterow/dal/pkg/filters v0.0.0-20240820192515-7a408c994181/go.mod h1:6aUr+2+D+184FTSXgziW6r1bvcKTY+Ie3TW4iET0g6I= -github.com/nesterow/dal/pkg/proto v0.0.0-20240820192515-7a408c994181 h1:HcGM9fagbbGa0r/6TRrg+lzRbW79sOr6yTczYkO1miw= -github.com/nesterow/dal/pkg/proto v0.0.0-20240820192515-7a408c994181/go.mod h1:MUS8KEmlNqjUuhNyK4TOkUwjT9893jmNm++ukVz2hzU= -github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181 h1:b/D2uq18D6CzAh+NUyD1cM7s/q/aQZEpXy57iKyzg8k= -github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181/go.mod h1:0XWmrxZfyoEAZoCOxP3quEOP7ZNK2Lhvtpeux8C74mw= -github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 h1:jYi87L8j62qkXzaYHAQAhEapgukhenIMZRBKTNRLHJ4= -github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/tinylib/msgp v1.2.0 h1:0uKB/662twsVBpYUPbokj4sTSKhWFKB7LopO2kWK8lY= -github.com/tinylib/msgp v1.2.0/go.mod h1:2vIGs3lcUo8izAATNobrCHevYZC/LMsJtw4JPiYPHro= diff --git a/pkg/handler/query_handler.go b/pkg/handler/query_handler.go index ddeb248..3d4f6bf 100644 --- a/pkg/handler/query_handler.go +++ b/pkg/handler/query_handler.go @@ -5,8 +5,8 @@ import ( "net/http" "reflect" - "github.com/nesterow/dal/pkg/adapter" - "github.com/nesterow/dal/pkg/proto" + "l12.xyz/x/dal/pkg/adapter" + "l12.xyz/x/dal/pkg/proto" ) /* diff --git a/pkg/handler/query_handler_test.go b/pkg/handler/query_handler_test.go index 2680bcd..6ec2c75 100644 --- a/pkg/handler/query_handler_test.go +++ b/pkg/handler/query_handler_test.go @@ -10,8 +10,8 @@ import ( _ "github.com/mattn/go-sqlite3" - "github.com/nesterow/dal/pkg/adapter" - "github.com/nesterow/dal/pkg/proto" + "l12.xyz/x/dal/pkg/adapter" + "l12.xyz/x/dal/pkg/proto" ) func TestQueryHandler(t *testing.T) { diff --git a/pkg/proto/go.mod b/pkg/proto/go.mod deleted file mode 100644 index a504c22..0000000 --- a/pkg/proto/go.mod +++ /dev/null @@ -1,14 +0,0 @@ -module github.com/nesterow/dal/pkg/proto - -go 1.22.6 - -require ( - github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181 - github.com/nesterow/dal/pkg/builder v0.0.0-20240820192515-7a408c994181 - github.com/nesterow/dal/pkg/filters v0.0.0-20240820192515-7a408c994181 // indirect - github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181 // indirect - github.com/pkg/errors v0.9.1 // indirect - github.com/tinylib/msgp v1.2.0 -) - -require github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect diff --git a/pkg/proto/go.sum b/pkg/proto/go.sum deleted file mode 100644 index 793c908..0000000 --- a/pkg/proto/go.sum +++ /dev/null @@ -1,14 +0,0 @@ -github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181 h1:wwWMAG/Uu/layF1wu6dJiUej0zisaVQRfyTNqjJpxac= -github.com/nesterow/dal/pkg/adapter v0.0.0-20240820192515-7a408c994181/go.mod h1:TCkoNn14Hgl+iVENr73GHaDVEuAg8KizH0oXaV2qMKs= -github.com/nesterow/dal/pkg/builder v0.0.0-20240820192515-7a408c994181 h1:Ex2XjUB7o4IRSWcgh8qgac8JQ2gbn6M+jUfom4zZccY= -github.com/nesterow/dal/pkg/builder v0.0.0-20240820192515-7a408c994181/go.mod h1:mVt1QOFEeGLdi+ZbMLzVw3LVtFB2tYWxZRouhkOThJU= -github.com/nesterow/dal/pkg/filters v0.0.0-20240820192515-7a408c994181 h1:Vi6v1T68/oayGfoX8k/FpgvfMsCUqxMsowTHKXY70VE= -github.com/nesterow/dal/pkg/filters v0.0.0-20240820192515-7a408c994181/go.mod h1:6aUr+2+D+184FTSXgziW6r1bvcKTY+Ie3TW4iET0g6I= -github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181 h1:b/D2uq18D6CzAh+NUyD1cM7s/q/aQZEpXy57iKyzg8k= -github.com/nesterow/dal/pkg/utils v0.0.0-20240820192515-7a408c994181/go.mod h1:0XWmrxZfyoEAZoCOxP3quEOP7ZNK2Lhvtpeux8C74mw= -github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 h1:jYi87L8j62qkXzaYHAQAhEapgukhenIMZRBKTNRLHJ4= -github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM= -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/tinylib/msgp v1.2.0 h1:0uKB/662twsVBpYUPbokj4sTSKhWFKB7LopO2kWK8lY= -github.com/tinylib/msgp v1.2.0/go.mod h1:2vIGs3lcUo8izAATNobrCHevYZC/LMsJtw4JPiYPHro= diff --git a/pkg/proto/request.go b/pkg/proto/request.go index bd028b1..6e5083b 100644 --- a/pkg/proto/request.go +++ b/pkg/proto/request.go @@ -6,8 +6,8 @@ import ( "slices" "strings" - "github.com/nesterow/dal/pkg/adapter" - "github.com/nesterow/dal/pkg/builder" + "l12.xyz/x/dal/pkg/adapter" + "l12.xyz/x/dal/pkg/builder" ) //go:generate msgp diff --git a/pkg/utils/go.mod b/pkg/utils/go.mod deleted file mode 100644 index a67142d..0000000 --- a/pkg/utils/go.mod +++ /dev/null @@ -1,5 +0,0 @@ -module github.com/nesterow/dal/pkg/utils - -go 1.22.6 - -require github.com/pkg/errors v0.9.1 diff --git a/pkg/utils/go.sum b/pkg/utils/go.sum deleted file mode 100644 index 7c401c3..0000000 --- a/pkg/utils/go.sum +++ /dev/null @@ -1,2 +0,0 @@ -github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=