Merge pull request #20 from RyougiNevermore/master

update cmd mod
pharosnet · Aug 5, 2020 · b7967fb · b7967fb
2 parents 4286eff + 83990e5
commit b7967fb
Show file tree

Hide file tree

Showing 31 changed files with 40 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -107,7 +107,7 @@ tx.Commit()
 ```
 ## Code Generates
 ### Install dalc 
-`go get -u github.com/pharosnet/dalc/cmd/dalc/v2`
+`go get -u github.com/pharosnet/dalc/v2/cmd/dalc`
 ### Write sql schema files
 Write sql schema files in some folder, such as schema/, and foo.sql in this folder.
 ```sql

diff --git a/cmd/dalc/go.mod b/cmd/dalc/go.mod
@@ -1,4 +1,4 @@
-module github.com/pharosnet/dalc/v2/cmd/dalc/v2
+module github.com/pharosnet/dalc/v2/cmd/dalc
 
 go 1.14
 

diff --git a/cmd/dalc/internal/entry/query.go b/cmd/dalc/internal/entry/query.go
@@ -4,7 +4,7 @@ import (
  "fmt"
  "strings"
 
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/parser/commons"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/parser/commons"
 )
 
 const (

diff --git a/cmd/dalc/internal/generates/file.go b/cmd/dalc/internal/generates/file.go
@@ -2,7 +2,7 @@ package generates
 
 import (
  "fmt"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/logs"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/logs"
  "go/format"
  "io/ioutil"
  "os"

diff --git a/cmd/dalc/internal/generates/generate.go b/cmd/dalc/internal/generates/generate.go
@@ -1,7 +1,7 @@
 package generates
 
 import (
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/entry"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/entry"
  "path/filepath"
 )
 

diff --git a/cmd/dalc/internal/generates/query.go b/cmd/dalc/internal/generates/query.go
@@ -3,8 +3,8 @@ package generates
 import (
  "bytes"
  "fmt"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/entry"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/parser/commons"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/entry"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/parser/commons"
  "strings"
  "text/template"
 )

diff --git a/cmd/dalc/internal/generates/table.go b/cmd/dalc/internal/generates/table.go
@@ -3,8 +3,8 @@ package generates
 import (
  "bytes"
  "fmt"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/entry"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/parser/commons"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/entry"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/parser/commons"
  "strings"
  "text/template"
 )

diff --git a/cmd/dalc/internal/generates/template.go b/cmd/dalc/internal/generates/template.go
@@ -1,6 +1,6 @@
 package generates
 
-import "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/entry"
+import "github.com/pharosnet/dalc/v2/cmd/dalc/internal/entry"
 
 type TemplateData struct {
  Package string

diff --git a/cmd/dalc/internal/parser/commons/strings_test.go b/cmd/dalc/internal/parser/commons/strings_test.go
@@ -1,7 +1,7 @@
 package commons_test
 
 import (
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/parser/commons"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/parser/commons"
  "testing"
 )
 

diff --git a/cmd/dalc/internal/parser/commons/words_test.go b/cmd/dalc/internal/parser/commons/words_test.go
@@ -1,7 +1,7 @@
 package commons_test
 
 import (
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/parser/commons"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/parser/commons"
  "testing"
 )
 

diff --git a/cmd/dalc/internal/parser/mysql/change.go b/cmd/dalc/internal/parser/mysql/change.go
@@ -1,6 +1,6 @@
 package mysql
 
-import "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/entry"
+import "github.com/pharosnet/dalc/v2/cmd/dalc/internal/entry"
 
 const (
  TableDropChangeKind = "DROP TABLE"

diff --git a/cmd/dalc/internal/parser/mysql/parse_query.go b/cmd/dalc/internal/parser/mysql/parse_query.go
@@ -2,8 +2,8 @@ package mysql
 
 import (
  "fmt"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/entry"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/parser/commons"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/entry"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/parser/commons"
  "github.com/vitessio/vitess/go/vt/sqlparser"
  "reflect"
  "strings"

diff --git a/cmd/dalc/internal/parser/mysql/parse_query_delete.go b/cmd/dalc/internal/parser/mysql/parse_query_delete.go
@@ -2,7 +2,7 @@ package mysql
 
 import (
  "fmt"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/entry"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/entry"
  "github.com/vitessio/vitess/go/vt/sqlparser"
 )
 

diff --git a/cmd/dalc/internal/parser/mysql/parse_query_delete_test.go b/cmd/dalc/internal/parser/mysql/parse_query_delete_test.go
@@ -1,7 +1,7 @@
 package mysql_test
 
 import (
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/parser/mysql"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/parser/mysql"
  "io/ioutil"
  "os"
  "path/filepath"

diff --git a/cmd/dalc/internal/parser/mysql/parse_query_exprs.go b/cmd/dalc/internal/parser/mysql/parse_query_exprs.go
@@ -1,7 +1,7 @@
 package mysql
 
 import (
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/entry"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/entry"
  "github.com/vitessio/vitess/go/vt/sqlparser"
 )
 

diff --git a/cmd/dalc/internal/parser/mysql/parse_query_insert.go b/cmd/dalc/internal/parser/mysql/parse_query_insert.go
@@ -2,7 +2,7 @@ package mysql
 
 import (
  "fmt"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/entry"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/entry"
  "github.com/vitessio/vitess/go/vt/sqlparser"
  "reflect"
 )

diff --git a/cmd/dalc/internal/parser/mysql/parse_query_insert_test.go b/cmd/dalc/internal/parser/mysql/parse_query_insert_test.go
@@ -1,7 +1,7 @@
 package mysql_test
 
 import (
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/parser/mysql"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/parser/mysql"
  "io/ioutil"
  "os"
  "path/filepath"

diff --git a/cmd/dalc/internal/parser/mysql/parse_query_select.go b/cmd/dalc/internal/parser/mysql/parse_query_select.go
@@ -2,7 +2,7 @@ package mysql
 
 import (
  "fmt"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/entry"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/entry"
  "github.com/vitessio/vitess/go/vt/sqlparser"
  "reflect"
 )

diff --git a/cmd/dalc/internal/parser/mysql/parse_query_select_limit.go b/cmd/dalc/internal/parser/mysql/parse_query_select_limit.go
@@ -1,7 +1,7 @@
 package mysql
 
 import (
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/entry"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/entry"
  "github.com/vitessio/vitess/go/vt/sqlparser"
 )
 

diff --git a/cmd/dalc/internal/parser/mysql/parse_query_select_select_exprs.go b/cmd/dalc/internal/parser/mysql/parse_query_select_select_exprs.go
@@ -2,7 +2,7 @@ package mysql
 
 import (
  "fmt"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/entry"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/entry"
  "github.com/vitessio/vitess/go/vt/sqlparser"
  "reflect"
 )

diff --git a/cmd/dalc/internal/parser/mysql/parse_query_select_table_exprs.go b/cmd/dalc/internal/parser/mysql/parse_query_select_table_exprs.go
@@ -2,7 +2,7 @@ package mysql
 
 import (
  "fmt"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/entry"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/entry"
  "github.com/vitessio/vitess/go/vt/sqlparser"
  "reflect"
 )

diff --git a/cmd/dalc/internal/parser/mysql/parse_query_select_test.go b/cmd/dalc/internal/parser/mysql/parse_query_select_test.go
@@ -1,7 +1,7 @@
 package mysql_test
 
 import (
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/parser/mysql"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/parser/mysql"
  "io/ioutil"
  "os"
  "path/filepath"

diff --git a/cmd/dalc/internal/parser/mysql/parse_query_select_where.go b/cmd/dalc/internal/parser/mysql/parse_query_select_where.go
@@ -3,7 +3,7 @@ package mysql
 import (
  "bytes"
  "fmt"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/entry"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/entry"
  "github.com/vitessio/vitess/go/vt/sqlparser"
  "reflect"
 )

diff --git a/cmd/dalc/internal/parser/mysql/parse_query_test.go b/cmd/dalc/internal/parser/mysql/parse_query_test.go
@@ -1,7 +1,7 @@
 package mysql_test
 
 import (
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/parser/mysql"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/parser/mysql"
  "io/ioutil"
  "os"
  "path/filepath"

diff --git a/cmd/dalc/internal/parser/mysql/parse_query_update.go b/cmd/dalc/internal/parser/mysql/parse_query_update.go
@@ -2,7 +2,7 @@ package mysql
 
 import (
  "fmt"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/entry"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/entry"
  "github.com/vitessio/vitess/go/vt/sqlparser"
 )
 

diff --git a/cmd/dalc/internal/parser/mysql/parse_query_update_test.go b/cmd/dalc/internal/parser/mysql/parse_query_update_test.go
@@ -1,7 +1,7 @@
 package mysql_test
 
 import (
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/parser/mysql"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/parser/mysql"
  "io/ioutil"
  "os"
  "path/filepath"

diff --git a/cmd/dalc/internal/parser/mysql/parse_schema.go b/cmd/dalc/internal/parser/mysql/parse_schema.go
@@ -2,8 +2,8 @@ package mysql
 
 import (
  "fmt"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/entry"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/parser/commons"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/entry"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/parser/commons"
  "strings"
 )
 

diff --git a/cmd/dalc/internal/parser/mysql/parse_schema_test.go b/cmd/dalc/internal/parser/mysql/parse_schema_test.go
@@ -1,7 +1,7 @@
 package mysql_test
 
 import (
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/parser/mysql"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/parser/mysql"
  "io/ioutil"
  "os"
  "path/filepath"

diff --git a/cmd/dalc/internal/parser/parse.go b/cmd/dalc/internal/parser/parse.go
@@ -2,10 +2,10 @@ package parser
 
 import (
  "fmt"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/entry"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/files"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/logs"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/parser/mysql"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/entry"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/files"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/logs"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/parser/mysql"
 )
 
 func Parse(dialect string, schemaPath string, queryPath string) (tables []*entry.Table, queries []*entry.Query, err error) {

diff --git a/cmd/dalc/internal/parser/parse_test.go b/cmd/dalc/internal/parser/parse_test.go
@@ -1,7 +1,7 @@
 package parser_test
 
 import (
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/parser"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/parser"
  "os"
  "path/filepath"
  "testing"

diff --git a/cmd/dalc/main.go b/cmd/dalc/main.go
@@ -2,9 +2,9 @@ package main
 
 import (
  "fmt"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/generates"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/logs"
- "github.com/pharosnet/dalc/v2/cmd/dalc/v2/internal/parser"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/generates"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/logs"
+ "github.com/pharosnet/dalc/v2/cmd/dalc/internal/parser"
  "github.com/urfave/cli/v2"
  "os"
  "path"