Merge pull request #12736 from dbeaver/postgres-interval-type-ddl-fix#9013

#9013 Don't append precision for intervals without precision

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/PostgreUtils.java

@@ -436,8 +436,6 @@ public class PostgreUtils {
                     return 6;
                 return typmod;
             case PostgreOid.INTERVAL:
-                if (typmod == -1)
-                    return 6;
                 return (short) (typmod & INTERVAL_MASK_PRECISION);
             default:
                 return 0;

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/edit/PostgreTableColumnManager.java

@@ -98,10 +98,10 @@ public class PostgreTableColumnManager extends SQLTableColumnManager<PostgreTabl
                     }
                     break;
                 case DATETIME:
-                    final int timePrecision = CommonUtils.toInt(postgreColumn.getPrecision());
+                    final Integer timePrecision = postgreColumn.getPrecision();
                     String typeName = column.getTypeName();
                     if (typeName.startsWith(PostgreConstants.TYPE_TIMESTAMP) || typeName.equals(PostgreConstants.TYPE_TIME)) {
-                        if (timePrecision >= 0 && timePrecision <= 6) {
+                        if (timePrecision != null && timePrecision >= 0 && timePrecision <= 6) {
                             sql.append('(').append(timePrecision).append(')');
                         }
                     }
@@ -110,10 +110,11 @@ public class PostgreTableColumnManager extends SQLTableColumnManager<PostgreTabl
                         if (!CommonUtils.isEmpty(precision)) {
                             sql.append(' ').append(precision);
                         }
-                        if (PostgreUtils.isPrecisionInterval(postgreColumn.getTypeMod()) && timePrecision >= 0 && timePrecision <= 6) {
+                        if (PostgreUtils.isPrecisionInterval(postgreColumn.getTypeMod()) && timePrecision != null && timePrecision >= 0 && timePrecision <= 6) {
                             sql.append('(').append(timePrecision).append(')');
                         }
                     }
+                    break;
             }
             if (PostgreUtils.isGISDataType(postgreColumn.getTypeName())) {
                 try {