Remove quotestr totally (#1366)
* remove QuoteStr() totally * update xorm.core -> v0.7.0 * update dialect Quote
This commit is contained in:
parent
4b0ff8ad27
commit
b757473de7
|
@ -286,10 +286,6 @@ func (db *mssql) Quote(name string) string {
|
||||||
return "\"" + name + "\""
|
return "\"" + name + "\""
|
||||||
}
|
}
|
||||||
|
|
||||||
func (db *mssql) QuoteStr() string {
|
|
||||||
return "\""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (db *mssql) SupportEngine() bool {
|
func (db *mssql) SupportEngine() bool {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
|
@ -220,7 +220,7 @@ func (db *mysql) SqlType(c *core.Column) string {
|
||||||
case core.TimeStampz:
|
case core.TimeStampz:
|
||||||
res = core.Char
|
res = core.Char
|
||||||
c.Length = 64
|
c.Length = 64
|
||||||
case core.Enum: //mysql enum
|
case core.Enum: // mysql enum
|
||||||
res = core.Enum
|
res = core.Enum
|
||||||
res += "("
|
res += "("
|
||||||
opts := ""
|
opts := ""
|
||||||
|
@ -229,7 +229,7 @@ func (db *mysql) SqlType(c *core.Column) string {
|
||||||
}
|
}
|
||||||
res += strings.TrimLeft(opts, ",")
|
res += strings.TrimLeft(opts, ",")
|
||||||
res += ")"
|
res += ")"
|
||||||
case core.Set: //mysql set
|
case core.Set: // mysql set
|
||||||
res = core.Set
|
res = core.Set
|
||||||
res += "("
|
res += "("
|
||||||
opts := ""
|
opts := ""
|
||||||
|
@ -278,10 +278,6 @@ func (db *mysql) Quote(name string) string {
|
||||||
return "`" + name + "`"
|
return "`" + name + "`"
|
||||||
}
|
}
|
||||||
|
|
||||||
func (db *mysql) QuoteStr() string {
|
|
||||||
return "`"
|
|
||||||
}
|
|
||||||
|
|
||||||
func (db *mysql) SupportEngine() bool {
|
func (db *mysql) SupportEngine() bool {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
@ -360,7 +356,7 @@ func (db *mysql) GetColumns(tableName string) ([]string, map[string]*core.Column
|
||||||
var len1, len2 int
|
var len1, len2 int
|
||||||
if len(cts) == 2 {
|
if len(cts) == 2 {
|
||||||
idx := strings.Index(cts[1], ")")
|
idx := strings.Index(cts[1], ")")
|
||||||
if colType == core.Enum && cts[1][0] == '\'' { //enum
|
if colType == core.Enum && cts[1][0] == '\'' { // enum
|
||||||
options := strings.Split(cts[1][0:idx], ",")
|
options := strings.Split(cts[1][0:idx], ",")
|
||||||
col.EnumOptions = make(map[string]int)
|
col.EnumOptions = make(map[string]int)
|
||||||
for k, v := range options {
|
for k, v := range options {
|
||||||
|
@ -408,7 +404,7 @@ func (db *mysql) GetColumns(tableName string) ([]string, map[string]*core.Column
|
||||||
col.IsPrimaryKey = true
|
col.IsPrimaryKey = true
|
||||||
}
|
}
|
||||||
if colKey == "UNI" {
|
if colKey == "UNI" {
|
||||||
//col.is
|
// col.is
|
||||||
}
|
}
|
||||||
|
|
||||||
if extra == "auto_increment" {
|
if extra == "auto_increment" {
|
||||||
|
@ -559,8 +555,6 @@ func (db *mysql) CreateTableSql(table *core.Table, tableName, storeEngine, chars
|
||||||
sql += " DEFAULT CHARSET " + charset
|
sql += " DEFAULT CHARSET " + charset
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if db.rowFormat != "" {
|
if db.rowFormat != "" {
|
||||||
sql += " ROW_FORMAT=" + db.rowFormat
|
sql += " ROW_FORMAT=" + db.rowFormat
|
||||||
}
|
}
|
||||||
|
@ -633,7 +627,7 @@ func (p *mysqlDriver) Parse(driverName, dataSourceName string) (*core.Uri, error
|
||||||
`\/(?P<dbname>.*?)` + // /dbname
|
`\/(?P<dbname>.*?)` + // /dbname
|
||||||
`(?:\?(?P<params>[^\?]*))?$`) // [?param1=value1¶mN=valueN]
|
`(?:\?(?P<params>[^\?]*))?$`) // [?param1=value1¶mN=valueN]
|
||||||
matches := dsnPattern.FindStringSubmatch(dataSourceName)
|
matches := dsnPattern.FindStringSubmatch(dataSourceName)
|
||||||
//tlsConfigRegister := make(map[string]*tls.Config)
|
// tlsConfigRegister := make(map[string]*tls.Config)
|
||||||
names := dsnPattern.SubexpNames()
|
names := dsnPattern.SubexpNames()
|
||||||
|
|
||||||
uri := &core.Uri{DbType: core.MYSQL}
|
uri := &core.Uri{DbType: core.MYSQL}
|
||||||
|
|
|
@ -552,11 +552,7 @@ func (db *oracle) IsReserved(name string) bool {
|
||||||
}
|
}
|
||||||
|
|
||||||
func (db *oracle) Quote(name string) string {
|
func (db *oracle) Quote(name string) string {
|
||||||
return "\"" + name + "\""
|
return "[" + name + "]"
|
||||||
}
|
|
||||||
|
|
||||||
func (db *oracle) QuoteStr() string {
|
|
||||||
return "\""
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (db *oracle) SupportEngine() bool {
|
func (db *oracle) SupportEngine() bool {
|
||||||
|
@ -596,7 +592,7 @@ func (db *oracle) CreateTableSql(table *core.Table, tableName, storeEngine, char
|
||||||
sql += col.String(b.dialect)
|
sql += col.String(b.dialect)
|
||||||
} else {*/
|
} else {*/
|
||||||
sql += col.StringNoPk(db)
|
sql += col.StringNoPk(db)
|
||||||
//}
|
// }
|
||||||
sql = strings.TrimSpace(sql)
|
sql = strings.TrimSpace(sql)
|
||||||
sql += ", "
|
sql += ", "
|
||||||
}
|
}
|
||||||
|
@ -865,7 +861,7 @@ func (cfg *goracleDriver) Parse(driverName, dataSourceName string) (*core.Uri, e
|
||||||
`\/(?P<dbname>.*?)` + // /dbname
|
`\/(?P<dbname>.*?)` + // /dbname
|
||||||
`(?:\?(?P<params>[^\?]*))?$`) // [?param1=value1¶mN=valueN]
|
`(?:\?(?P<params>[^\?]*))?$`) // [?param1=value1¶mN=valueN]
|
||||||
matches := dsnPattern.FindStringSubmatch(dataSourceName)
|
matches := dsnPattern.FindStringSubmatch(dataSourceName)
|
||||||
//tlsConfigRegister := make(map[string]*tls.Config)
|
// tlsConfigRegister := make(map[string]*tls.Config)
|
||||||
names := dsnPattern.SubexpNames()
|
names := dsnPattern.SubexpNames()
|
||||||
|
|
||||||
for i, match := range matches {
|
for i, match := range matches {
|
||||||
|
@ -883,8 +879,8 @@ func (cfg *goracleDriver) Parse(driverName, dataSourceName string) (*core.Uri, e
|
||||||
type oci8Driver struct {
|
type oci8Driver struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
//dataSourceName=user/password@ipv4:port/dbname
|
// dataSourceName=user/password@ipv4:port/dbname
|
||||||
//dataSourceName=user/password@[ipv6]:port/dbname
|
// dataSourceName=user/password@[ipv6]:port/dbname
|
||||||
func (p *oci8Driver) Parse(driverName, dataSourceName string) (*core.Uri, error) {
|
func (p *oci8Driver) Parse(driverName, dataSourceName string) (*core.Uri, error) {
|
||||||
db := &core.Uri{DbType: core.ORACLE}
|
db := &core.Uri{DbType: core.ORACLE}
|
||||||
dsnPattern := regexp.MustCompile(
|
dsnPattern := regexp.MustCompile(
|
||||||
|
|
|
@ -863,10 +863,6 @@ func (db *postgres) Quote(name string) string {
|
||||||
return "\"" + name + "\""
|
return "\"" + name + "\""
|
||||||
}
|
}
|
||||||
|
|
||||||
func (db *postgres) QuoteStr() string {
|
|
||||||
return "\""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (db *postgres) AutoIncrStr() string {
|
func (db *postgres) AutoIncrStr() string {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
@ -998,7 +994,7 @@ WHERE c.relkind = 'r'::char AND c.relname = $1%s AND f.attnum > 0 ORDER BY f.att
|
||||||
return nil, nil, err
|
return nil, nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
//fmt.Println(args, colName, isNullable, dataType, maxLenStr, colDefault, numPrecision, numRadix, isPK, isUnique)
|
// fmt.Println(args, colName, isNullable, dataType, maxLenStr, colDefault, numPrecision, numRadix, isPK, isUnique)
|
||||||
var maxLen int
|
var maxLen int
|
||||||
if maxLenStr != nil {
|
if maxLenStr != nil {
|
||||||
maxLen, err = strconv.Atoi(*maxLenStr)
|
maxLen, err = strconv.Atoi(*maxLenStr)
|
||||||
|
@ -1093,7 +1089,6 @@ func (db *postgres) GetTables() ([]*core.Table, error) {
|
||||||
return tables, nil
|
return tables, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
func getIndexColName(indexdef string) []string {
|
func getIndexColName(indexdef string) []string {
|
||||||
var colNames []string
|
var colNames []string
|
||||||
|
|
||||||
|
@ -1105,7 +1100,6 @@ func getIndexColName(indexdef string) []string {
|
||||||
return colNames
|
return colNames
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
func (db *postgres) GetIndexes(tableName string) (map[string]*core.Index, error) {
|
func (db *postgres) GetIndexes(tableName string) (map[string]*core.Index, error) {
|
||||||
args := []interface{}{tableName}
|
args := []interface{}{tableName}
|
||||||
s := fmt.Sprintf("SELECT indexname, indexdef FROM pg_indexes WHERE tablename=$1")
|
s := fmt.Sprintf("SELECT indexname, indexdef FROM pg_indexes WHERE tablename=$1")
|
||||||
|
|
|
@ -202,10 +202,6 @@ func (db *sqlite3) Quote(name string) string {
|
||||||
return "`" + name + "`"
|
return "`" + name + "`"
|
||||||
}
|
}
|
||||||
|
|
||||||
func (db *sqlite3) QuoteStr() string {
|
|
||||||
return "`"
|
|
||||||
}
|
|
||||||
|
|
||||||
func (db *sqlite3) AutoIncrStr() string {
|
func (db *sqlite3) AutoIncrStr() string {
|
||||||
return "AUTOINCREMENT"
|
return "AUTOINCREMENT"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue