From 368935ad9820ce3b5e10cd2375fba8244bf23dde Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Wed, 21 Jul 2021 13:23:30 +0800
Subject: [PATCH] Fix test

---
 dialects/dialect.go |  4 ++++
 dialects/oracle.go  | 11 +++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dialects/dialect.go b/dialects/dialect.go
index 98ad73ae..69684b2e 100644
--- a/dialects/dialect.go
+++ b/dialects/dialect.go
@@ -334,7 +334,11 @@ func ColumnString(dialect Dialect, col *schemas.Column, includePrimaryKey bool)
 	}
 
 	if !col.DefaultIsEmpty {
+<<<<<<< HEAD
 		if _, err := bd.WriteString(" DEFAULT "); err != nil {
+=======
+		if _, err := bd.WriteString("DEFAULT "); err != nil {
+>>>>>>> ab9b694 (Fix test)
 			return "", err
 		}
 		if col.Default == "" {
diff --git a/dialects/oracle.go b/dialects/oracle.go
index 4965eab6..d2561e0c 100644
--- a/dialects/oracle.go
+++ b/dialects/oracle.go
@@ -550,7 +550,10 @@ func (db *oracle) Features() *DialectFeatures {
 func (db *oracle) SQLType(c *schemas.Column) string {
 	var res string
 	switch t := c.SQLType.Name; t {
-	case schemas.Bit, schemas.TinyInt, schemas.SmallInt, schemas.MediumInt, schemas.Int, schemas.Integer, schemas.BigInt, schemas.Bool, schemas.Serial, schemas.BigSerial:
+	case schemas.Bit, schemas.TinyInt, schemas.SmallInt, schemas.MediumInt, schemas.Int, schemas.Integer, schemas.BigInt,
+		schemas.UnsignedBigInt, schemas.UnsignedBit, schemas.UnsignedInt,
+		schemas.Bool,
+		schemas.Serial, schemas.BigSerial:
 		res = "NUMBER"
 	case schemas.Binary, schemas.VarBinary, schemas.Blob, schemas.TinyBlob, schemas.MediumBlob, schemas.LongBlob, schemas.Bytea:
 		return schemas.Blob
@@ -802,7 +805,7 @@ func (db *oracle) GetColumns(queryer core.Queryer, ctx context.Context, tableNam
 		}
 
 		if _, ok := schemas.SqlTypes[col.SQLType.Name]; !ok {
-			return nil, nil, fmt.Errorf("Unknown colType %v %v", *dataType, col.SQLType)
+			return nil, nil, fmt.Errorf("unknown colType %v %v", *dataType, col.SQLType)
 		}
 
 		col.Length = dataLen
@@ -819,10 +822,6 @@ func (db *oracle) GetColumns(queryer core.Queryer, ctx context.Context, tableNam
 		return nil, nil, rows.Err()
 	}
 
-	/*select *
-	from user_tab_comments
-	where Table_Name='用户表' */
-
 	return colSeq, cols, nil
 }