!109 refactor：ddl生成方式重构，数据类型和长度重构，所有数据库迁移调试

* feat：同步sqlite全量sql
* refactor：ddl生成方式重构，数据类型和长度重构，所有数据库迁移调试

server/internal/db/dbm/postgres/dialect.go

@@ -66,7 +66,7 @@ func (pd *PgsqlDialect) pgsqlOnDuplicateStrategySql(duplicateStrategy int, table
 			updateColumns = append(updateColumns, fmt.Sprintf("%s = excluded.%s", col, col))
 		}
 		// 查询唯一键名,拼接冲突sql
-		_, keyRes, _ := pd.dc.Query("SELECT constraint_name FROM information_schema.table_constraints WHERE constraint_schema = $1 AND table_name = $2 AND constraint_type in ('PRIMARY KEY', 'UNIQUE') ", pd.currentSchema(), tableName)
+		_, keyRes, _ := pd.dc.Query("SELECT constraint_name FROM information_schema.table_constraints WHERE constraint_schema = $1 AND table_name = $2 AND constraint_type in ('PRIMARY KEY', 'UNIQUE') ", pd.dc.Info.CurrentSchema(), tableName)
 		if len(keyRes) > 0 {
 			for _, re := range keyRes {
 				key := anyx.ToString(re["constraint_name"])
@@ -117,11 +117,6 @@ func (pd *PgsqlDialect) gaussOnDuplicateStrategySql(duplicateStrategy int, table
 	return suffix
 }
 
-// 从连接信息中获取数据库和schema信息
-func (pd *PgsqlDialect) currentSchema() string {
-	return pd.dc.Info.CurrentSchema()
-}
-
 func (pd *PgsqlDialect) CopyTable(copy *dbi.DbCopyTable) error {
 	tableName := copy.TableName
 	// 生成新表名,为老表明+_copy_时间戳
@@ -180,189 +175,48 @@ func (pd *PgsqlDialect) CopyTable(copy *dbi.DbCopyTable) error {
 	return err
 }
 
-func (pd *PgsqlDialect) CreateTable(commonColumns []dbi.Column, tableInfo dbi.Table, dropOldTable bool) (int, error) {
-	meta := pd.dc.GetMetaData()
-	replacer := strings.NewReplacer(";", "", "'", "")
-	if dropOldTable {
-		_, _ = pd.dc.Exec(fmt.Sprintf("DROP TABLE IF EXISTS %s", tableInfo.TableName))
+func (pd *PgsqlDialect) ToCommonColumn(column *dbi.Column) {
+	// 翻译为通用数据库类型
+	dataType := column.DataType
+	t1 := commonColumnTypeMap[string(dataType)]
+	if t1 == "" {
+		column.DataType = dbi.CommonTypeVarchar
+		column.CharMaxLength = 2000
+	} else {
+		column.DataType = t1
 	}
-	// 组装建表语句
-	createSql := fmt.Sprintf("CREATE TABLE %s (\n", meta.QuoteIdentifier(tableInfo.TableName))
-	fields := make([]string, 0)
-	pks := make([]string, 0)
-	columnComments := make([]string, 0)
-	// 把通用类型转换为达梦类型
-	for _, column := range commonColumns {
-		// 取出当前数据库类型
-		arr := strings.Split(column.ColumnType, "(")
-		ctype := arr[0]
-		// 翻译为通用数据库类型
-		t1 := pgsqlColumnTypeMap[dbi.ColumnDataType(ctype)]
-		if t1 == "" {
-			ctype = "varchar(2000)"
-		} else {
-			// 回写到列信息
-			if len(arr) > 1 {
-				if strings.Contains(strings.ToLower(t1), "int") {
-					// 如果是数字，类型后不需要带长度
-					ctype = t1
-				} else if strings.Contains(strings.ToLower(t1), "char") {
-					// 如果是字符串，长度翻倍
-					match := bracketsRegexp.FindStringSubmatch(column.ColumnType)
-					if len(match) > 1 {
-						ctype = fmt.Sprintf("%s(%d)", t1, anyx.ConvInt(match[1])*2)
-					} else {
-						ctype = t1 + "(1000)"
-					}
-				} else {
-					ctype = t1 + "(" + arr[1]
-				}
-			} else {
-				ctype = t1
-			}
-		}
-		column.ColumnType = ctype
-
-		if column.IsPrimaryKey {
-			pks = append(pks, meta.QuoteIdentifier(column.ColumnName))
-		}
-		fields = append(fields, pd.genColumnBasicSql(column))
-		commentTmp := "comment on column %s.%s is '%s'"
-		// 防止注释内含有特殊字符串导致sql出错
-		comment := replacer.Replace(column.ColumnComment)
-		columnComments = append(columnComments, fmt.Sprintf(commentTmp, column.TableName, column.ColumnName, comment))
-	}
-	createSql += strings.Join(fields, ",")
-	if len(pks) > 0 {
-		createSql += fmt.Sprintf(", PRIMARY KEY (%s)", strings.Join(pks, ","))
-	}
-	createSql += ")"
-	tableCommentSql := ""
-	if tableInfo.TableComment != "" {
-		commentTmp := "comment on table %s is '%s'"
-		tableCommentSql = fmt.Sprintf(commentTmp, tableInfo.TableName, replacer.Replace(tableInfo.TableComment))
-	}
-
-	columnCommentSql := strings.Join(columnComments, ";")
-
-	sqls := make([]string, 0)
-
-	if createSql != "" {
-		sqls = append(sqls, createSql)
-	}
-	if tableCommentSql != "" {
-		sqls = append(sqls, tableCommentSql)
-	}
-	if columnCommentSql != "" {
-		sqls = append(sqls, columnCommentSql)
-	}
-
-	_, err := pd.dc.Exec(strings.Join(sqls, ";"))
-
-	return 1, err
 }
 
-func (pd *PgsqlDialect) genColumnBasicSql(column dbi.Column) string {
+func (pd *PgsqlDialect) ToColumn(commonColumn *dbi.Column) {
+	ctype := pgsqlColumnTypeMap[commonColumn.DataType]
+
+	if ctype == "" {
+		commonColumn.DataType = "varchar"
+		commonColumn.CharMaxLength = 2000
+	} else {
+		commonColumn.DataType = dbi.ColumnDataType(ctype)
+		// 哪些字段可以指定长度
+		if !collx.ArrayAnyMatches([]string{"char", "time", "bit", "num", "decimal"}, ctype) {
+			commonColumn.CharMaxLength = 0
+			commonColumn.NumPrecision = 0
+		} else if strings.Contains(strings.ToLower(ctype), "char") {
+			// 如果类型是文本，长度翻倍
+			commonColumn.CharMaxLength = commonColumn.CharMaxLength * 2
+		}
+	}
+
+}
+
+func (pd *PgsqlDialect) CreateTable(commonColumns []dbi.Column, tableInfo dbi.Table, dropOldTable bool) (int, error) {
 	meta := pd.dc.GetMetaData()
-	colName := meta.QuoteIdentifier(column.ColumnName)
-
-	// 如果是自增类型，需要转换为serial
-	if column.IsIdentity {
-		if column.ColumnType == "int4" {
-			column.ColumnType = "serial"
-		} else if column.ColumnType == "int2" {
-			column.ColumnType = "smallserial"
-		} else if column.ColumnType == "int8" {
-			column.ColumnType = "bigserial"
-		} else {
-			column.ColumnType = "bigserial"
-		}
-
-		return fmt.Sprintf(" %s %s NOT NULL", colName, column.ColumnType)
-	}
-
-	nullAble := ""
-	if column.Nullable == "NO" {
-		nullAble = " NOT NULL"
-		// 如果字段不能为空，则设置默认值
-		if column.ColumnDefault == "" {
-			if collx.ArrayAnyMatches([]string{"char", "text", "lob"}, strings.ToLower(column.ColumnType)) {
-				// 文本默认值为空字符串
-				column.ColumnDefault = " "
-			} else if collx.ArrayAnyMatches([]string{"int", "num"}, strings.ToLower(column.ColumnType)) {
-				// 数字默认值为0
-				column.ColumnDefault = "0"
-			}
-		}
-	}
-
-	defVal := "" // 默认值需要判断引号，如函数是不需要引号的 // 为了防止跨源函数不支持 当默认值是函数时，不需要设置默认值
-	if column.ColumnDefault != "" && !strings.Contains(column.ColumnDefault, "(") {
-		// 哪些字段类型默认值需要加引号
-		mark := false
-		if collx.ArrayAnyMatches([]string{"char", "text", "date", "time", "lob"}, strings.ToLower(column.ColumnType)) {
-			// 如果是文本类型，则默认值不能带括号
-			if collx.ArrayAnyMatches([]string{"char", "text", "lob"}, strings.ToLower(column.ColumnType)) {
-				column.ColumnDefault = ""
-			}
-
-			// 当数据类型是日期时间，默认值是日期时间函数时，默认值不需要引号
-			if collx.ArrayAnyMatches([]string{"date", "time"}, strings.ToLower(column.ColumnType)) &&
-				collx.ArrayAnyMatches([]string{"DATE", "TIME"}, strings.ToUpper(column.ColumnDefault)) {
-				mark = false
-			} else {
-				mark = true
-			}
-		}
-		// 如果数据类型是日期时间，则写死默认值函数
-		if collx.ArrayAnyMatches([]string{"date", "time"}, strings.ToLower(column.ColumnType)) {
-			column.ColumnDefault = "CURRENT_TIMESTAMP"
-		}
-
-		if column.ColumnDefault != "" {
-			if mark {
-				defVal = fmt.Sprintf(" DEFAULT '%s'", column.ColumnDefault)
-			} else {
-				defVal = fmt.Sprintf(" DEFAULT %s", column.ColumnDefault)
-			}
-		}
-	}
-
-	columnSql := fmt.Sprintf(" %s %s %s %s ", colName, column.ColumnType, nullAble, defVal)
-	return columnSql
+	sqlArr := meta.GenerateTableDDL(commonColumns, tableInfo, dropOldTable)
+	_, err := pd.dc.Exec(strings.Join(sqlArr, ";"))
+	return len(sqlArr), err
 }
 
 func (pd *PgsqlDialect) CreateIndex(tableInfo dbi.Table, indexs []dbi.Index) error {
-	sqls := make([]string, 0)
-	comments := make([]string, 0)
-	for _, index := range indexs {
-		// 通过字段、表名拼接索引名
-		columnName := strings.ReplaceAll(index.ColumnName, "-", "")
-		columnName = strings.ReplaceAll(columnName, "_", "")
-		colName := strings.ReplaceAll(columnName, ",", "_")
-
-		keyType := "normal"
-		unique := ""
-		if index.IsUnique {
-			keyType = "unique"
-			unique = "unique"
-		}
-		indexName := fmt.Sprintf("%s_key_%s_%s", keyType, tableInfo.TableName, colName)
-
-		// 如果索引名存在，先删除索引
-		sqls = append(sqls, fmt.Sprintf("drop index if exists %s.%s", pd.currentSchema(), indexName))
-
-		// 创建索引
-		sqls = append(sqls, fmt.Sprintf("CREATE %s INDEX %s on %s.%s(%s)", unique, indexName, pd.currentSchema(), tableInfo.TableName, index.ColumnName))
-		if index.IndexComment != "" {
-			comments = append(comments, fmt.Sprintf("COMMENT ON INDEX %s.%s IS '%s'", pd.currentSchema(), indexName, index.IndexComment))
-		}
-	}
-	_, err := pd.dc.Exec(strings.Join(sqls, ";"))
-	// 添加注释
-	if len(comments) > 0 {
-		_, err = pd.dc.Exec(strings.Join(comments, ";"))
-	}
+	sqlArr := pd.dc.GetMetaData().GenerateIndexDDL(indexs, tableInfo)
+	_, err := pd.dc.Exec(strings.Join(sqlArr, ";"))
 	return err
 }
 

server/internal/db/dbm/postgres/meta.go

@@ -30,7 +30,7 @@ type PostgresMeta struct {
 	Param string
 }
 
-func (md *PostgresMeta) GetSqlDb(d *dbi.DbInfo) (*sql.DB, error) {
+func (pm *PostgresMeta) GetSqlDb(d *dbi.DbInfo) (*sql.DB, error) {
 	driverName := "postgres"
 	// SSH Conect
 	if d.SshTunnelMachineId > 0 {
@@ -74,8 +74,8 @@ func (md *PostgresMeta) GetSqlDb(d *dbi.DbInfo) (*sql.DB, error) {
 		dsn = fmt.Sprintf("%s %s", dsn, strings.Join(strings.Split(d.Params, "&"), " "))
 	}
 
-	if md.Param != "" && !strings.Contains(dsn, "dbtype") {
-		dsn = fmt.Sprintf("%s %s", dsn, md.Param)
+	if pm.Param != "" && !strings.Contains(dsn, "dbtype") {
+		dsn = fmt.Sprintf("%s %s", dsn, pm.Param)
 	}
 
 	return sql.Open(driverName, dsn)
@@ -94,8 +94,8 @@ type PqSqlDialer struct {
 	sshTunnelMachineId int
 }
 
-func (d *PqSqlDialer) Open(name string) (driver.Conn, error) {
-	return pq.DialOpen(d, name)
+func (pd *PqSqlDialer) Open(name string) (driver.Conn, error) {
+	return pq.DialOpen(pd, name)
 }
 
 func (pd *PqSqlDialer) Dial(network, address string) (net.Conn, error) {

server/internal/db/dbm/postgres/metadata.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"mayfly-go/internal/db/dbm/dbi"
 	"mayfly-go/pkg/errorx"
+	"mayfly-go/pkg/logx"
 	"mayfly-go/pkg/utils/anyx"
 	"mayfly-go/pkg/utils/collx"
 	"mayfly-go/pkg/utils/stringx"
@@ -18,7 +19,6 @@ const (
 	PGSQL_TABLE_INFO_KEY = "PGSQL_TABLE_INFO"
 	PGSQL_INDEX_INFO_KEY = "PGSQL_INDEX_INFO"
 	PGSQL_COLUMN_MA_KEY  = "PGSQL_COLUMN_MA"
-	PGSQL_TABLE_DDL_KEY  = "PGSQL_TABLE_DDL_FUNC"
 )
 
 type PgsqlMetaData struct {
@@ -99,17 +99,23 @@ func (pd *PgsqlMetaData) GetColumns(tableNames ...string) ([]dbi.Column, error)
 
 	columns := make([]dbi.Column, 0)
 	for _, re := range res {
-		columns = append(columns, dbi.Column{
+		column := dbi.Column{
 			TableName:     anyx.ConvString(re["tableName"]),
 			ColumnName:    anyx.ConvString(re["columnName"]),
-			ColumnType:    anyx.ConvString(re["columnType"]),
+			DataType:      dbi.ColumnDataType(anyx.ConvString(re["dataType"])),
+			CharMaxLength: anyx.ConvInt(re["charMaxLength"]),
 			ColumnComment: anyx.ConvString(re["columnComment"]),
 			Nullable:      anyx.ConvString(re["nullable"]),
 			IsPrimaryKey:  anyx.ConvInt(re["isPrimaryKey"]) == 1,
 			IsIdentity:    anyx.ConvInt(re["isIdentity"]) == 1,
 			ColumnDefault: anyx.ConvString(re["columnDefault"]),
+			NumPrecision:  anyx.ConvInt(re["numPrecision"]),
 			NumScale:      anyx.ConvInt(re["numScale"]),
-		})
+		}
+
+		// 初始化列展示的长度，精度
+		column.InitShowNum()
+		columns = append(columns, column)
 	}
 	return columns, nil
 }
@@ -168,20 +174,207 @@ func (pd *PgsqlMetaData) GetTableIndex(tableName string) ([]dbi.Index, error) {
 	return result, nil
 }
 
+func (pd *PgsqlMetaData) GenerateIndexDDL(indexs []dbi.Index, tableInfo dbi.Table) []string {
+	creates := make([]string, 0)
+	drops := make([]string, 0)
+	comments := make([]string, 0)
+	for _, index := range indexs {
+		// 通过字段、表名拼接索引名
+		columnName := strings.ReplaceAll(index.ColumnName, "-", "")
+		columnName = strings.ReplaceAll(columnName, "_", "")
+		colName := strings.ReplaceAll(columnName, ",", "_")
+
+		keyType := "normal"
+		unique := ""
+		if index.IsUnique {
+			keyType = "unique"
+			unique = "unique"
+		}
+		indexName := fmt.Sprintf("%s_key_%s_%s", keyType, tableInfo.TableName, colName)
+
+		// 如果索引名存在，先删除索引
+		drops = append(drops, fmt.Sprintf("drop index if exists %s.%s", pd.dc.Info.CurrentSchema(), indexName))
+
+		// 创建索引
+		creates = append(creates, fmt.Sprintf("CREATE %s INDEX %s on %s.%s(%s)", unique, indexName, pd.dc.Info.CurrentSchema(), tableInfo.TableName, index.ColumnName))
+		if index.IndexComment != "" {
+			comments = append(comments, fmt.Sprintf("COMMENT ON INDEX %s.%s IS '%s'", pd.dc.Info.CurrentSchema(), indexName, index.IndexComment))
+		}
+	}
+
+	sqlArr := make([]string, 0)
+
+	if len(drops) > 0 {
+		sqlArr = append(sqlArr, drops...)
+	}
+
+	if len(creates) > 0 {
+		sqlArr = append(sqlArr, creates...)
+	}
+	if len(comments) > 0 {
+		sqlArr = append(sqlArr, comments...)
+	}
+	return sqlArr
+}
+
+func (pd *PgsqlMetaData) genColumnBasicSql(column dbi.Column) string {
+	meta := pd.dc.GetMetaData()
+	colName := meta.QuoteIdentifier(column.ColumnName)
+	dataType := string(column.DataType)
+
+	// 如果是自增类型，需要转换为serial
+	if column.IsIdentity {
+		if dataType == "int4" {
+			column.DataType = "serial"
+		} else if dataType == "int2" {
+			column.DataType = "smallserial"
+		} else if dataType == "int8" {
+			column.DataType = "bigserial"
+		} else {
+			column.DataType = "bigserial"
+		}
+
+		return fmt.Sprintf(" %s %s NOT NULL", colName, column.ShowDataType)
+	}
+
+	nullAble := ""
+	if column.Nullable == "NO" {
+		nullAble = " NOT NULL"
+		// 如果字段不能为空，则设置默认值
+		if column.ColumnDefault == "" {
+			if collx.ArrayAnyMatches([]string{"char", "text", "lob"}, strings.ToLower(dataType)) {
+				// 文本默认值为空字符串
+				column.ColumnDefault = " "
+			} else if collx.ArrayAnyMatches([]string{"int", "num"}, strings.ToLower(dataType)) {
+				// 数字默认值为0
+				column.ColumnDefault = "0"
+			}
+		}
+	}
+
+	defVal := "" // 默认值需要判断引号，如函数是不需要引号的 // 为了防止跨源函数不支持 当默认值是函数时，不需要设置默认值
+	if column.ColumnDefault != "" && !strings.Contains(column.ColumnDefault, "(") {
+		// 哪些字段类型默认值需要加引号
+		mark := false
+		if collx.ArrayAnyMatches([]string{"char", "text", "date", "time", "lob"}, dataType) {
+			// 如果是文本类型，则默认值不能带括号
+			if collx.ArrayAnyMatches([]string{"char", "text", "lob"}, dataType) {
+				column.ColumnDefault = ""
+			}
+
+			// 当数据类型是日期时间，默认值是日期时间函数时，默认值不需要引号
+			if collx.ArrayAnyMatches([]string{"date", "time"}, strings.ToLower(dataType)) &&
+				collx.ArrayAnyMatches([]string{"DATE", "TIME"}, strings.ToUpper(column.ColumnDefault)) {
+				mark = false
+			} else {
+				mark = true
+			}
+		}
+		// 如果数据类型是日期时间，则写死默认值函数
+		if collx.ArrayAnyMatches([]string{"date", "time"}, strings.ToLower(dataType)) {
+			column.ColumnDefault = "CURRENT_TIMESTAMP"
+		}
+
+		if column.ColumnDefault != "" {
+			if mark {
+				defVal = fmt.Sprintf(" DEFAULT '%s'", column.ColumnDefault)
+			} else {
+				defVal = fmt.Sprintf(" DEFAULT %s", column.ColumnDefault)
+			}
+		}
+	}
+
+	columnSql := fmt.Sprintf(" %s %s %s %s ", colName, column.ShowDataType, nullAble, defVal)
+	return columnSql
+}
+
+func (pd *PgsqlMetaData) GenerateTableDDL(columns []dbi.Column, tableInfo dbi.Table, dropBeforeCreate bool) []string {
+
+	meta := pd.dc.GetMetaData()
+	replacer := strings.NewReplacer(";", "", "'", "")
+
+	sqlArr := make([]string, 0)
+	if dropBeforeCreate {
+		sqlArr = append(sqlArr, fmt.Sprintf("DROP TABLE IF EXISTS %s", meta.QuoteIdentifier(tableInfo.TableName)))
+	}
+	// 组装建表语句
+	createSql := fmt.Sprintf("CREATE TABLE %s (\n", meta.QuoteIdentifier(tableInfo.TableName))
+	fields := make([]string, 0)
+	pks := make([]string, 0)
+	columnComments := make([]string, 0)
+	commentTmp := "comment on column %s.%s is '%s'"
+
+	for _, column := range columns {
+		if column.IsPrimaryKey {
+			pks = append(pks, meta.QuoteIdentifier(column.ColumnName))
+		}
+
+		fields = append(fields, pd.genColumnBasicSql(column))
+
+		// 防止注释内含有特殊字符串导致sql出错
+		if column.ColumnComment != "" {
+			comment := replacer.Replace(column.ColumnComment)
+			columnComments = append(columnComments, fmt.Sprintf(commentTmp, column.TableName, column.ColumnName, comment))
+		}
+	}
+
+	createSql += strings.Join(fields, ",\n")
+	if len(pks) > 0 {
+		createSql += fmt.Sprintf(", \nPRIMARY KEY (%s)", strings.Join(pks, ","))
+	}
+	createSql += ")"
+
+	tableCommentSql := ""
+	if tableInfo.TableComment != "" {
+		commentTmp := "comment on table %s is '%s'"
+		tableCommentSql = fmt.Sprintf(commentTmp, tableInfo.TableName, replacer.Replace(tableInfo.TableComment))
+	}
+
+	// create
+	sqlArr = append(sqlArr, createSql)
+
+	// table comment
+	if tableCommentSql != "" {
+		sqlArr = append(sqlArr, tableCommentSql)
+	}
+	// column comment
+	if len(columnComments) > 0 {
+		sqlArr = append(sqlArr, columnComments...)
+	}
+
+	return sqlArr
+}
+
 // 获取建表ddl
 func (pd *PgsqlMetaData) GetTableDDL(tableName string) (string, error) {
-	_, err := pd.dc.Exec(dbi.GetLocalSql(PGSQL_META_FILE, PGSQL_TABLE_DDL_KEY))
-	if err != nil {
+
+	// 1.获取表信息
+	tbs, err := pd.GetTables(tableName)
+	tableInfo := &dbi.Table{}
+	if err != nil && len(tbs) > 0 {
+
+		logx.Errorf("获取表信息失败, %s", tableName)
 		return "", err
 	}
+	tableInfo.TableName = tbs[0].TableName
+	tableInfo.TableComment = tbs[0].TableComment
 
-	ddlSql := fmt.Sprintf("select showcreatetable('%s','%s') as sql", pd.dc.Info.CurrentSchema(), tableName)
-	_, res, err := pd.dc.Query(ddlSql)
+	// 2.获取列信息
+	columns, err := pd.GetColumns(tableName)
 	if err != nil {
+		logx.Errorf("获取列信息失败, %s", tableName)
 		return "", err
 	}
-
-	return res[0]["sql"].(string), nil
+	tableDDLArr := pd.GenerateTableDDL(columns, *tableInfo, false)
+	// 3.获取索引信息
+	indexs, err := pd.GetTableIndex(tableName)
+	if err != nil {
+		logx.Errorf("获取索引信息失败, %s", tableName)
+		return "", err
+	}
+	// 组装返回
+	tableDDLArr = append(tableDDLArr, pd.GenerateIndexDDL(indexs, *tableInfo)...)
+	return strings.Join(tableDDLArr, ";\n"), nil
 }
 
 // 获取pgsql当前连接的库可访问的schemaNames
@@ -247,7 +440,7 @@ var (
 		"nchar":       dbi.CommonTypeChar,
 		"varchar":     dbi.CommonTypeVarchar,
 		"text":        dbi.CommonTypeText,
-		"bytea":       dbi.CommonTypeBinary,
+		"bytea":       dbi.CommonTypeText,
 		"date":        dbi.CommonTypeDate,
 		"time":        dbi.CommonTypeTime,
 		"timestamp":   dbi.CommonTypeTimestamp,
@@ -260,10 +453,10 @@ var (
 		dbi.CommonTypeBlob:       "text",
 		dbi.CommonTypeLongblob:   "text",
 		dbi.CommonTypeLongtext:   "text",
-		dbi.CommonTypeBinary:     "bytea",
+		dbi.CommonTypeBinary:     "text",
 		dbi.CommonTypeMediumblob: "text",
 		dbi.CommonTypeMediumtext: "text",
-		dbi.CommonTypeVarbinary:  "bytea",
+		dbi.CommonTypeVarbinary:  "text",
 		dbi.CommonTypeInt:        "int4",
 		dbi.CommonTypeSmallint:   "int2",
 		dbi.CommonTypeTinyint:    "int2",