clean package

Author: sunary

.travis.yml

@@ -1,8 +1,7 @@
 language: go
 
 go:
-  - 1.13.x
-  - 1.14.x
+  - 1.25.x
 
 env: GO111MODULE=on
 

element/column.go

@@ -13,7 +13,7 @@ import (
 	"github.com/pingcap/tidb/pkg/parser/format"
 	"github.com/pingcap/tidb/pkg/parser/types"
 	sqlite "github.com/rqlite/sql"
-	sql_templates "github.com/sunary/sqlize/sql-templates"
+	"github.com/sunary/sqlize/sqltemplates"
 )
 
 const (
@@ -146,7 +146,7 @@ func (c Column) migrationUp(tbName, after string, ident int) []string {
 }
 
 func (c Column) migrationCommentUp(tbName string) []string {
-	if c.CurrentAttr.Comment == "" || sql.GetDialect() != sql_templates.PostgresDialect {
+	if c.CurrentAttr.Comment == "" || sql.GetDialect() != sqltemplates.PostgresDialect {
 		return nil
 	}
 

element/migration.go

@@ -6,12 +6,12 @@ import (
 	"strings"
 
 	"github.com/pingcap/tidb/pkg/parser/ast"
-	sql_templates "github.com/sunary/sqlize/sql-templates"
+	"github.com/sunary/sqlize/sqltemplates"
 	"github.com/sunary/sqlize/utils"
 )
 
 var (
-	sql              *sql_templates.Sql
+	sql              *sqltemplates.Sql
 	ignoreFieldOrder bool
 )
 
@@ -23,8 +23,8 @@ type Migration struct {
 }
 
 // NewMigration ...
-func NewMigration(dialect sql_templates.SqlDialect, lowercase, ignoreOrder bool) Migration {
-	sql = sql_templates.NewSql(dialect, lowercase)
+func NewMigration(dialect sqltemplates.SqlDialect, lowercase, ignoreOrder bool) Migration {
+	sql = sqltemplates.NewSql(dialect, lowercase)
 	ignoreFieldOrder = ignoreOrder
 
 	return Migration{

export/avro/builder.go

@@ -9,8 +9,8 @@ import (
 	"github.com/sunary/sqlize/element"
 )
 
-// NewArvoSchema ...
-func NewArvoSchema(table element.Table) *RecordSchema {
+// NewAvroSchema ...
+func NewAvroSchema(table element.Table) *RecordSchema {
 	fields := buildFieldsFromTable(table)
 	record := newRecordSchema(table.Name, table.Name)
 	record.Name = table.Name

options.go

@@ -1,8 +1,6 @@
 package sqlize
 
-import (
-	sql_templates "github.com/sunary/sqlize/sql-templates"
-)
+import "github.com/sunary/sqlize/sqltemplates"
 
 type sqlizeOptions struct {
 	migrationFolder     string
@@ -11,7 +9,7 @@ type sqlizeOptions struct {
 	migrationTable      string
 
 	sqlTag           string
-	dialect          sql_templates.SqlDialect
+	dialect          sqltemplates.SqlDialect
 	lowercase        bool
 	pluralTableName  bool
 	generateComment  bool
@@ -69,28 +67,28 @@ func WithSqlTag(sqlTag string) SqlizeOption {
 // WithMysql default
 func WithMysql() SqlizeOption {
 	return newFuncSqlizeOption(func(o *sqlizeOptions) {
-		o.dialect = sql_templates.MysqlDialect
+		o.dialect = sqltemplates.MysqlDialect
 	})
 }
 
 // WithPostgresql ...
 func WithPostgresql() SqlizeOption {
 	return newFuncSqlizeOption(func(o *sqlizeOptions) {
-		o.dialect = sql_templates.PostgresDialect
+		o.dialect = sqltemplates.PostgresDialect
 	})
 }
 
 // WithSqlserver ...
 func WithSqlserver() SqlizeOption {
 	return newFuncSqlizeOption(func(o *sqlizeOptions) {
-		o.dialect = sql_templates.SqlserverDialect
+		o.dialect = sqltemplates.SqlserverDialect
 	})
 }
 
 // WithSqlite ...
 func WithSqlite() SqlizeOption {
 	return newFuncSqlizeOption(func(o *sqlizeOptions) {
-		o.dialect = sql_templates.SqliteDialect
+		o.dialect = sqltemplates.SqliteDialect
 	})
 }
 

sql-builder/builder.go sqlbuilder/builder.gosql-builder/builder.go renamed to sqlbuilder/builder.go

@@ -1,4 +1,4 @@
-package sql_builder
+package sqlbuilder
 
 import (
 	"database/sql"
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	sql_templates "github.com/sunary/sqlize/sql-templates"
+	"github.com/sunary/sqlize/sqltemplates"
 	"github.com/sunary/sqlize/utils"
 )
 
@@ -78,9 +78,9 @@ var (
 
 // SqlBuilder ...
 type SqlBuilder struct {
-	sql             *sql_templates.Sql
+	sql             *sqltemplates.Sql
 	sqlTag          string
-	dialect         sql_templates.SqlDialect
+	dialect         sqltemplates.SqlDialect
 	generateComment bool
 	pluralTableName bool
 	tables          map[string]string
@@ -89,7 +89,7 @@ type SqlBuilder struct {
 // NewSqlBuilder ...
 func NewSqlBuilder(opts ...SqlBuilderOption) *SqlBuilder {
 	o := sqlBuilderOptions{
-		dialect:         sql_templates.MysqlDialect,
+		dialect:         sqltemplates.MysqlDialect,
 		lowercase:       false,
 		pluralTableName: false,
 		sqlTag:          SqlTagDefault,
@@ -99,7 +99,7 @@ func NewSqlBuilder(opts ...SqlBuilderOption) *SqlBuilder {
 	}
 
 	return &SqlBuilder{
-		sql:             sql_templates.NewSql(o.dialect, o.lowercase),
+		sql:             sqltemplates.NewSql(o.dialect, o.lowercase),
 		dialect:         o.dialect,
 		sqlTag:          o.sqlTag,
 		pluralTableName: o.pluralTableName,
@@ -130,7 +130,7 @@ func (s SqlBuilder) AddTable(obj interface{}) string {
 	comments := []string{}
 	if s.generateComment {
 		switch s.dialect {
-		case sql_templates.PostgresDialect:
+		case sqltemplates.PostgresDialect:
 			comments = append(comments, fmt.Sprintf(s.sql.TableComment(), s.sql.EscapeSqlName(tableName), tableName))
 
 		default:
@@ -432,7 +432,7 @@ func (s SqlBuilder) parseStruct(tableName, prefix string, obj interface{}) ([]st
 
 		if at.Comment != "" {
 			switch s.dialect {
-			case sql_templates.PostgresDialect:
+			case sqltemplates.PostgresDialect:
 				comments = append(comments,
 					fmt.Sprintf(s.sql.ColumnComment(), s.sql.EscapeSqlName(tableName), s.sql.EscapeSqlName(at.Name), at.Comment))
 

sql-builder/options.go sqlbuilder/options.gosql-builder/options.go renamed to sqlbuilder/options.go

@@ -1,12 +1,12 @@
-package sql_builder
+package sqlbuilder
 
 import (
-	sql_templates "github.com/sunary/sqlize/sql-templates"
+	"github.com/sunary/sqlize/sqltemplates"
 )
 
 type sqlBuilderOptions struct {
 	sqlTag          string
-	dialect         sql_templates.SqlDialect
+	dialect         sqltemplates.SqlDialect
 	lowercase       bool
 	generateComment bool
 	pluralTableName bool
@@ -41,33 +41,33 @@ func WithSqlTag(sqlTag string) SqlBuilderOption {
 // WithMysql default
 func WithMysql() SqlBuilderOption {
 	return newFuncSqlBuilderOption(func(o *sqlBuilderOptions) {
-		o.dialect = sql_templates.MysqlDialect
+		o.dialect = sqltemplates.MysqlDialect
 	})
 }
 
 // WithPostgresql ...
 func WithPostgresql() SqlBuilderOption {
 	return newFuncSqlBuilderOption(func(o *sqlBuilderOptions) {
-		o.dialect = sql_templates.PostgresDialect
+		o.dialect = sqltemplates.PostgresDialect
 	})
 }
 
 // WithSqlserver ...
 func WithSqlserver() SqlBuilderOption {
 	return newFuncSqlBuilderOption(func(o *sqlBuilderOptions) {
-		o.dialect = sql_templates.SqlserverDialect
+		o.dialect = sqltemplates.SqlserverDialect
 	})
 }
 
 // WithSqlite ...
 func WithSqlite() SqlBuilderOption {
 	return newFuncSqlBuilderOption(func(o *sqlBuilderOptions) {
-		o.dialect = sql_templates.SqliteDialect
+		o.dialect = sqltemplates.SqliteDialect
 	})
 }
 
 // WithDialect ...
-func WithDialect(dialect sql_templates.SqlDialect) SqlBuilderOption {
+func WithDialect(dialect sqltemplates.SqlDialect) SqlBuilderOption {
 	return newFuncSqlBuilderOption(func(o *sqlBuilderOptions) {
 		o.dialect = dialect
 	})

sqlize.go

@@ -10,9 +10,9 @@ import (
 	"github.com/sunary/sqlize/element"
 	"github.com/sunary/sqlize/export/avro"
 	"github.com/sunary/sqlize/export/mermaidjs"
-	sql_builder "github.com/sunary/sqlize/sql-builder"
-	sql_parser "github.com/sunary/sqlize/sql-parser"
-	sql_templates "github.com/sunary/sqlize/sql-templates"
+	"github.com/sunary/sqlize/sqlbuilder"
+	"github.com/sunary/sqlize/sqlparser"
+	"github.com/sunary/sqlize/sqltemplates"
 	"github.com/sunary/sqlize/utils"
 )
 
@@ -27,11 +27,11 @@ type Sqlize struct {
 	migrationUpSuffix   string
 	migrationDownSuffix string
 	migrationTable      string
-	dialect             sql_templates.SqlDialect
+	dialect             sqltemplates.SqlDialect
 	lowercase           bool
 	pluralTableName     bool
-	sqlBuilder          *sql_builder.SqlBuilder
-	parser              *sql_parser.Parser
+	sqlBuilder          *sqlbuilder.SqlBuilder
+	parser              *sqlparser.Parser
 }
 
 // NewSqlize ...
@@ -42,9 +42,9 @@ func NewSqlize(opts ...SqlizeOption) *Sqlize {
 		migrationDownSuffix: utils.DefaultMigrationDownSuffix,
 		migrationTable:      utils.DefaultMigrationTable,
 
-		dialect:          sql_templates.MysqlDialect,
+		dialect:          sqltemplates.MysqlDialect,
 		lowercase:        false,
-		sqlTag:           sql_builder.SqlTagDefault,
+		sqlTag:           sqlbuilder.SqlTagDefault,
 		pluralTableName:  false,
 		generateComment:  false,
 		ignoreFieldOrder: false,
@@ -53,21 +53,21 @@ func NewSqlize(opts ...SqlizeOption) *Sqlize {
 		opts[i].apply(&o)
 	}
 
-	opt := []sql_builder.SqlBuilderOption{sql_builder.WithSqlTag(o.sqlTag), sql_builder.WithDialect(o.dialect)}
+	opt := []sqlbuilder.SqlBuilderOption{sqlbuilder.WithSqlTag(o.sqlTag), sqlbuilder.WithDialect(o.dialect)}
 
 	if o.lowercase {
-		opt = append(opt, sql_builder.WithSqlLowercase())
+		opt = append(opt, sqlbuilder.WithSqlLowercase())
 	}
 
 	if o.generateComment {
-		opt = append(opt, sql_builder.WithCommentGenerate())
+		opt = append(opt, sqlbuilder.WithCommentGenerate())
 	}
 
 	if o.pluralTableName {
-		opt = append(opt, sql_builder.WithPluralTableName())
+		opt = append(opt, sqlbuilder.WithPluralTableName())
 	}
 
-	sb := sql_builder.NewSqlBuilder(opt...)
+	sb := sqlbuilder.NewSqlBuilder(opt...)
 
 	return &Sqlize{
 		migrationFolder:     o.migrationFolder,
@@ -78,7 +78,7 @@ func NewSqlize(opts ...SqlizeOption) *Sqlize {
 		lowercase:           o.lowercase,
 		pluralTableName:     o.pluralTableName,
 		sqlBuilder:          sb,
-		parser:              sql_parser.NewParser(o.dialect, o.lowercase, o.ignoreFieldOrder),
+		parser:              sqlparser.NewParser(o.dialect, o.lowercase, o.ignoreFieldOrder),
 	}
 }
 
@@ -210,7 +210,7 @@ func (s Sqlize) WriteFilesWithVersion(name string, ver int64, dirty bool) error
 }
 
 func (s Sqlize) migrationUpVersion(ver int64, dirty bool) string {
-	tmp := sql_templates.NewSql(s.dialect, s.lowercase)
+	tmp := sqltemplates.NewSql(s.dialect, s.lowercase)
 	if ver == 0 {
 		return fmt.Sprintf(tmp.CreateTableMigration(), s.migrationTable)
 	}
@@ -219,7 +219,7 @@ func (s Sqlize) migrationUpVersion(ver int64, dirty bool) string {
 }
 
 func (s Sqlize) migrationDownVersion(ver int64) string {
-	tmp := sql_templates.NewSql(s.dialect, s.lowercase)
+	tmp := sqltemplates.NewSql(s.dialect, s.lowercase)
 	if ver == 0 {
 		return fmt.Sprintf(tmp.DropTableMigration(), s.migrationTable)
 	}
@@ -251,16 +251,16 @@ func (s Sqlize) MermaidJsLive(needTables ...string) string {
 	return mm.Live()
 }
 
-// ArvoSchema export arvo schema, support mysql only
-func (s Sqlize) ArvoSchema(needTables ...string) []string {
-	if s.dialect != sql_templates.MysqlDialect {
+// AvroSchema export avro schema, support mysql only
+func (s Sqlize) AvroSchema(needTables ...string) []string {
+	if s.dialect != sqltemplates.MysqlDialect {
 		return nil
 	}
 
 	tables := s.selectTable(needTables...)
 	schemas := make([]string, 0, len(tables))
 	for i := range tables {
-		record := avro.NewArvoSchema(tables[i])
+		record := avro.NewAvroSchema(tables[i])
 		jsonData, _ := json.Marshal(record)
 		schemas = append(schemas, string(jsonData))
 	}