From 4969fc9cb52529ecbb0e1d4ff5dfec5494f9ffdd Mon Sep 17 00:00:00 2001 From: Jinzhu Date: Sun, 16 Mar 2014 07:50:57 +0800 Subject: [PATCH] Remove unused Scanner type from dialect --- dialect/mysql.go | 9 ++++----- dialect/postgres.go | 9 ++++----- dialect/sqlite3.go | 9 ++++----- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dialect/mysql.go b/dialect/mysql.go index a1c0a26e..2a5ac0c0 100644 --- a/dialect/mysql.go +++ b/dialect/mysql.go @@ -1,7 +1,6 @@ package dialect import ( - "database/sql" "fmt" "time" ) @@ -20,13 +19,13 @@ func (d *mysql) SqlTag(column interface{}, size int) string { switch column.(type) { case time.Time: return "datetime" - case bool, sql.NullBool: + case bool: return "boolean" case int, int8, int16, int32, uint, uint8, uint16, uint32: return "int" - case int64, uint64, sql.NullInt64: + case int64, uint64: return "bigint" - case float32, float64, sql.NullFloat64: + case float32, float64: return "double" case []byte: if size > 0 && size < 65532 { @@ -34,7 +33,7 @@ func (d *mysql) SqlTag(column interface{}, size int) string { } else { return "longblob" } - case string, sql.NullString: + case string: if size > 0 && size < 65532 { return fmt.Sprintf("varchar(%d)", size) } else { diff --git a/dialect/postgres.go b/dialect/postgres.go index c0981cd0..7cffe9dc 100644 --- a/dialect/postgres.go +++ b/dialect/postgres.go @@ -1,7 +1,6 @@ package dialect import ( - "database/sql" "fmt" "time" ) @@ -21,17 +20,17 @@ func (d *postgres) SqlTag(column interface{}, size int) string { switch column.(type) { case time.Time: return "timestamp with time zone" - case bool, sql.NullBool: + case bool: return "boolean" case int, int8, int16, int32, uint, uint8, uint16, uint32: return "integer" - case int64, uint64, sql.NullInt64: + case int64, uint64: return "bigint" - case float32, float64, sql.NullFloat64: + case float32, float64: return "numeric" case []byte: return "bytea" - case string, sql.NullString: + case string: if size > 0 && size < 65532 { return fmt.Sprintf("varchar(%d)", size) } else { diff --git a/dialect/sqlite3.go b/dialect/sqlite3.go index 92063786..4d16c3a8 100644 --- a/dialect/sqlite3.go +++ b/dialect/sqlite3.go @@ -1,7 +1,6 @@ package dialect import ( - "database/sql" "fmt" "time" ) @@ -20,17 +19,17 @@ func (s *sqlite3) SqlTag(column interface{}, size int) string { switch column.(type) { case time.Time: return "datetime" - case bool, sql.NullBool: + case bool: return "bool" case int, int8, int16, int32, uint, uint8, uint16, uint32: return "integer" - case int64, uint64, sql.NullInt64: + case int64, uint64: return "bigint" - case float32, float64, sql.NullFloat64: + case float32, float64: return "real" case []byte: return "blob" - case string, sql.NullString: + case string: if size > 0 && size < 65532 { return fmt.Sprintf("varchar(%d)", size) } else {