Merge branch 'master' of github.com:go-xorm/core

This commit is contained in:
Lunny Xiao 2014-05-09 21:53:30 +08:00
commit 7b00cece84
1 changed files with 7 additions and 4 deletions

View File

@ -141,10 +141,7 @@ func (db *Base) DropTableSql(tableName string) string {
return fmt.Sprintf("DROP TABLE IF EXISTS `%s`", tableName) return fmt.Sprintf("DROP TABLE IF EXISTS `%s`", tableName)
} }
func (db *Base) IsColumnExist(tableName string, col *Column) (bool, error) { func (db *Base) HasRecords(query string, args ...interface{}) (bool, error) {
args := []interface{}{db.DbName, tableName, col.Name}
query := "SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ?"
rows, err := db.DB().Query(query, args...) rows, err := db.DB().Query(query, args...)
if err != nil { if err != nil {
return false, err return false, err
@ -157,6 +154,12 @@ func (db *Base) IsColumnExist(tableName string, col *Column) (bool, error) {
return false, nil return false, nil
} }
func (db *Base) IsColumnExist(tableName string, col *Column) (bool, error) {
query := "SELECT `COLUMN_NAME` FROM `INFORMATION_SCHEMA`.`COLUMNS` WHERE `TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ?"
query = strings.Replace(query, "`", db.dialect.QuoteStr(), -1)
return db.HasRecords(query, db.DbName, tableName, col.Name)
}
func (db *Base) CreateIndexSql(tableName string, index *Index) string { func (db *Base) CreateIndexSql(tableName string, index *Index) string {
quote := db.Quote quote := db.Quote
var unique string var unique string