HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add Table function

This commit is contained in:
Lunny Xiao 2013-05-19 13:25:52 +08:00
parent deacd6d4d6
commit 8bf4d68249
6 changed files with 274 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
engine.go
View File

@ -18,6 +18,7 @@ const (
type Engine struct { type Engine struct {
Mapper IMapper Mapper IMapper
TagIdentifier string
DriverName string DriverName string
DataSourceName string DataSourceName string
Tables map[reflect.Type]Table Tables map[reflect.Type]Table
@ -60,7 +61,7 @@ func (engine *Engine) Where(querystring string, args ...interface{}) *Engine {
return engine return engine
} }
func (engine *Engine) Id(id int) *Engine { func (engine *Engine) Id(id int64) *Engine {
engine.Statement.Id(id) engine.Statement.Id(id)
return engine return engine
} }
@ -70,6 +71,11 @@ func (engine *Engine) In(column string, args ...interface{}) *Engine {
return engine return engine
} }
func (engine *Engine) Table(tableName string) *Engine {
engine.Statement.Table(tableName)
return engine
}
func (engine *Engine) Limit(limit int, start ...int) *Engine { func (engine *Engine) Limit(limit int, start ...int) *Engine {
engine.Statement.Limit(limit, start...) engine.Statement.Limit(limit, start...)
return engine return engine
@ -96,67 +102,6 @@ func (engine *Engine) Having(conditions string) *Engine {
return engine return engine
} }
func (e *Engine) genColumnStr(col *Column) string {
sql := "`" + col.Name + "` "
if col.SQLType == Date {
sql += " datetime "
} else {
if e.DriverName == SQLITE && col.IsPrimaryKey {
sql += "integer"
} else {
sql += col.SQLType.Name
}
if e.DriverName != SQLITE && col.SQLType != Text {
if col.SQLType != Decimal {
sql += "(" + strconv.Itoa(col.Length) + ")"
} else {
sql += "(" + strconv.Itoa(col.Length) + "," + strconv.Itoa(col.Length2) + ")"
}
}
}
if col.Nullable {
sql += " NULL "
} else {
sql += " NOT NULL "
}
//fmt.Println(key)
if col.IsPrimaryKey {
sql += "PRIMARY KEY "
}
if col.IsAutoIncrement {
sql += e.AutoIncrement + " "
}
if col.IsUnique {
sql += "Unique "
}
return sql
}
func (e *Engine) genCreateSQL(table *Table) string {
sql := "CREATE TABLE IF NOT EXISTS `" + table.Name + "` ("
//fmt.Println(session.Mapper.Obj2Table(session.PrimaryKey))
for _, col := range table.Columns {
sql += e.genColumnStr(&col)
sql += ","
}
sql = sql[:len(sql)-2] + ");"
return sql
}
func (e *Engine) genDropSQL(table *Table) string {
sql := "DROP TABLE IF EXISTS `" + table.Name + "`;"
return sql
}
/*
map an object into a table object
*/
func (engine *Engine) MapOne(bean interface{}) Table {
t := Type(bean)
return engine.MapType(t)
}
func (engine *Engine) AutoMapType(t reflect.Type) *Table { func (engine *Engine) AutoMapType(t reflect.Type) *Table {
table, ok := engine.Tables[t] table, ok := engine.Tables[t]
if !ok { if !ok {
@ -179,7 +124,7 @@ func (engine *Engine) MapType(t reflect.Type) Table {
for i := 0; i < t.NumField(); i++ { for i := 0; i < t.NumField(); i++ {
tag := t.Field(i).Tag tag := t.Field(i).Tag
ormTagStr := tag.Get("xorm") ormTagStr := tag.Get(engine.TagIdentifier)
var col Column var col Column
fieldType := t.Field(i).Type fieldType := t.Field(i).Type
@ -278,7 +223,7 @@ func (engine *Engine) Map(beans ...interface{}) (e error) {
for _, bean := range beans { for _, bean := range beans {
t := Type(bean) t := Type(bean)
if _, ok := engine.Tables[t]; !ok { if _, ok := engine.Tables[t]; !ok {
engine.Tables[t] = engine.MapOne(bean) engine.Tables[t] = engine.MapType(t)
} }
} }
return return
@ -294,11 +239,6 @@ func (engine *Engine) UnMap(beans ...interface{}) (e error) {
return return
} }
func (engine *Engine) Bean2Table(bean interface{}) *Table {
table := engine.Tables[Type(bean)]
return &table
}
func (e *Engine) DropAll() error { func (e *Engine) DropAll() error {
session, err := e.MakeSession() session, err := e.MakeSession()
session.Begin() session.Begin()
@ -308,7 +248,8 @@ func (e *Engine) DropAll() error {
} }
for _, table := range e.Tables { for _, table := range e.Tables {
sql := e.genDropSQL(&table) e.Statement.RefTable = &table
sql := e.Statement.genDropSQL()
_, err = session.Exec(sql) _, err = session.Exec(sql)
if err != nil { if err != nil {
session.Rollback() session.Rollback()
@ -321,15 +262,13 @@ func (e *Engine) DropAll() error {
func (e *Engine) CreateTables(beans ...interface{}) error { func (e *Engine) CreateTables(beans ...interface{}) error {
session, err := e.MakeSession() session, err := e.MakeSession()
session.Begin() session.Begin()
session.Statement = e.Statement
defer session.Close() defer session.Close()
if err != nil { if err != nil {
return err return err
} }
for _, bean := range beans { for _, bean := range beans {
table := e.MapOne(bean) err = session.CreateTable(bean)
e.Tables[table.Type] = table
sql := e.genCreateSQL(&table)
_, err = session.Exec(sql)
if err != nil { if err != nil {
session.Rollback() session.Rollback()
return err return err
@ -347,7 +286,8 @@ func (e *Engine) CreateAll() error {
} }
for _, table := range e.Tables { for _, table := range e.Tables {
sql := e.genCreateSQL(&table) e.Statement.RefTable = &table
sql := e.Statement.genCreateSQL()
_, err = session.Exec(sql) _, err = session.Exec(sql)
if err != nil { if err != nil {
session.Rollback() session.Rollback()

113
session.go
View File

@ -20,7 +20,7 @@ type Session struct {
} }
func (session *Session) Init() { func (session *Session) Init() {
session.Statement = Statement{} session.Statement = Statement{Engine: session.Engine}
session.IsAutoCommit = true session.IsAutoCommit = true
session.IsCommitedOrRollbacked = false session.IsCommitedOrRollbacked = false
} }
@ -34,11 +34,16 @@ func (session *Session) Where(querystring string, args ...interface{}) *Session
return session return session
} }
func (session *Session) Id(id int) *Session { func (session *Session) Id(id int64) *Session {
session.Statement.Id(id) session.Statement.Id(id)
return session return session
} }
func (session *Session) Table(tableName string) *Session {
session.Statement.Table(tableName)
return session
}
func (session *Session) In(column string, args ...interface{}) *Session { func (session *Session) In(column string, args ...interface{}) *Session {
session.Statement.In(column, args...) session.Statement.In(column, args...)
return session return session
@ -112,7 +117,7 @@ func (session *Session) scanMapIntoStruct(obj interface{}, objMap map[string][]b
return errors.New("expected a pointer to a struct") return errors.New("expected a pointer to a struct")
} }
table := session.Engine.Bean2Table(obj) table := session.Engine.Tables[Type(obj)]
for key, data := range objMap { for key, data := range objMap {
structField := dataStruct.FieldByName(table.Columns[key].FieldName) structField := dataStruct.FieldByName(table.Columns[key].FieldName)
@ -195,8 +200,8 @@ func (session *Session) innerExec(sql string, args ...interface{}) (sql.Result,
} }
func (session *Session) Exec(sql string, args ...interface{}) (sql.Result, error) { func (session *Session) Exec(sql string, args ...interface{}) (sql.Result, error) {
if session.Statement.Table != nil && session.Statement.Table.PrimaryKey != "" { if session.Statement.RefTable != nil && session.Statement.RefTable.PrimaryKey != "" {
sql = strings.Replace(sql, "(id)", session.Statement.Table.PrimaryKey, -1) sql = strings.Replace(sql, "(id)", session.Statement.RefTable.PrimaryKey, -1)
} }
if session.Engine.ShowSQL { if session.Engine.ShowSQL {
fmt.Println(sql) fmt.Println(sql)
@ -207,20 +212,22 @@ func (session *Session) Exec(sql string, args ...interface{}) (sql.Result, error
return session.Tx.Exec(sql, args...) return session.Tx.Exec(sql, args...)
} }
func (session *Session) CreateTable(bean interface{}) error {
statement := session.Statement
defer statement.Init()
statement.RefTable = session.Engine.AutoMap(bean)
sql := statement.genCreateSQL()
_, err := session.Exec(sql)
return err
}
func (session *Session) Get(bean interface{}) error { func (session *Session) Get(bean interface{}) error {
statement := session.Statement statement := session.Statement
defer session.Statement.Init() defer statement.Init()
statement.Limit(1) statement.Limit(1)
table := session.Engine.AutoMap(bean) sql, args := statement.genGetSql(bean)
statement.Table = table resultsSlice, err := session.Query(sql, args...)
colNames, args := session.BuildConditions(table, bean)
statement.ColumnStr = strings.Join(colNames, " and ")
statement.BeanArgs = args
sql := statement.generateSql()
resultsSlice, err := session.Query(sql, append(statement.Params, statement.BeanArgs...)...)
if err != nil { if err != nil {
return err return err
@ -242,14 +249,9 @@ func (session *Session) Get(bean interface{}) error {
func (session *Session) Count(bean interface{}) (int64, error) { func (session *Session) Count(bean interface{}) (int64, error) {
statement := session.Statement statement := session.Statement
defer session.Statement.Init() defer session.Statement.Init()
table := session.Engine.AutoMap(bean) sql, args := statement.genCountSql(bean)
statement.Table = table
colNames, args := session.BuildConditions(table, bean) resultsSlice, err := session.Query(sql, args...)
statement.ColumnStr = strings.Join(colNames, " and ")
statement.BeanArgs = args
resultsSlice, err := session.Query(statement.genCountSql(), append(statement.Params, statement.BeanArgs...)...)
if err != nil { if err != nil {
return 0, err return 0, err
} }
@ -273,10 +275,10 @@ func (session *Session) Find(rowsSlicePtr interface{}, condiBean ...interface{})
sliceElementType := sliceValue.Type().Elem() sliceElementType := sliceValue.Type().Elem()
table := session.Engine.AutoMapType(sliceElementType) table := session.Engine.AutoMapType(sliceElementType)
statement.Table = table statement.RefTable = table
if len(condiBean) > 0 { if len(condiBean) > 0 {
colNames, args := session.BuildConditions(table, condiBean[0]) colNames, args := BuildConditions(session.Engine, table, condiBean[0])
statement.ColumnStr = strings.Join(colNames, " and ") statement.ColumnStr = strings.Join(colNames, " and ")
statement.BeanArgs = args statement.BeanArgs = args
} }
@ -300,8 +302,8 @@ func (session *Session) Find(rowsSlicePtr interface{}, condiBean ...interface{})
} }
func (session *Session) Query(sql string, paramStr ...interface{}) (resultsSlice []map[string][]byte, err error) { func (session *Session) Query(sql string, paramStr ...interface{}) (resultsSlice []map[string][]byte, err error) {
if session.Statement.Table != nil && session.Statement.Table.PrimaryKey != "" { if session.Statement.RefTable != nil && session.Statement.RefTable.PrimaryKey != "" {
sql = strings.Replace(sql, "(id)", session.Statement.Table.PrimaryKey, -1) sql = strings.Replace(sql, "(id)", session.Statement.RefTable.PrimaryKey, -1)
} }
if session.Engine.ShowSQL { if session.Engine.ShowSQL {
fmt.Println(sql) fmt.Println(sql)
@ -429,7 +431,7 @@ func (session *Session) InsertMulti(rowsSlicePtr interface{}) (int64, error) {
sliceElementType := Type(bean) sliceElementType := Type(bean)
table := session.Engine.AutoMapType(sliceElementType) table := session.Engine.AutoMapType(sliceElementType)
session.Statement.Table = table session.Statement.RefTable = table
size := sliceValue.Len() size := sliceValue.Len()
@ -470,7 +472,7 @@ func (session *Session) InsertMulti(rowsSlicePtr interface{}) (int64, error) {
statement := fmt.Sprintf("INSERT INTO %v%v%v (%v) VALUES (%v)", statement := fmt.Sprintf("INSERT INTO %v%v%v (%v) VALUES (%v)",
session.Engine.QuoteIdentifier, session.Engine.QuoteIdentifier,
table.Name, session.Statement.TableName(),
session.Engine.QuoteIdentifier, session.Engine.QuoteIdentifier,
strings.Join(colNames, ", "), strings.Join(colNames, ", "),
strings.Join(colMultiPlaces, "),(")) strings.Join(colMultiPlaces, "),("))
@ -491,7 +493,7 @@ func (session *Session) InsertMulti(rowsSlicePtr interface{}) (int64, error) {
func (session *Session) InsertOne(bean interface{}) (int64, error) { func (session *Session) InsertOne(bean interface{}) (int64, error) {
table := session.Engine.AutoMap(bean) table := session.Engine.AutoMap(bean)
session.Statement.Table = table session.Statement.RefTable = table
colNames := make([]string, 0) colNames := make([]string, 0)
colPlaces := make([]string, 0) colPlaces := make([]string, 0)
var args = make([]interface{}, 0) var args = make([]interface{}, 0)
@ -506,14 +508,14 @@ func (session *Session) InsertOne(bean interface{}) (int64, error) {
colPlaces = append(colPlaces, "?") colPlaces = append(colPlaces, "?")
} }
statement := fmt.Sprintf("INSERT INTO %v%v%v (%v) VALUES (%v)", sql := fmt.Sprintf("INSERT INTO %v%v%v (%v) VALUES (%v)",
session.Engine.QuoteIdentifier, session.Engine.QuoteIdentifier,
table.Name, session.Statement.TableName(),
session.Engine.QuoteIdentifier, session.Engine.QuoteIdentifier,
strings.Join(colNames, ", "), strings.Join(colNames, ", "),
strings.Join(colPlaces, ", ")) strings.Join(colPlaces, ", "))
res, err := session.Exec(statement, args...) res, err := session.Exec(sql, args...)
if err != nil { if err != nil {
return -1, err return -1, err
} }
@ -527,48 +529,15 @@ func (session *Session) InsertOne(bean interface{}) (int64, error) {
return id, nil return id, nil
} }
func (session *Session) BuildConditions(table *Table, bean interface{}) ([]string, []interface{}) {
colNames := make([]string, 0)
var args = make([]interface{}, 0)
for _, col := range table.Columns {
fieldValue := reflect.Indirect(reflect.ValueOf(bean)).FieldByName(col.FieldName)
fieldType := reflect.TypeOf(fieldValue.Interface())
val := fieldValue.Interface()
switch fieldType.Kind() {
case reflect.String:
if fieldValue.String() == "" {
continue
}
case reflect.Int, reflect.Int32, reflect.Int64:
if fieldValue.Int() == 0 {
continue
}
case reflect.Struct:
if fieldType == reflect.TypeOf(time.Now()) {
t := fieldValue.Interface().(time.Time)
if t.IsZero() {
continue
}
}
default:
continue
}
args = append(args, val)
colNames = append(colNames, session.Engine.QuoteIdentifier+col.Name+session.Engine.QuoteIdentifier+"=?")
}
return colNames, args
}
func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int64, error) { func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int64, error) {
table := session.Engine.AutoMap(bean) table := session.Engine.AutoMap(bean)
session.Statement.Table = table session.Statement.RefTable = table
colNames, args := session.BuildConditions(table, bean) colNames, args := BuildConditions(session.Engine, table, bean)
var condiColNames []string var condiColNames []string
var condiArgs []interface{} var condiArgs []interface{}
if len(condiBean) > 0 { if len(condiBean) > 0 {
condiColNames, condiArgs = session.BuildConditions(table, condiBean[0]) condiColNames, condiArgs = BuildConditions(session.Engine, table, condiBean[0])
} }
var condition = "" var condition = ""
@ -590,7 +559,7 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
statement := fmt.Sprintf("UPDATE %v%v%v SET %v %v", statement := fmt.Sprintf("UPDATE %v%v%v SET %v %v",
session.Engine.QuoteIdentifier, session.Engine.QuoteIdentifier,
table.Name, session.Statement.TableName(),
session.Engine.QuoteIdentifier, session.Engine.QuoteIdentifier,
strings.Join(colNames, ", "), strings.Join(colNames, ", "),
condition) condition)
@ -611,8 +580,8 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
func (session *Session) Delete(bean interface{}) (int64, error) { func (session *Session) Delete(bean interface{}) (int64, error) {
table := session.Engine.AutoMap(bean) table := session.Engine.AutoMap(bean)
session.Statement.Table = table session.Statement.RefTable = table
colNames, args := session.BuildConditions(table, bean) colNames, args := BuildConditions(session.Engine, table, bean)
var condition = "" var condition = ""
st := session.Statement st := session.Statement
@ -629,7 +598,7 @@ func (session *Session) Delete(bean interface{}) (int64, error) {
statement := fmt.Sprintf("DELETE FROM %v%v%v %v", statement := fmt.Sprintf("DELETE FROM %v%v%v %v",
session.Engine.QuoteIdentifier, session.Engine.QuoteIdentifier,
table.Name, session.Statement.TableName(),
session.Engine.QuoteIdentifier, session.Engine.QuoteIdentifier,
condition) condition)

152
statement.go
View File

@ -2,11 +2,14 @@ package xorm
import ( import (
"fmt" "fmt"
"reflect"
"strconv"
"strings" "strings"
"time"
) )
type Statement struct { type Statement struct {
Table *Table RefTable *Table
Engine *Engine Engine *Engine
Start int Start int
LimitN int LimitN int
@ -17,6 +20,7 @@ type Statement struct {
GroupByStr string GroupByStr string
HavingStr string HavingStr string
ColumnStr string ColumnStr string
AltTableName string
BeanArgs []interface{} BeanArgs []interface{}
} }
@ -29,7 +33,7 @@ func MakeArray(elem string, count int) []string {
} }
func (statement *Statement) Init() { func (statement *Statement) Init() {
statement.Table = nil statement.RefTable = nil
statement.Start = 0 statement.Start = 0
statement.LimitN = 0 statement.LimitN = 0
statement.WhereStr = "" statement.WhereStr = ""
@ -39,6 +43,7 @@ func (statement *Statement) Init() {
statement.GroupByStr = "" statement.GroupByStr = ""
statement.HavingStr = "" statement.HavingStr = ""
statement.ColumnStr = "" statement.ColumnStr = ""
statement.AltTableName = ""
statement.BeanArgs = make([]interface{}, 0) statement.BeanArgs = make([]interface{}, 0)
} }
@ -47,7 +52,54 @@ func (statement *Statement) Where(querystring string, args ...interface{}) {
statement.Params = args statement.Params = args
} }
func (statement *Statement) Id(id int) { func (statement *Statement) Table(tableName string) {
statement.AltTableName = tableName
}
func BuildConditions(engine *Engine, table *Table, bean interface{}) ([]string, []interface{}) {
colNames := make([]string, 0)
var args = make([]interface{}, 0)
for _, col := range table.Columns {
fieldValue := reflect.Indirect(reflect.ValueOf(bean)).FieldByName(col.FieldName)
fieldType := reflect.TypeOf(fieldValue.Interface())
val := fieldValue.Interface()
switch fieldType.Kind() {
case reflect.String:
if fieldValue.String() == "" {
continue
}
case reflect.Int, reflect.Int32, reflect.Int64:
if fieldValue.Int() == 0 {
continue
}
case reflect.Struct:
if fieldType == reflect.TypeOf(time.Now()) {
t := fieldValue.Interface().(time.Time)
if t.IsZero() {
continue
}
}
default:
continue
}
args = append(args, val)
colNames = append(colNames, engine.QuoteIdentifier+col.Name+engine.QuoteIdentifier+"=?")
}
return colNames, args
}
func (statement *Statement) TableName() string {
if statement.AltTableName != "" {
return statement.AltTableName
}
if statement.RefTable != nil {
return statement.RefTable.Name
}
return ""
}
func (statement *Statement) Id(id int64) {
if statement.WhereStr == "" { if statement.WhereStr == "" {
statement.WhereStr = "(id)=?" statement.WhereStr = "(id)=?"
statement.Params = []interface{}{id} statement.Params = []interface{}{id}
@ -96,22 +148,100 @@ func (statement *Statement) Having(conditions string) {
statement.HavingStr = fmt.Sprintf("HAVING %v", conditions) statement.HavingStr = fmt.Sprintf("HAVING %v", conditions)
} }
func (statement *Statement) genColumnStr(col *Column) string {
sql := "`" + col.Name + "` "
if col.SQLType == Date {
sql += " datetime "
} else {
if statement.Engine.DriverName == SQLITE && col.IsPrimaryKey {
sql += "integer"
} else {
sql += col.SQLType.Name
}
if statement.Engine.DriverName != SQLITE && col.SQLType != Text {
if col.SQLType != Decimal {
sql += "(" + strconv.Itoa(col.Length) + ")"
} else {
sql += "(" + strconv.Itoa(col.Length) + "," + strconv.Itoa(col.Length2) + ")"
}
}
}
if col.Nullable {
sql += " NULL "
} else {
sql += " NOT NULL "
}
//fmt.Println(key)
if col.IsPrimaryKey {
sql += "PRIMARY KEY "
}
if col.IsAutoIncrement {
sql += statement.Engine.AutoIncrement + " "
}
if col.IsUnique {
sql += "Unique "
}
return sql
}
func (statement *Statement) selectColumnStr() string {
table := statement.RefTable
colNames := make([]string, 0)
for _, col := range table.Columns {
colNames = append(colNames, statement.TableName()+"."+col.Name)
}
return strings.Join(colNames, ", ")
}
func (statement *Statement) genCreateSQL() string {
sql := "CREATE TABLE IF NOT EXISTS `" + statement.TableName() + "` ("
for _, col := range statement.RefTable.Columns {
sql += statement.genColumnStr(&col)
sql += ","
}
sql = sql[:len(sql)-2] + ");"
return sql
}
func (statement *Statement) genDropSQL() string {
sql := "DROP TABLE IF EXISTS `" + statement.TableName() + "`;"
return sql
}
func (statement Statement) generateSql() string { func (statement Statement) generateSql() string {
columnStr := statement.Table.ColumnStr() columnStr := statement.selectColumnStr()
return statement.genSelectSql(columnStr) return statement.genSelectSql(columnStr)
} }
func (statement Statement) genCountSql() string { func (statement Statement) genGetSql(bean interface{}) (string, []interface{}) {
return statement.genSelectSql("count(*) as total") table := statement.Engine.AutoMap(bean)
statement.RefTable = table
colNames, args := BuildConditions(statement.Engine, table, bean)
statement.ColumnStr = strings.Join(colNames, " and ")
statement.BeanArgs = args
return statement.generateSql(), append(statement.Params, statement.BeanArgs...)
}
func (statement Statement) genCountSql(bean interface{}) (string, []interface{}) {
table := statement.Engine.AutoMap(bean)
statement.RefTable = table
colNames, args := BuildConditions(statement.Engine, table, bean)
statement.ColumnStr = strings.Join(colNames, " and ")
statement.BeanArgs = args
return statement.genSelectSql("count(*) as total"), append(statement.Params, statement.BeanArgs...)
} }
func (statement Statement) genSelectSql(columnStr string) (a string) { func (statement Statement) genSelectSql(columnStr string) (a string) {
if statement.Engine.DriverName == MSSQL { if statement.Engine.DriverName == MSSQL {
if statement.Start > 0 { if statement.Start > 0 {
a = fmt.Sprintf("select ROW_NUMBER() OVER(order by %v )as rownum,%v from %v", a = fmt.Sprintf("select ROW_NUMBER() OVER(order by %v )as rownum,%v from %v",
statement.Table.PKColumn().Name, statement.RefTable.PKColumn().Name,
columnStr, columnStr,
statement.Table.Name) statement.TableName())
if statement.WhereStr != "" { if statement.WhereStr != "" {
a = fmt.Sprintf("%v WHERE %v", a, statement.WhereStr) a = fmt.Sprintf("%v WHERE %v", a, statement.WhereStr)
if statement.ColumnStr != "" { if statement.ColumnStr != "" {
@ -127,7 +257,7 @@ func (statement Statement) genSelectSql(columnStr string) (a string) {
statement.Start, statement.Start,
statement.LimitN) statement.LimitN)
} else if statement.LimitN > 0 { } else if statement.LimitN > 0 {
a = fmt.Sprintf("SELECT top %v %v FROM %v", statement.LimitN, columnStr, statement.Table.Name) a = fmt.Sprintf("SELECT top %v %v FROM %v", statement.LimitN, columnStr, statement.TableName())
if statement.WhereStr != "" { if statement.WhereStr != "" {
a = fmt.Sprintf("%v WHERE %v", a, statement.WhereStr) a = fmt.Sprintf("%v WHERE %v", a, statement.WhereStr)
if statement.ColumnStr != "" { if statement.ColumnStr != "" {
@ -146,7 +276,7 @@ func (statement Statement) genSelectSql(columnStr string) (a string) {
a = fmt.Sprintf("%v ORDER BY %v", a, statement.OrderStr) a = fmt.Sprintf("%v ORDER BY %v", a, statement.OrderStr)
} }
} else { } else {
a = fmt.Sprintf("SELECT %v FROM %v", columnStr, statement.Table.Name) a = fmt.Sprintf("SELECT %v FROM %v", columnStr, statement.TableName())
if statement.WhereStr != "" { if statement.WhereStr != "" {
a = fmt.Sprintf("%v WHERE %v", a, statement.WhereStr) a = fmt.Sprintf("%v WHERE %v", a, statement.WhereStr)
if statement.ColumnStr != "" { if statement.ColumnStr != "" {
@ -166,7 +296,7 @@ func (statement Statement) genSelectSql(columnStr string) (a string) {
} }
} }
} else { } else {
a = fmt.Sprintf("SELECT %v FROM %v", columnStr, statement.Table.Name) a = fmt.Sprintf("SELECT %v FROM %v", columnStr, statement.TableName())
if statement.JoinStr != "" { if statement.JoinStr != "" {
a = fmt.Sprintf("%v %v", a, statement.JoinStr) a = fmt.Sprintf("%v %v", a, statement.JoinStr)
} }

10
table.go
View File

@ -3,7 +3,7 @@ package xorm
import ( import (
"reflect" "reflect"
"strconv" "strconv"
"strings" //"strings"
"time" "time"
) )
@ -70,14 +70,6 @@ type Table struct {
PrimaryKey string PrimaryKey string
} }
func (table *Table) ColumnStr() string {
colNames := make([]string, 0)
for _, col := range table.Columns {
colNames = append(colNames, table.Name+"."+col.Name)
}
return strings.Join(colNames, ", ")
}
func (table *Table) PKColumn() Column { func (table *Table) PKColumn() Column {
return table.Columns[table.PrimaryKey] return table.Columns[table.PrimaryKey]
} }

1
xorm.go
View File

@ -11,6 +11,7 @@ func Create(driverName string, dataSourceName string) Engine {
engine.Tables = make(map[reflect.Type]Table) engine.Tables = make(map[reflect.Type]Table)
engine.Statement.Engine = &engine engine.Statement.Engine = &engine
engine.InsertMany = true engine.InsertMany = true
engine.TagIdentifier = "xorm"
if driverName == SQLITE { if driverName == SQLITE {
engine.AutoIncrement = "AUTOINCREMENT" engine.AutoIncrement = "AUTOINCREMENT"
} else { } else {

64
xorm_test.go
View File

@ -356,6 +356,64 @@ func combineTransaction(t *testing.T) {
} }
} }
func table(t *testing.T) {
engine.Table("user_user").CreateTables(&Userinfo{})
}
func createMultiTables(t *testing.T) {
session, err := engine.MakeSession()
defer session.Close()
if err != nil {
t.Error(err)
return
}
user := &Userinfo{}
session.Begin()
for i := 0; i < 100; i++ {
err = session.Table(fmt.Sprintf("user_%v", i)).CreateTable(user)
if err != nil {
session.Rollback()
t.Error(err)
return
}
}
err = session.Commit()
if err != nil {
t.Error(err)
}
}
func tableOp(t *testing.T) {
user := Userinfo{Username: "tablexiao", Departname: "dev", Alias: "lunny", Created: time.Now()}
tableName := fmt.Sprintf("user_%v", len(user.Username))
id, err := engine.Table(tableName).Insert(&user)
if err != nil {
t.Error(err)
}
err = engine.Table(tableName).Get(&Userinfo{Username: "tablexiao"})
if err != nil {
t.Error(err)
}
users := make([]Userinfo, 0)
err = engine.Table(tableName).Find(&users)
if err != nil {
t.Error(err)
}
_, err = engine.Table(tableName).Id(id).Update(&Userinfo{Username: "tableda"})
if err != nil {
t.Error(err)
}
_, err = engine.Table(tableName).Id(id).Delete(&Userinfo{})
if err != nil {
t.Error(err)
}
}
func TestMysql(t *testing.T) { func TestMysql(t *testing.T) {
engine = xorm.Create("mysql", "root:123@/test?charset=utf8") engine = xorm.Create("mysql", "root:123@/test?charset=utf8")
engine.ShowSQL = true engine.ShowSQL = true
@ -381,6 +439,9 @@ func TestMysql(t *testing.T) {
having(t) having(t)
transaction(t) transaction(t)
combineTransaction(t) combineTransaction(t)
table(t)
createMultiTables(t)
tableOp(t)
} }
func TestSqlite(t *testing.T) { func TestSqlite(t *testing.T) {
@ -408,4 +469,7 @@ func TestSqlite(t *testing.T) {
having(t) having(t)
transaction(t) transaction(t)
combineTransaction(t) combineTransaction(t)
table(t)
createMultiTables(t)
tableOp(t)
} }