From 22c515f1e0d7314d9255951074ee753ab2984767 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 11 Apr 2014 15:38:09 +0800 Subject: [PATCH] fixed --- column.go | 3 ++- dialect.go | 11 +++++++++++ table.go | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/column.go b/column.go index 8bea883e..4e179a14 100644 --- a/column.go +++ b/column.go @@ -30,11 +30,12 @@ type Column struct { IsCascade bool IsVersion bool fieldPath []string + DefaultIsEmpty bool } func NewColumn(name, fieldName string, sqlType SQLType, len1, len2 int, nullable bool) *Column { return &Column{name, fieldName, sqlType, len1, len2, nullable, "", make(map[string]bool), false, false, - TWOSIDES, false, false, false, false, nil} + TWOSIDES, false, false, false, false, nil, false} } // generate column description string according dialect diff --git a/dialect.go b/dialect.go index ecba0844..00fba638 100644 --- a/dialect.go +++ b/dialect.go @@ -1,6 +1,7 @@ package core import ( + "fmt" "strings" "time" ) @@ -29,6 +30,8 @@ type Dialect interface { SqlType(t *Column) string SupportInsertMany() bool QuoteStr() string + RollBackStr() string + DropTableSql(tableName string) string AutoIncrStr() string SupportEngine() bool SupportCharset() bool @@ -83,6 +86,14 @@ func (b *Base) Quote(c string) string { return b.dialect.QuoteStr() + c + b.dialect.QuoteStr() } +func (db *Base) RollBackStr() string { + return "ROLL BACK" +} + +func (db *Base) DropTableSql(tableName string) string { + return fmt.Sprintf("DROP TABLE IF EXISTS `%s`", tableName) +} + func (b *Base) CreateTableSql(table *Table, tableName, storeEngine, charset string) string { var sql string sql = "CREATE TABLE IF NOT EXISTS " diff --git a/table.go b/table.go index 554d5a5c..aadcc9a8 100644 --- a/table.go +++ b/table.go @@ -17,6 +17,7 @@ type Table struct { Created map[string]bool Updated string Version string + Cacher Cacher } func (table *Table) Columns() map[string]*Column {