diff --git a/src/main/java/cz/startnet/utils/pgdiff/schema/PgColumn.java b/src/main/java/cz/startnet/utils/pgdiff/schema/PgColumn.java index fcceb48c..329fcbaf 100644 --- a/src/main/java/cz/startnet/utils/pgdiff/schema/PgColumn.java +++ b/src/main/java/cz/startnet/utils/pgdiff/schema/PgColumn.java @@ -261,13 +261,20 @@ public List getPrivileges() { public void parseDefinition(final String definition) { String string = definition; - Matcher matcher = PATTERN_NOT_NULL.matcher(string); + Matcher matcher = PATTERN_DEFAULT.matcher(string); + + if (matcher.matches()) { + string = matcher.group(1).trim(); + setDefaultValue(matcher.group(2).trim()); + } + + matcher = PATTERN_NOT_NULL.matcher(string); if (matcher.matches()) { string = matcher.group(1).trim(); setNullValue(false); } else { - matcher = PATTERN_NULL.matcher(string); + matcher = PATTERN_NULL.matcher(string); if (matcher.matches()) { string = matcher.group(1).trim(); @@ -275,13 +282,6 @@ public void parseDefinition(final String definition) { } } - matcher = PATTERN_DEFAULT.matcher(string); - - if (matcher.matches()) { - string = matcher.group(1).trim(); - setDefaultValue(matcher.group(2).trim()); - } - setType(string); } }