fixed

gophersbd · May 21, 2018 · 7acce77 · 7acce77
1 parent 2c11c98
commit 7acce77
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/pkg/dialect/postgres/dialect_postgres.go b/pkg/dialect/postgres/dialect_postgres.go
@@ -21,20 +21,14 @@ func (s *postgres) ColumnSignatureOf(field *descriptor.Field) string {
 	var sqlType, at = dialect.ParseColumnSignature(field, Type2SQLType)
 
 	switch sqlType.Name {
-	case Int:
+	case Integer:
 		if at.SetConstraint[dialect.ConstraintAutoIncrement] {
 			sqlType.Name = Serial
-		} else {
-			sqlType.Name = Integer
 		}
 	case BigInt:
 		if at.SetConstraint[dialect.ConstraintAutoIncrement] {
 			sqlType.Name = BigSerial
-		} else {
-			sqlType.Name = BigInt
 		}
-	case Float, Double:
-		sqlType.Name = Numeric
 	case Varchar:
 		size := sqlType.DefaultLength
 		if !(size > 0 && size < 65532) {

diff --git a/pkg/dialect/postgres/types.go b/pkg/dialect/postgres/types.go
@@ -8,12 +8,9 @@ import (
 
 // Supported Data type
 const (
-	Int       = "INT"
 	BigInt    = "BIGINT"
 	Varchar   = "VARCHAR"
 	Text      = "TEXT"
-	Float     = "FLOAT"
-	Double    = "DOUBLE"
 	Numeric   = "NUMERIC"
 	Bool      = "BOOL"
 	Boolean   = "BOOLEAN"
@@ -28,10 +25,9 @@ func Type2SQLType(field *descriptor.Field) (st dialect.SQLType) {
 	filedType := field.FieldDescriptorProto.GetType()
 	typeName := field.FieldDescriptorProto.GetTypeName()
 	switch filedType {
-	case protod.FieldDescriptorProto_TYPE_DOUBLE:
-		st = dialect.SQLType{Name: Double, DefaultLength: 0}
-	case protod.FieldDescriptorProto_TYPE_FLOAT:
-		st = dialect.SQLType{Name: Float, DefaultLength: 0}
+	case protod.FieldDescriptorProto_TYPE_DOUBLE,
+		protod.FieldDescriptorProto_TYPE_FLOAT:
+		st = dialect.SQLType{Name: Numeric, DefaultLength: 0}
 	case protod.FieldDescriptorProto_TYPE_INT64,
 		protod.FieldDescriptorProto_TYPE_UINT64,
 		protod.FieldDescriptorProto_TYPE_FIXED64,
@@ -43,7 +39,7 @@ func Type2SQLType(field *descriptor.Field) (st dialect.SQLType) {
 		protod.FieldDescriptorProto_TYPE_UINT32,
 		protod.FieldDescriptorProto_TYPE_SFIXED32,
 		protod.FieldDescriptorProto_TYPE_SINT32:
-		st = dialect.SQLType{Name: Int, DefaultLength: 0}
+		st = dialect.SQLType{Name: Integer, DefaultLength: 0}
 	case protod.FieldDescriptorProto_TYPE_BOOL:
 		st = dialect.SQLType{Name: Bool, DefaultLength: 0}
 	case protod.FieldDescriptorProto_TYPE_STRING:

diff --git a/pkg/dialect/postgres/types_test.go b/pkg/dialect/postgres/types_test.go
@@ -15,14 +15,14 @@ func TestType2SQLType(t *testing.T) {
 			Type: &fType,
 		},
 	}
-	assert.Equal(t, Type2SQLType(f).Name, Double)
+	assert.Equal(t, Type2SQLType(f).Name, Numeric)
 
 	fType = protod.FieldDescriptorProto_TYPE_FLOAT
-	assert.Equal(t, Type2SQLType(f).Name, Float)
+	assert.Equal(t, Type2SQLType(f).Name, Numeric)
 	fType = protod.FieldDescriptorProto_TYPE_SINT64
 	assert.Equal(t, Type2SQLType(f).Name, BigInt)
 	fType = protod.FieldDescriptorProto_TYPE_SINT32
-	assert.Equal(t, Type2SQLType(f).Name, Int)
+	assert.Equal(t, Type2SQLType(f).Name, Integer)
 	fType = protod.FieldDescriptorProto_TYPE_BOOL
 	assert.Equal(t, Type2SQLType(f).Name, Bool)
 	fType = protod.FieldDescriptorProto_TYPE_STRING