Browse Source

Remove unused method.

xormplus 9 years ago
parent
commit
a3290bc46c
4 changed files with 7 additions and 17 deletions
  1. 0 15
      engine.go
  2. 1 1
      rows.go
  3. 5 0
      session.go
  4. 1 1
      xorm.go

+ 0 - 15
engine.go

@@ -135,21 +135,6 @@ func (engine *Engine) quote(sql string) string {
 	return engine.dialect.QuoteStr() + sql + engine.dialect.QuoteStr()
 }
 
-func (engine *Engine) quoteColumn(keyName string) string {
-	if len(keyName) == 0 {
-		return keyName
-	}
-
-	keyName = strings.TrimSpace(keyName)
-	keyName = strings.Replace(keyName, "`", "", -1)
-	keyName = strings.Replace(keyName, engine.QuoteStr(), "", -1)
-
-	keyName = strings.Replace(keyName, ",", engine.dialect.QuoteStr()+","+engine.dialect.QuoteStr(), -1)
-	keyName = strings.Replace(keyName, ".", engine.dialect.QuoteStr()+"."+engine.dialect.QuoteStr(), -1)
-
-	return engine.dialect.QuoteStr() + keyName + engine.dialect.QuoteStr()
-}
-
 func (engine *Engine) quoteTable(keyName string) string {
 	keyName = strings.TrimSpace(keyName)
 	if len(keyName) == 0 {

+ 1 - 1
rows.go

@@ -51,7 +51,7 @@ func newRows(session *Session, bean interface{}) (*Rows, error) {
 		sqlStr = filter.Do(sqlStr, session.Engine.dialect, rows.session.Statement.RefTable)
 	}
 
-	rows.session.saveLastSQL(sqlStr, args)
+	rows.session.saveLastSQL(sqlStr, args...)
 	var err error
 	if rows.session.prepareStmt {
 		rows.stmt, err = rows.session.DB().Prepare(sqlStr)

+ 5 - 0
session.go

@@ -373,6 +373,11 @@ func (session *Session) DB() *core.DB {
 	return session.db
 }
 
+// Cond return session's conditions
+func (session *Session) Conds() builder.Cond {
+	return session.Statement.cond
+}
+
 // Begin a transaction
 func (session *Session) Begin() error {
 	if session.IsAutoCommit {

+ 1 - 1
xorm.go

@@ -17,7 +17,7 @@ import (
 
 const (
 	// Version show the xorm's version
-	Version string = "0.6.0.0927"
+	Version string = "0.6.0.0929"
 )
 
 func regDrvsNDialects() bool {