bug fixed for isTableEmpty

This commit is contained in:
Lunny Xiao 2015-03-13 15:26:47 +08:00
parent 044198f373
commit 1f0dd9bef2
1 changed files with 4 additions and 25 deletions

View File

@ -562,29 +562,7 @@ func (session *Session) DropIndexes(bean interface{}) error {
return nil return nil
} }
// DropTable drop a table and all indexes of the table // drop table will drop table if exist, if drop failed, it will return error
/*func (session *Session) DropTable(bean interface{}) error {
defer session.resetStatement()
if session.IsAutoClose {
defer session.Close()
}
t := reflect.Indirect(reflect.ValueOf(bean)).Type()
if t.Kind() == reflect.String {
session.Statement.AltTableName = bean.(string)
} else if t.Kind() == reflect.Struct {
session.Statement.RefTable = session.Engine.TableInfo(bean)
} else {
return errors.New("Unsupported type")
}
//return session.Engine.Dialect().MustDropTable(session.Statement.TableName())
sqlStr := session.Engine.Dialect().DropTableSql(session.Statement.TableName())
_, err := session.exec(sqlStr)
return err
}*/
func (session *Session) DropTable(beanOrTableName interface{}) error { func (session *Session) DropTable(beanOrTableName interface{}) error {
tableName, err := session.Engine.tableName(beanOrTableName) tableName, err := session.Engine.tableName(beanOrTableName)
if err != nil { if err != nil {
@ -1442,8 +1420,9 @@ func (session *Session) isTableEmpty(tableName string) (bool, error) {
} }
var total int64 var total int64
err := session.DB().QueryRow(fmt.Sprintf("select count(*) from %s", tableName)). sql := fmt.Sprintf("select count(*) from %s", session.Engine.Quote(tableName))
Scan(&total) err := session.DB().QueryRow(sql).Scan(&total)
session.Engine.logSQL(sql)
if err != nil { if err != nil {
return true, err return true, err
} }