diff --git a/dialect_mysql.go b/dialect_mysql.go index f2b4ff7a..9f5ae3b2 100644 --- a/dialect_mysql.go +++ b/dialect_mysql.go @@ -551,9 +551,12 @@ func (db *mysql) CreateTableSql(table *core.Table, tableName, storeEngine, chars if len(charset) == 0 { charset = db.URI().Charset - } else if len(charset) > 0 { + } + if len(charset) != 0 { sql += " DEFAULT CHARSET " + charset } + + if db.rowFormat != "" { sql += " ROW_FORMAT=" + db.rowFormat diff --git a/examples/find.go b/examples/find.go index d80a698c..ae710b8e 100644 --- a/examples/find.go +++ b/examples/find.go @@ -6,6 +6,7 @@ import ( "time" "github.com/go-xorm/xorm" + _ "github.com/mattn/go-sqlite3" ) // User describes a user diff --git a/session_get.go b/session_get.go index 3b2c9493..69194a23 100644 --- a/session_get.go +++ b/session_get.go @@ -77,6 +77,9 @@ func (session *Session) nocacheGet(beanKind reflect.Kind, table *core.Table, bea defer rows.Close() if !rows.Next() { + if rows.Err() != nil { + return false, rows.Err() + } return false, nil }