Skip to content

Commit 68156b5

Browse files
committed
Merging cockroachdb + postgreSQL regex together. It work in all these cases:
`'field'::character varying` `'field':::character varying` `field::character varying` `field:::character varying`
1 parent 6e0fcdf commit 68156b5

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

migrator.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"regexp"
77
"strings"
88

9-
"github.com/jackc/pgx/v5"
109
"gorm.io/gorm"
1110
"gorm.io/gorm/clause"
1211
"gorm.io/gorm/migrator"
@@ -438,10 +437,7 @@ func (m Migrator) ColumnTypes(value interface{}) (columnTypes []gorm.ColumnType,
438437
}
439438

440439
if column.DefaultValueValue.Valid {
441-
column.DefaultValueValue.String = regexp.MustCompile(`'(.*)'::[\w\s]+$`).ReplaceAllString(column.DefaultValueValue.String, "$1")
442-
column.DefaultValueValue.String = regexp.MustCompile(`'(.*)'::[\w]+$`).ReplaceAllString(column.DefaultValueValue.String, "$1")
443-
// cockroachdb, removing :::type
444-
column.DefaultValueValue.String = regexp.MustCompile(`(.*):::[\w]+$`).ReplaceAllString(column.DefaultValueValue.String, "$1")
440+
column.DefaultValueValue.String = regexp.MustCompile(`'?(.*)\b'?:+[\w\s]+$`).ReplaceAllString(column.DefaultValueValue.String, "$1")
445441
}
446442

447443
if datetimePrecision.Valid {

0 commit comments

Comments
 (0)