mirror
/
gorm
mirror of https://github.com/go-gorm/gorm.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Reworked CurrentDatabase API to return the name instead of `*gorm.DB'.

This commit is contained in:
Jay Taylor 2015-08-11 08:59:59 -07:00
parent 70725f9d77
commit beeb040c62
9 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common_dialect.go
View File

@ -71,9 +71,8 @@ func (commonDialect) Quote(key string) string {
func (c commonDialect) HasTable(scope *Scope, tableName string) bool {
var (
count int
databaseName string
databaseName = c.CurrentDatabase(scope)
)
c.CurrentDatabase(scope, &databaseName)
scope.NewDB().Raw("SELECT count(*) FROM INFORMATION_SCHEMA.TABLES WHERE table_name = ? AND table_schema = ?", tableName, databaseName).Row().Scan(&count)
return count > 0
}
@ -81,9 +80,8 @@ func (c commonDialect) HasTable(scope *Scope, tableName string) bool {
func (c commonDialect) HasColumn(scope *Scope, tableName string, columnName string) bool {
var (
count int
databaseName string
databaseName = c.CurrentDatabase(scope)
)
c.CurrentDatabase(scope, &databaseName)
scope.NewDB().Raw("SELECT count(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = ? AND table_name = ? AND column_name = ?", databaseName, tableName, columnName).Row().Scan(&count)
return count > 0
}
@ -98,6 +96,7 @@ func (commonDialect) RemoveIndex(scope *Scope, indexName string) {
scope.NewDB().Exec(fmt.Sprintf("DROP INDEX %v ON %v", indexName, scope.QuotedTableName()))
}
func (commonDialect) CurrentDatabase(scope *Scope, name *string) {
scope.Err(scope.NewDB().Raw("SELECT DATABASE()").Row().Scan(name))
func (commonDialect) CurrentDatabase(scope *Scope) (name string) {
scope.Err(scope.NewDB().Raw("SELECT DATABASE()").Row().Scan(&name))
return
}

2
dialect.go
View File

@ -17,7 +17,7 @@ type Dialect interface {
HasColumn(scope *Scope, tableName string, columnName string) bool
HasIndex(scope *Scope, tableName string, indexName string) bool
RemoveIndex(scope *Scope, indexName string)
CurrentDatabase(scope *Scope, name *string)
CurrentDatabase(scope *Scope) string
}
func NewDialect(driver string) Dialect {

5
foundation.go
View File

@ -77,6 +77,7 @@ func (foundation) HasIndex(scope *Scope, tableName string, indexName string) boo
return count > 0
}
func (foundation) CurrentDatabase(scope *Scope, name *string) {
scope.Err(scope.NewDB().Raw("SELECT CURRENT_SCHEMA").Row().Scan(name))
func (foundation) CurrentDatabase(scope *Scope) (name string) {
scope.Err(scope.NewDB().Raw("SELECT CURRENT_SCHEMA").Row().Scan(&name))
return
}

10
main.go
View File

@ -429,10 +429,12 @@ func (s *DB) RemoveIndex(indexName string) *DB {
return scope.db
}
func (s *DB) CurrentDatabase(name *string) *DB {
scope := s.clone().NewScope(s.Value)
s.dialect.CurrentDatabase(scope, name)
return scope.db
func (s *DB) CurrentDatabase() string {
var (
scope = s.clone().NewScope(s.Value)
name = s.dialect.CurrentDatabase(scope)
)
return name
}
/*

11
mssql.go
View File

@ -53,9 +53,8 @@ func (mssql) SqlTag(value reflect.Value, size int, autoIncrease bool) string {
func (s mssql) HasTable(scope *Scope, tableName string) bool {
var (
count int
databaseName string
databaseName = s.CurrentDatabase(scope)
)
s.CurrentDatabase(scope, &databaseName)
scope.NewDB().Raw("SELECT count(*) FROM INFORMATION_SCHEMA.tables WHERE table_name = ? AND table_catalog = ?", tableName, databaseName).Row().Scan(&count)
return count > 0
}
@ -63,9 +62,8 @@ func (s mssql) HasTable(scope *Scope, tableName string) bool {
func (s mssql) HasColumn(scope *Scope, tableName string, columnName string) bool {
var (
count int
databaseName string
databaseName = s.CurrentDatabase(scope)
)
s.CurrentDatabase(scope, &databaseName)
scope.NewDB().Raw("SELECT count(*) FROM information_schema.columns WHERE table_catalog = ? AND table_name = ? AND column_name = ?", databaseName, tableName, columnName).Row().Scan(&count)
return count > 0
}
@ -76,6 +74,7 @@ func (mssql) HasIndex(scope *Scope, tableName string, indexName string) bool {
return count > 0
}
func (mssql) CurrentDatabase(scope *Scope, name *string) {
scope.Err(scope.NewDB().Raw("SELECT DB_NAME() AS [Current Database]").Row().Scan(name))
func (mssql) CurrentDatabase(scope *Scope) (name string) {
scope.Err(scope.NewDB().Raw("SELECT DB_NAME() AS [Current Database]").Row().Scan(&name))
return
}

5
mysql.go
View File

@ -64,6 +64,7 @@ func (mysql) SelectFromDummyTable() string {
return "FROM DUAL"
}
func (mysql) CurrentDatabase(scope *Scope, name *string) {
scope.Err(scope.NewDB().Raw("SELECT DATABASE()").Row().Scan(name))
func (mysql) CurrentDatabase(scope *Scope) (name string) {
scope.Err(scope.NewDB().Raw("SELECT DATABASE()").Row().Scan(&name))
return
}

5
postgres.go
View File

@ -85,8 +85,9 @@ func (postgres) HasIndex(scope *Scope, tableName string, indexName string) bool
return count > 0
}
func (postgres) CurrentDatabase(scope *Scope, name *string) {
scope.Err(scope.NewDB().Raw("SELECT CURRENT_DATABASE()").Row().Scan(name))
func (postgres) CurrentDatabase(scope *Scope) (name string) {
scope.Err(scope.NewDB().Raw("SELECT CURRENT_DATABASE()").Row().Scan(&name))
return
}
var hstoreType = reflect.TypeOf(Hstore{})

8
query_test.go
View File

@ -582,12 +582,12 @@ func TestSelectWithArrayInput(t *testing.T) {
func TestCurrentDatabase(t *testing.T) {
DB.LogMode(true)
var name string
if err := DB.CurrentDatabase(&name).Error; err != nil {
databaseName := DB.CurrentDatabase()
if err := DB.Error; err != nil {
t.Errorf("Problem getting current db name: %s", err)
}
if name == "" {
if databaseName == "" {
t.Errorf("Current db name returned empty; this should never happen!")
}
t.Logf("Got current db name: %v", name)
t.Logf("Got current db name: %v", databaseName)
}

5
sqlite3.go
View File

@ -62,7 +62,7 @@ func (sqlite3) RemoveIndex(scope *Scope, indexName string) {
scope.NewDB().Exec(fmt.Sprintf("DROP INDEX %v", indexName))
}
func (sqlite3) CurrentDatabase(scope *Scope, name *string) {
func (sqlite3) CurrentDatabase(scope *Scope) (name string) {
var (
ifaces = make([]interface{}, 3)
pointers = make([]*string, 3)
@ -75,6 +75,7 @@ func (sqlite3) CurrentDatabase(scope *Scope, name *string) {
return
}
if pointers[1] != nil {
*name = *pointers[1]
name = *pointers[1]
}
return
}