tablet/gorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up types and deadcode

Browse Source
This commit is contained in:
Jim Lambert 2020-02-12 14:44:04 -05:00
parent a8686f7106
commit de34a5f3a2
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dialects/oracle/oracle.go
View File

@ -1,5 +1,5 @@
//Oracle dialect for GORM //Oracle oracle implements a gorm dialect
package gorm package oracle
import ( import (
"fmt" "fmt"
@ -7,15 +7,10 @@ import (
"strconv" "strconv"
"strings" "strings"
"time" "time"
_ "github.com/godror/godror"
"github.com/jinzhu/gorm" "github.com/jinzhu/gorm"
_ "github.com/mattn/go-oci8" _ "github.com/mattn/go-oci8"
_ "gopkg.in/rana/ora.v4"
) )
//const dialectName = "godror"
// const dialectName = "ora"
const dialectName = "oci8" const dialectName = "oci8"
type oracle struct { type oracle struct {
@ -25,7 +20,6 @@ type oracle struct {
func init() { func init() {
gorm.RegisterDialect(dialectName, &oracle{}) gorm.RegisterDialect(dialectName, &oracle{})
} }
func (s *oracle) fieldCanAutoIncrement(field *gorm.StructField) bool { func (s *oracle) fieldCanAutoIncrement(field *gorm.StructField) bool {
@ -157,7 +151,7 @@ func (s *oracle) DataTypeOf(field *gorm.StructField) string {
case size > 0 && size < 4000: case size > 0 && size < 4000:
sqlType = fmt.Sprintf("VARCHAR2(%d)", size) sqlType = fmt.Sprintf("VARCHAR2(%d)", size)
case size == 0: case size == 0:
sqlType = "VARCHAR2 (4000)" sqlType = "VARCHAR2 (4000)" // no size specified, so default to something that can be indexed
default: default:
sqlType = "CLOB" sqlType = "CLOB"
} }
@ -172,7 +166,14 @@ func (s *oracle) DataTypeOf(field *gorm.StructField) string {
} }
default: default:
if gorm.IsByteArrayOrSlice(dataValue) { if gorm.IsByteArrayOrSlice(dataValue) {
sqlType = "VARCHAR2 (4000)" switch {
case size > 0 && size < 4000:
sqlType = fmt.Sprintf("VARCHAR2(%d)", size)
case size == 0:
sqlType = "VARCHAR2 (4000)" // no size specified, so default to something that can be indexed
default:
sqlType = "BLOB"
}
} }
} }
} }
@ -194,7 +195,6 @@ func (s *oracle) DataTypeOf(field *gorm.StructField) string {
additionalType = notNull + " " + unique additionalType = notNull + " " + unique
if value, ok := field.TagSettingsGet("DEFAULT"); ok { if value, ok := field.TagSettingsGet("DEFAULT"); ok {
additionalType = fmt.Sprintf("%s %s %s", "DEFAULT", value, additionalType) additionalType = fmt.Sprintf("%s %s %s", "DEFAULT", value, additionalType)
// additionalType = additionalType + " DEFAULT " + value
} }
if value, ok := field.TagSettingsGet("COMMENT"); ok { if value, ok := field.TagSettingsGet("COMMENT"); ok {