x/dal
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

[ref] refactor paths manually

Browse source
This commit is contained in:
Anton Nesterov 2024-08-20 21:10:21 +02:00
parent f06ad4a342
commit 7dcd046e6c
No known key found for this signature in database
GPG key ID: 59121E8AE2851FB5
28 changed files with 104 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
binding/dal.go
View file

@ -4,7 +4,7 @@ import "C"
import (
"strings"
"pkg/facade"
"github.com/nesterow/dal/pkg/facade"
_ "github.com/mattn/go-sqlite3"
)

30
binding/go.mod
View file

@ -2,35 +2,33 @@ module binding
go 1.22.6
replace pkg/filters v0.0.0 => ../pkg/filters
replace github.com/nesterow/dal/pkg/adapter => ../pkg/adapter
replace pkg/builder v0.0.0 => ../pkg/builder
replace github.com/nesterow/dal/pkg/proto => ../pkg/proto
replace pkg/handler v0.0.0 => ../pkg/handler
replace github.com/nesterow/dal/pkg/builder => ../pkg/builder
require pkg/adapter v0.0.0 // indirect
replace github.com/nesterow/dal/pkg/filters => ../pkg/filters
replace pkg/adapter v0.0.0 => ../pkg/adapter
replace github.com/nesterow/dal/pkg/utils => ../pkg/utils
replace pkg/utils v0.0.0 => ../pkg/utils
replace github.com/nesterow/dal/pkg/handler => ../pkg/handler
replace pkg/proto v0.0.0 => ../pkg/proto
replace github.com/nesterow/dal/pkg/facade => ../pkg/facade
require (
github.com/mattn/go-sqlite3 v1.14.22
pkg/facade v0.0.0
github.com/nesterow/dal/pkg/facade v0.0.0-20240820175837-f06ad4a34238
)
require pkg/handler v0.0.0 // indirect
replace pkg/facade v0.0.0 => ../pkg/facade
require (
github.com/nesterow/dal/pkg/adapter v0.0.0-20240820175837-f06ad4a34238 // indirect
github.com/nesterow/dal/pkg/builder v0.0.0-20240820175837-f06ad4a34238 // indirect
github.com/nesterow/dal/pkg/filters v0.0.0-20240820175837-f06ad4a34238 // indirect
github.com/nesterow/dal/pkg/handler v0.0.0-20240820175837-f06ad4a34238 // indirect
github.com/nesterow/dal/pkg/proto v0.0.0-20240820175837-f06ad4a34238 // indirect
github.com/nesterow/dal/pkg/utils v0.0.0-20240820175837-f06ad4a34238 // 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
pkg/builder v0.0.0 // indirect
pkg/filters v0.0.0 // indirect
pkg/proto v0.0.0 // indirect
pkg/utils v0.0.0 // indirect
)

23
dal/__test__/srv/go.mod
View file

@ -2,29 +2,22 @@ module srv
go 1.22.6
replace pkg/filters v0.0.0 => ../../../pkg/filters
replace github.com/nesterow/dal/pkg/adapter => ./adapter
replace pkg/builder v0.0.0 => ../../../pkg/builder
replace github.com/nesterow/dal/pkg/proto => ../proto
require pkg/adapter v0.0.0
replace github.com/nesterow/dal/pkg/builder => ../builder
replace pkg/adapter v0.0.0 => ../../../pkg/adapter
replace github.com/nesterow/dal/pkg/filters => ../filters
replace pkg/utils v0.0.0 => ../../../pkg/utils
replace github.com/nesterow/dal/pkg/utils => ../utils
replace pkg/proto v0.0.0 => ../../../pkg/proto
replace github.com/nesterow/dal/pkg/handler => ../handler
require pkg/handler v0.0.0
replace pkg/handler v0.0.0 => ../../../pkg/handler
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
pkg/builder v0.0.0 // indirect
pkg/filters v0.0.0 // indirect
pkg/proto v0.0.0 // indirect
pkg/utils v0.0.0 // indirect
github.com/nesterow/dal/pkg/adapter v0.0.0-20240820175837-f06ad4a34238
github.com/nesterow/dal/pkg/handler v0.0.0-20240820175837-f06ad4a34238
)

4
dal/__test__/srv/main.go
View file

@ -7,8 +7,8 @@ import (
"os/signal"
"syscall"
"pkg/adapter"
"pkg/handler"
"github.com/nesterow/dal/pkg/adapter"
"github.com/nesterow/dal/pkg/handler"
_ "github.com/mattn/go-sqlite3"
)

24
go.mod
View file

@ -2,31 +2,11 @@ module github.com/nesterow/dal
go 1.22.6
replace pkg/adapter => ./pkg/adapter
require github.com/nesterow/dal/pkg/facade v0.0.0-20240820175837-f06ad4a34238
replace pkg/builder => ./pkg/builder
replace pkg/filters => ./pkg/filters
replace pkg/utils => ./pkg/utils
replace pkg/handler => ./pkg/handler
replace pkg/proto => ./pkg/proto
require github.com/nesterow/dal/pkg/facade v0.0.0-20240820173401-37a82c835b34
require github.com/mattn/go-sqlite3 v1.14.22
require (
github.com/mattn/go-sqlite3 v1.14.22
)
require (
pkg/adapter v0.0.0 // indirect
pkg/builder v0.0.0 // indirect
pkg/filters v0.0.0 // indirect
pkg/handler v0.0.0-00010101000000-000000000000 // indirect
pkg/proto v0.0.0 // indirect
pkg/utils v0.0.0 // 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

4
go.sum
View file

@ -1,7 +1,7 @@
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=
pkg/facade v0.0.0-20240820142147-ae6799ca8e35 h1:r/itSeN7w1MChNw9uirGtvI7jM2OITrbyBmLjpRqIqs=
pkg/facade v0.0.0-20240820142147-ae6799ca8e35/go.mod h1:pYqz2/d8sIHYVcmjgFlUpNivwBCCypCSCUBamjI7Y3A=
github.com/nesterow/dal/pkg/facade v0.0.0-20240820175837-f06ad4a34238 h1:nIEwY4wdzdS1M1xlF5FLdiyNtoMERcmJgGTQY8LDBhw=
github.com/nesterow/dal/pkg/facade v0.0.0-20240820175837-f06ad4a34238/go.mod h1:1g86CWgTuPhGQlHeH/mPj6Ze+b69iqKjaUX0+j6yrnE=
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=

2
pkg/adapter/CommonDialect.go
View file

@ -4,7 +4,7 @@ import (
"strconv"
"strings"
utils "pkg/utils"
"github.com/nesterow/dal/pkg/utils"
)
/*

4
pkg/adapter/go.mod
View file

@ -2,8 +2,8 @@ module github.com/nesterow/dal/pkg/adapter
go 1.22.6
require pkg/utils v0.0.0-00010101000000-000000000000
replace github.com/nesterow/dal/pkg/utils => ../utils
replace pkg/utils => ../utils
require github.com/nesterow/dal/pkg/utils v0.0.0-20240820175837-f06ad4a34238
require github.com/pkg/errors v0.9.1 // indirect

2
pkg/builder/convert_conflict.go
View file

@ -4,7 +4,7 @@ import (
"fmt"
"strings"
utils "pkg/utils"
"github.com/nesterow/dal/pkg/utils"
)
func convertConflict(ctx Dialect, fields ...string) string {

2
pkg/builder/convert_find.go
View file

@ -4,7 +4,7 @@ import (
"fmt"
"strings"
filters "pkg/filters"
"github.com/nesterow/dal/pkg/filters"
)
type Values = []interface{}

2
pkg/builder/convert_group.go
View file

@ -4,7 +4,7 @@ import (
"fmt"
"strings"
"pkg/utils"
"github.com/nesterow/dal/pkg/utils"
)
func convertGroup(ctx Dialect, keys []string) string {

18
pkg/builder/go.mod
View file

@ -2,16 +2,16 @@ module github.com/nesterow/dal/pkg/builder
go 1.22.6
replace github.com/nesterow/dal/pkg/utils => ../utils
replace github.com/nesterow/dal/pkg/filters => ../filters
replace github.com/nesterow/dal/pkg/adapter => ../adapter
require (
pkg/adapter v0.0.0
pkg/filters v0.0.0-00010101000000-000000000000
pkg/utils v0.0.0
github.com/nesterow/dal/pkg/adapter v0.0.0-20240820175837-f06ad4a34238
github.com/nesterow/dal/pkg/filters v0.0.0-20240820175837-f06ad4a34238
github.com/nesterow/dal/pkg/utils v0.0.0-20240820175837-f06ad4a34238
)
replace pkg/utils => ../utils
require github.com/pkg/errors v0.9.1 // indirect
replace pkg/filters => ../filters
replace pkg/adapter => ../adapter

4
pkg/builder/types.go
View file

@ -1,8 +1,8 @@
package builder
import (
adapter "pkg/adapter"
filters "pkg/filters"
"github.com/nesterow/dal/pkg/adapter"
"github.com/nesterow/dal/pkg/filters"
)
type RawSql = map[string]interface{}

4
pkg/facade/SQLIteShared.go
View file

@ -4,8 +4,8 @@ import (
"log"
"reflect"
"pkg/adapter"
"pkg/proto"
"github.com/nesterow/dal/pkg/adapter"
"github.com/nesterow/dal/pkg/proto"
)
var db adapter.DBAdapter

4
pkg/facade/SQLiteServer.go
View file

@ -6,8 +6,8 @@ import (
"os"
"strings"
"pkg/adapter"
"pkg/handler"
"github.com/nesterow/dal/pkg/adapter"
"github.com/nesterow/dal/pkg/handler"
)
type SQLiteServer struct {

32
pkg/facade/go.mod
View file

@ -2,29 +2,29 @@ module github.com/nesterow/dal/pkg/facade
go 1.22.6
replace pkg/filters => ../filters
replace github.com/nesterow/dal/pkg/adapter => ../adapter
replace pkg/builder => ../builder
replace github.com/nesterow/dal/pkg/proto => ../proto
replace github.com/nesterow/dal/pkg/builder => ../builder
replace github.com/nesterow/dal/pkg/filters => ../filters
replace github.com/nesterow/dal/pkg/utils => ../utils
replace github.com/nesterow/dal/pkg/handler => ../handler
require (
pkg/adapter v0.0.0
pkg/handler v0.0.0-00010101000000-000000000000
pkg/proto v0.0.0
github.com/nesterow/dal/pkg/adapter v0.0.0-20240820175837-f06ad4a34238
github.com/nesterow/dal/pkg/handler v0.0.0-20240820175837-f06ad4a34238
github.com/nesterow/dal/pkg/proto v0.0.0-20240820175837-f06ad4a34238
)
replace pkg/adapter => ../adapter
replace pkg/utils => ../utils
require (
pkg/builder v0.0.0 // indirect
pkg/filters v0.0.0 // indirect
pkg/utils v0.0.0 // indirect
github.com/nesterow/dal/pkg/builder v0.0.0-20240820175837-f06ad4a34238 // indirect
github.com/nesterow/dal/pkg/filters v0.0.0-20240820175837-f06ad4a34238 // indirect
github.com/nesterow/dal/pkg/utils v0.0.0-20240820175837-f06ad4a34238 // 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
)
replace pkg/proto => ../proto
replace pkg/handler => ../handler

2
pkg/filters/Between.go
View file

@ -3,7 +3,7 @@ package filters
import (
"fmt"
"pkg/utils"
"github.com/nesterow/dal/pkg/utils"
)
type Between struct {

2
pkg/filters/In.go
View file

@ -4,7 +4,7 @@ import (
"fmt"
"strings"
"pkg/utils"
"github.com/nesterow/dal/pkg/utils"
)
type In struct {

2
pkg/filters/NotBetween.go
View file

@ -3,7 +3,7 @@ package filters
import (
"fmt"
"pkg/utils"
"github.com/nesterow/dal/pkg/utils"
)
type NotBetween struct {

2
pkg/filters/NotIn.go
View file

@ -4,7 +4,7 @@ import (
"fmt"
"strings"
"pkg/utils"
"github.com/nesterow/dal/pkg/utils"
)
type NotIn struct {

8
pkg/filters/go.mod
View file

@ -5,10 +5,10 @@ go 1.22.6
require github.com/pkg/errors v0.9.1 // indirect
require (
pkg/adapter v0.0.0-00010101000000-000000000000
pkg/utils v0.0.0-00010101000000-000000000000
github.com/nesterow/dal/pkg/adapter v0.0.0-20240820175837-f06ad4a34238
github.com/nesterow/dal/pkg/utils v0.0.0-20240820175837-f06ad4a34238
)
replace pkg/utils => ../utils
replace github.com/nesterow/dal/pkg/utils => ../utils
replace pkg/adapter => ../adapter
replace github.com/nesterow/dal/pkg/adapter => ../adapter

2
pkg/filters/types.go
View file

@ -1,6 +1,6 @@
package filters
import "pkg/adapter"
import "github.com/nesterow/dal/pkg/adapter"
type DialectOpts = adapter.DialectOpts
type Dialect = adapter.Dialect

2
pkg/filters/unit_test.go
View file

@ -4,7 +4,7 @@ import (
"fmt"
"testing"
adapter "pkg/adapter"
"github.com/nesterow/dal/pkg/adapter"
)
type SQLiteContext = adapter.CommonDialect

26
pkg/handler/go.mod
View file

@ -2,27 +2,27 @@ module github.com/nesterow/dal/pkg/handler
go 1.22.6
replace pkg/filters => ../filters
replace github.com/nesterow/dal/pkg/adapter => ../adapter
replace pkg/builder => ../builder
replace github.com/nesterow/dal/pkg/proto => ../proto
replace github.com/nesterow/dal/pkg/builder => ../builder
replace github.com/nesterow/dal/pkg/filters => ../filters
replace github.com/nesterow/dal/pkg/utils => ../utils
require (
pkg/adapter v0.0.0
pkg/proto v0.0.0-00010101000000-000000000000
github.com/nesterow/dal/pkg/adapter v0.0.0-20240820175837-f06ad4a34238
github.com/nesterow/dal/pkg/proto v0.0.0-20240820175837-f06ad4a34238
)
require (
pkg/builder v0.0.0 // indirect
pkg/filters v0.0.0 // indirect
pkg/utils v0.0.0 // indirect
github.com/nesterow/dal/pkg/builder v0.0.0-20240820175837-f06ad4a34238 // indirect
github.com/nesterow/dal/pkg/filters v0.0.0-20240820175837-f06ad4a34238 // indirect
github.com/nesterow/dal/pkg/utils v0.0.0-20240820175837-f06ad4a34238 // indirect
)
replace pkg/adapter => ../adapter
replace pkg/utils => ../utils
replace pkg/proto => ../proto
require (
github.com/mattn/go-sqlite3 v1.14.22
github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect

4
pkg/handler/query_handler.go
View file

@ -5,8 +5,8 @@ import (
"net/http"
"reflect"
"pkg/adapter"
"pkg/proto"
"github.com/nesterow/dal/pkg/adapter"
"github.com/nesterow/dal/pkg/proto"
)
/*

4
pkg/handler/query_handler_test.go
View file

@ -10,8 +10,8 @@ import (
_ "github.com/mattn/go-sqlite3"
"pkg/adapter"
"pkg/proto"
"github.com/nesterow/dal/pkg/adapter"
"github.com/nesterow/dal/pkg/proto"
)
func TestQueryHandler(t *testing.T) {

24
pkg/proto/go.mod
View file

@ -2,24 +2,18 @@ module github.com/nesterow/dal/pkg/proto
go 1.22.6
replace pkg/builder => ../builder
replace github.com/nesterow/dal/pkg/builder => ../builder
replace github.com/nesterow/dal/pkg/adapter => ../adapter
replace github.com/nesterow/dal/pkg/filters => ../filters
replace github.com/nesterow/dal/pkg/utils => ../utils
require (
pkg/adapter v0.0.0
pkg/builder v0.0.0-00010101000000-000000000000
github.com/nesterow/dal/pkg/adapter v0.0.0-20240820175837-f06ad4a34238
github.com/nesterow/dal/pkg/builder v0.0.0-20240820175837-f06ad4a34238
github.com/nesterow/dal/pkg/filters v0.0.0-20240820175837-f06ad4a34238
github.com/nesterow/dal/pkg/utils v0.0.0-20240820175837-f06ad4a34238
github.com/tinylib/msgp v1.2.0
github.com/pkg/errors v0.9.1 // indirect
)
require github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect
replace pkg/utils => ../utils
replace pkg/adapter => ../adapter
replace pkg/filters => ../filters
require (
pkg/filters v0.0.0-00010101000000-000000000000 // indirect
pkg/utils v0.0.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
)

4
pkg/proto/request.go
View file

@ -6,8 +6,8 @@ import (
"slices"
"strings"
"pkg/adapter"
"pkg/builder"
"github.com/nesterow/dal/pkg/adapter"
"github.com/nesterow/dal/pkg/builder"
)
//go:generate msgp