Merge pull request #15 from RyougiNevermore/master

update cmd to v2
pharosnet · Jul 22, 2020 · 6ec8203 · 6ec8203
2 parents 8f588a7 + f0f06a0
commit 6ec8203
Show file tree

Hide file tree

Showing 38 changed files with 52 additions and 151 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`
+`go get -u github.com/pharosnet/dalc/cmd/dalc/v2`
 ### 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/cmd/dalc
+module github.com/pharosnet/dalc/cmd/dalc/v2
 
 go 1.14
 

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

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/cmd/dalc/internal/logs"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/entry"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/entry"
- "github.com/pharosnet/dalc/cmd/dalc/internal/parser/commons"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/internal/entry"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/internal/parser/commons"
  "strings"
  "text/template"
 )
@@ -163,7 +163,7 @@ type {{ .Name }}Request struct { {{ range $key, $field := .RequestFields}}
 }
 
 {{ if eq .IsTable true }}
- type {{ .Name }}ResultIterator func(ctx context.Context, result *{{ .Table.GoName }}) (err error)
+ type {{ .Name }}ResultIterator func(ctx context.Context, result *{{ .Table.GoName }}Row) (err error)
 {{ else }}
  type {{ .Name }}Result struct { {{ range $key, $field := .ResultFields}}
  {{ $field.Name }} {{ $field.Type }} {{ $field.Tags }}{{ end }}
@@ -189,7 +189,7 @@ func {{ .Name }}(ctx dalc.PreparedContext, request *{{ .Name }}Request, iterator
  }
 
  {{ if eq .IsTable true }}
- result := &{{ .Table.GoName }}{}
+ result := &{{ .Table.GoName }}Row{}
  scanErr := result.scanSQLRow(rows)
  {{ else }}
  result := &{{ .Name }}Result{}

diff --git a/cmd/dalc/internal/generates/query_select.tmpl b/cmd/dalc/internal/generates/query_select.tmpl
@@ -18,7 +18,7 @@ type {{ .Name }}Request struct { {{ range $key, $field := .RequestFields}}
 }
 
 {{ if eq .IsTable true }}
- type {{ .Name }}ResultIterator func(ctx context.Context, result *{{ .Table.GoName }}) (err error)
+ type {{ .Name }}ResultIterator func(ctx context.Context, result *{{ .Table.GoName }}Row) (err error)
 {{ else }}
  type {{ .Name }}Result struct { {{ range $key, $field := .ResultFields}}
  {{ $field.Name }} {{ $field.Type }} {{ $field.Tags }}{{ end }}
@@ -44,7 +44,7 @@ func {{ .Name }}(ctx dalc.PreparedContext, request *{{ .Name }}Request, iterator
  }
 
  {{ if eq .IsTable true }}
- result := &{{ .Table.GoName }}{}
+ result := &{{ .Table.GoName }}Row{}
  scanErr := result.scanSQLRow(rows)
  {{ else }}
  result := &{{ .Name }}Result{}

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/cmd/dalc/internal/entry"
- "github.com/pharosnet/dalc/cmd/dalc/internal/parser/commons"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/internal/entry"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/entry"
+import "github.com/pharosnet/dalc/cmd/dalc/v2/internal/entry"
 
 type TemplateData struct {
  Package string

diff --git a/cmd/dalc/internal/parser/commons/block.go b/cmd/dalc/internal/parser/commons/block.go
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/cmd/dalc/internal/parser/commons"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/parser/commons"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/entry"
+import "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/entry"
- "github.com/pharosnet/dalc/cmd/dalc/internal/parser/commons"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/internal/entry"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/entry"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/parser/mysql"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/entry"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/entry"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/parser/mysql"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/entry"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/entry"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/entry"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/entry"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/parser/mysql"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/entry"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/parser/mysql"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/entry"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/parser/mysql"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/entry"
- "github.com/pharosnet/dalc/cmd/dalc/internal/parser/commons"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/internal/entry"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/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/cmd/dalc/internal/parser/mysql"
+ "github.com/pharosnet/dalc/cmd/dalc/v2/internal/parser/mysql"
  "io/ioutil"
  "os"
  "path/filepath"