Merge branch 'DBTOOLS-1742-fix-clickhouse-not-null' into 'master'

DBTOOLS-1742 fixed clickhouse not null

See merge request codekeeper/pgcodekeeper-core!84

Author: AXEPOH

CHANGELOG.md

@@ -19,6 +19,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Fixed
 
+- Fixed code generation for columns with Nullable values in ClickHouse.
+
 ### Removed
 
 - Removed support for MS SQL versions below 2017.

CHANGELOG.ru.md

@@ -19,6 +19,8 @@
 
 ### Исправлено
 
+- Исправлена генерация кода для колонок c Nullable значениями в ClickHouse.
+
 ### Удалено
 
 - Прекращена поддержка версий MS SQL ниже 2017.

src/main/antlr4/org/pgcodekeeper/core/parsers/antlr/ch/generated/CHParser.g4

@@ -1076,7 +1076,7 @@ data_type
     | NCHAR VARYING
     | NESTED LPAREN identifier data_type (COMMA identifier data_type)* RPAREN
     | NOTHING
-    | NULLABLE LPAREN data_type RPAREN
+    | NULLABLE LPAREN nullable_data_type=data_type RPAREN
     | NUMERIC
     | NVARCHAR
     | OBJECT_TYPE LPAREN STRING_LITERAL RPAREN

src/main/java/org/pgcodekeeper/core/parsers/antlr/ch/statement/ChParserAbstract.java

@@ -58,10 +58,9 @@ protected ChColumn getColumn(Table_column_defContext column) {
         List<ParserRuleContext> ids = getIdentifiers(column.qualified_name());
         var col = new ChColumn(QNameParser.getFirstName(ids));
         Data_type_exprContext typeExpr = column.data_type_expr();
-        if (typeExpr.data_type() != null) {
-            col.setType(getFullCtxText(typeExpr.data_type()));
-            col.setNotNull(isColumnNotNullable(typeExpr));
-
+        var dataType = typeExpr.data_type();
+        if (dataType != null) {
+            setDataType(col, dataType);
             var defType = typeExpr.table_column_property_expr();
             if (defType != null) {
                 if (defType.DEFAULT() != null) {
@@ -78,8 +77,8 @@ protected ChColumn getColumn(Table_column_defContext column) {
                 }
             }
         }
-        if (column.not_null() != null) {
-            col.setNotNull(column.not_null().NOT() != null);
+        if (isNullable(column.not_null()) || isNullable(typeExpr.not_null())) {
+            col.setNotNull(false);
         }
         if (column.comment_expr() != null) {
             col.setComment(column.comment_expr().STRING_LITERAL().getText());
@@ -95,9 +94,16 @@ protected ChColumn getColumn(Table_column_defContext column) {
         return col;
     }
 
-    private boolean isColumnNotNullable(Data_type_exprContext typeExpr) {
-        return (typeExpr.not_null() != null && typeExpr.not_null().NOT() != null)
-                || typeExpr.data_type().NULLABLE() == null;
+    private boolean isNullable(Not_nullContext notNullContext) {
+        return notNullContext != null && notNullContext.NOT() == null;
+    }
+
+    protected void setDataType(ChColumn col, Data_typeContext dataType) {
+        if (dataType.NULLABLE() != null) {
+            dataType = dataType.nullable_data_type;
+            col.setNotNull(false);
+        }
+        col.setType(getFullCtxText(dataType));
     }
 
     protected ChEngine getEnginePart(Engine_clauseContext engineClause) {

src/main/java/org/pgcodekeeper/core/parsers/antlr/ch/statement/CreateChDictionary.java

@@ -67,7 +67,7 @@ public void parseObject() {
     public void parseObject(ChDictionary dictionary) {
         for (var attrCtx : ctx.dictionary_attr_def()) {
             var col = new ChColumn(attrCtx.identifier().getText());
-            col.setType(getFullCtxText(attrCtx.data_type()));
+            setDataType(col, attrCtx.data_type());
             if (attrCtx.DEFAULT() != null) {
                 col.setDefaultType("DEFAULT");
                 col.setDefaultValue(getFullCtxText(attrCtx.literal()));

src/main/java/org/pgcodekeeper/core/schema/ch/ChColumn.java

@@ -34,7 +34,6 @@
  * codecs, and different default types.
  */
 public final class ChColumn extends AbstractColumn {
-
     private String defaultType;
 
     private String ttl;
@@ -48,6 +47,7 @@ public final class ChColumn extends AbstractColumn {
      */
     public ChColumn(String name) {
         super(name);
+        setNotNull(true);
     }
 
     public void setDefaultType(String defaultType) {
@@ -75,12 +75,7 @@ public String getFullDefinition() {
         var sb = new StringBuilder();
         sb.append(ChDiffUtils.quoteName(name));
 
-        if (type != null) {
-            sb.append(' ').append(type);
-            if (notNull) {
-                sb.append(" NOT NULL");
-            }
-        }
+        appendType(sb);
         appendColumnOptions(sb);
         return sb.toString();
     }
@@ -92,13 +87,24 @@ public void getCreationSQL(SQLScript script) {
         appendIfNotExists(sb, script.getSettings());
         sb.append(ChDiffUtils.quoteName(name));
 
-        if (type != null) {
-            sb.append(' ').append(type);
-        }
+        appendType(sb);
         appendColumnOptions(sb);
         script.addStatement(sb);
     }
 
+    private void appendType(StringBuilder sb) {
+        if (type == null) {
+            return;
+        }
+
+        sb.append(' ');
+        if (notNull) {
+            sb.append(type);
+        } else {
+            sb.append("Nullable(").append(type).append(")");
+        }
+    }
+
     private void appendColumnOptions(StringBuilder sb) {
         if (defaultType != null) {
             sb.append(' ').append(defaultType);
@@ -135,7 +141,7 @@ public ObjectState appendAlterSQL(PgStatement newCondition, SQLScript script) {
         int startSize = script.getSize();
         ChColumn newColumn = (ChColumn) newCondition;
 
-        compareTypes(newColumn.type, script);
+        compareTypes(newColumn, script);
         compareDefaults(newColumn, script);
         compareCodecs(newColumn.codecs, script);
         compareTtl(newColumn.ttl, newColumn.type, script);
@@ -154,13 +160,14 @@ public void getDropSQL(SQLScript script, boolean optionExists) {
         script.addStatement(sb);
     }
 
-    private void compareTypes(String newType, SQLScript script) {
-        if (type.equals(newType)) {
+    private void compareTypes(ChColumn newColumn, SQLScript script) {
+        if (Objects.equals(type, newColumn.type) && notNull == newColumn.notNull) {
             return;
         }
+
         StringBuilder sb = new StringBuilder();
         appendAlterColumn(sb, script.getSettings());
-        sb.append(' ').append(newType);
+        newColumn.appendType(sb);
         script.addStatement(sb);
     }
 

src/test/resources/org/pgcodekeeper/core/it/depcies/ch/add_func_func_1_usr_func_1_diff.sql

@@ -2,7 +2,7 @@
 
 CREATE VIEW default.v1
 (
-	`s` UInt8 NOT NULL
+	`s` UInt8
 )
 AS SELECT 1 AS s;
 

src/test/resources/org/pgcodekeeper/core/it/depcies/ch/add_func_test_qual_usr_test_qual_diff.sql

@@ -1,10 +1,10 @@
 CREATE TABLE default.t2
 (
-	`col1` Int64 NOT NULL,
-	`col2` Int64 NOT NULL
+	`col1` Int64,
+	`col2` Int64
 )
 ENGINE = MergeTree
 ORDER BY col1
 SETTINGS index_granularity = 8192;
 
-CREATE FUNCTION test_qual AS (x) -> default.t2;
+CREATE FUNCTION test_qual AS (x) -> default.t2;

src/test/resources/org/pgcodekeeper/core/it/depcies/ch/ch_mat_view_deps_change_table_usr_t1_diff.sql

@@ -6,9 +6,9 @@ DROP TABLE default.t1_1;
 
 CREATE TABLE default.t1_1
 (
-	`d` DateTime NOT NULL DEFAULT 1,
-	`a` UInt32 NOT NULL,
-	`c` Int64 NOT NULL
+	`d` DateTime DEFAULT 1,
+	`a` UInt32,
+	`c` Int64
 )
 ENGINE = MergeTree
 PRIMARY KEY tuple()
@@ -18,8 +18,8 @@ SETTINGS index_granularity = 8192;
 
 CREATE MATERIALIZED VIEW default.v1
 (
-	`col1` Int64 NOT NULL,
-	`col2` Int64 NOT NULL
+	`col1` Int64,
+	`col2` Int64
 )
 ENGINE = Memory
 AS SELECT A + B AS col1, C AS col2

src/test/resources/org/pgcodekeeper/core/it/depcies/ch/ch_view_deps_change_table_usr_t1_diff.sql

@@ -6,9 +6,9 @@ DROP TABLE default.t1_1;
 
 CREATE TABLE default.t1_1
 (
-	`d` DateTime NOT NULL DEFAULT 1,
-	`a` UInt32 NOT NULL,
-	`c` Int64 NOT NULL
+	`d` DateTime DEFAULT 1,
+	`a` UInt32,
+	`c` Int64
 )
 ENGINE = MergeTree
 PRIMARY KEY tuple()
@@ -18,8 +18,8 @@ SETTINGS index_granularity = 8192;
 
 CREATE VIEW default.v1
 (
-	`col1` Int64 NOT NULL,
-	`col2` Int64 NOT NULL
+	`col1` Int64,
+	`col2` Int64
 )
 AS SELECT A + B AS col1, C AS col2
 FROM (