HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add reserved

This commit is contained in:
Lunny Xiao 2014-09-06 23:26:23 +08:00
parent 933034a476
commit 750aae0fa5
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dialect.go
View File

@ -35,6 +35,8 @@ type Dialect interface {
DataSourceName() string DataSourceName() string
QuoteStr() string QuoteStr() string
IsReserved(string) bool
Quote(string) string
AndStr() string AndStr() string
OrStr() string OrStr() string
EqStr() string EqStr() string
@ -120,10 +122,6 @@ func (b *Base) DataSourceName() string {
return b.dataSourceName return b.dataSourceName
} }
func (b *Base) Quote(c string) string {
return b.dialect.QuoteStr() + c + b.dialect.QuoteStr()
}
func (b *Base) AndStr() string { func (b *Base) AndStr() string {
return "AND" return "AND"
} }
@ -164,7 +162,7 @@ func (db *Base) IsColumnExist(tableName string, col *Column) (bool, error) {
} }
func (db *Base) CreateIndexSql(tableName string, index *Index) string { func (db *Base) CreateIndexSql(tableName string, index *Index) string {
quote := db.Quote quote := db.dialect.Quote
var unique string var unique string
var idxName string var idxName string
if index.Type == UniqueType { if index.Type == UniqueType {
@ -179,7 +177,7 @@ func (db *Base) CreateIndexSql(tableName string, index *Index) string {
} }
func (db *Base) DropIndexSql(tableName string, index *Index) string { func (db *Base) DropIndexSql(tableName string, index *Index) string {
quote := db.Quote quote := db.dialect.Quote
//var unique string //var unique string
var idxName string = index.Name var idxName string = index.Name
if !strings.HasPrefix(idxName, "UQE_") && if !strings.HasPrefix(idxName, "UQE_") &&
@ -205,7 +203,7 @@ func (b *Base) CreateTableSql(table *Table, tableName, storeEngine, charset stri
tableName = table.Name tableName = table.Name
} }
sql += b.Quote(tableName) + " (" sql += b.dialect.Quote(tableName) + " ("
pkList := table.PrimaryKeys pkList := table.PrimaryKeys
@ -222,7 +220,7 @@ func (b *Base) CreateTableSql(table *Table, tableName, storeEngine, charset stri
if len(pkList) > 1 { if len(pkList) > 1 {
sql += "PRIMARY KEY ( " sql += "PRIMARY KEY ( "
sql += b.Quote(strings.Join(pkList, b.Quote(","))) sql += b.dialect.Quote(strings.Join(pkList, b.dialect.Quote(",")))
sql += " ), " sql += " ), "
} }