[ref] refactor paths manually

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

View file

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

View file

@ -2,35 +2,33 @@ module binding
go 1.22.6 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 ( require (
github.com/mattn/go-sqlite3 v1.14.22 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 ( 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/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect
github.com/pkg/errors v0.9.1 // indirect github.com/pkg/errors v0.9.1 // indirect
github.com/tinylib/msgp v1.2.0 // 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
) )

View file

@ -2,29 +2,22 @@ module srv
go 1.22.6 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 ( require (
github.com/mattn/go-sqlite3 v1.14.22 github.com/mattn/go-sqlite3 v1.14.22
github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect
github.com/pkg/errors v0.9.1 // indirect github.com/nesterow/dal/pkg/adapter v0.0.0-20240820175837-f06ad4a34238
github.com/tinylib/msgp v1.2.0 // indirect github.com/nesterow/dal/pkg/handler v0.0.0-20240820175837-f06ad4a34238
pkg/builder v0.0.0 // indirect
pkg/filters v0.0.0 // indirect
pkg/proto v0.0.0 // indirect
pkg/utils v0.0.0 // indirect
) )

View file

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

24
go.mod
View file

@ -2,31 +2,11 @@ module github.com/nesterow/dal
go 1.22.6 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 require github.com/mattn/go-sqlite3 v1.14.22
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 ( 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/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect
github.com/pkg/errors v0.9.1 // indirect github.com/pkg/errors v0.9.1 // indirect
github.com/tinylib/msgp v1.2.0 // 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 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= 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= github.com/nesterow/dal/pkg/facade v0.0.0-20240820175837-f06ad4a34238 h1:nIEwY4wdzdS1M1xlF5FLdiyNtoMERcmJgGTQY8LDBhw=
pkg/facade v0.0.0-20240820142147-ae6799ca8e35/go.mod h1:pYqz2/d8sIHYVcmjgFlUpNivwBCCypCSCUBamjI7Y3A= 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 h1:jYi87L8j62qkXzaYHAQAhEapgukhenIMZRBKTNRLHJ4=
github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM= 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 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

View file

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

View file

@ -2,8 +2,8 @@ module github.com/nesterow/dal/pkg/adapter
go 1.22.6 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 require github.com/pkg/errors v0.9.1 // indirect

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -5,10 +5,10 @@ go 1.22.6
require github.com/pkg/errors v0.9.1 // indirect require github.com/pkg/errors v0.9.1 // indirect
require ( require (
pkg/adapter v0.0.0-00010101000000-000000000000 github.com/nesterow/dal/pkg/adapter v0.0.0-20240820175837-f06ad4a34238
pkg/utils v0.0.0-00010101000000-000000000000 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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -2,24 +2,18 @@ module github.com/nesterow/dal/pkg/proto
go 1.22.6 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 ( require (
pkg/adapter v0.0.0 github.com/nesterow/dal/pkg/adapter v0.0.0-20240820175837-f06ad4a34238
pkg/builder v0.0.0-00010101000000-000000000000 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/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 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
)

View file

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