Merge 6c8c1fc into 1acf95f

ydb-platform · Apr 7, 2024 · d93e7ae · d93e7ae
2 parents 1acf95f + 6c8c1fc
commit d93e7ae
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/ydb/core/tx/schemeshard/ut_export/ut_export.cpp b/ydb/core/tx/schemeshard/ut_export/ut_export.cpp
@@ -365,7 +365,6 @@ Y_UNIT_TEST_SUITE(TExportToS3Tests) {
       }
     }
   }
-  not_null: false
   from_literal {
     type {
       optional_type {
@@ -390,7 +389,6 @@ columns {
       }
     }
   }
-  not_null: false
   from_literal {
     type {
       optional_type {

diff --git a/ydb/core/ydb_convert/table_description.cpp b/ydb/core/ydb_convert/table_description.cpp
@@ -370,13 +370,15 @@ static Ydb::Type* AddColumn(Ydb::Table::ColumnMeta* newColumn, const TColumn& co
         pg->set_oid(NPg::PgTypeIdFromTypeDesc(typeDesc));
         pg->set_typlen(0);
         pg->set_typmod(0);
+        if (column.GetNotNull()) {
+            newColumn->set_not_null(column.GetNotNull());
+        }
     } else {
         NYql::NProto::TypeIds protoType;
         if (!NYql::NProto::TypeIds_Parse(column.GetType(), &protoType)) {
             throw NYql::TErrorException(NKikimrIssues::TIssuesIds::DEFAULT_ERROR)
                 << "Got invalid type: " << column.GetType() << " for column: " << column.GetName();
         }
-
         if (column.GetNotNull()) {
             columnType = newColumn->mutable_type();
         } else {
@@ -392,7 +394,6 @@ static Ydb::Type* AddColumn(Ydb::Table::ColumnMeta* newColumn, const TColumn& co
             NMiniKQL::ExportPrimitiveTypeToProto(protoType, *columnType);
         }
     }
-    newColumn->set_not_null(column.GetNotNull());
     return columnType;
 }
 
@@ -410,13 +411,15 @@ Ydb::Type* AddColumn<NKikimrSchemeOp::TColumnDescription>(Ydb::Table::ColumnMeta
         pg->set_oid(NPg::PgTypeIdFromTypeDesc(typeDesc));
         pg->set_typlen(0);
         pg->set_typmod(0);
+        if (column.GetNotNull()) {
+            newColumn->set_not_null(column.GetNotNull());
+        }
     } else {
         NYql::NProto::TypeIds protoType;
         if (!NYql::NProto::TypeIds_Parse(column.GetType(), &protoType)) {
             throw NYql::TErrorException(NKikimrIssues::TIssuesIds::DEFAULT_ERROR)
                 << "Got invalid type: " << column.GetType() << " for column: " << column.GetName();
         }
-
         if (column.GetNotNull()) {
             columnType = newColumn->mutable_type();
         } else {
@@ -432,7 +435,6 @@ Ydb::Type* AddColumn<NKikimrSchemeOp::TColumnDescription>(Ydb::Table::ColumnMeta
             NMiniKQL::ExportPrimitiveTypeToProto(protoType, *columnType);
         }
     }
-    newColumn->set_not_null(column.GetNotNull());
     switch (column.GetDefaultValueCase()) {
         case NKikimrSchemeOp::TColumnDescription::kDefaultFromLiteral: {
             auto fromLiteral = newColumn->mutable_from_literal();

diff --git a/ydb/services/ydb/ydb_ut.cpp b/ydb/services/ydb/ydb_ut.cpp
@@ -1268,7 +1268,6 @@ columns {
       }
     }
   }
-  not_null: false
 }
 columns {
   name: "Value"
@@ -1279,7 +1278,6 @@ columns {
       }
     }
   }
-  not_null: false
 }
 primary_key: "Key"
 partitioning_settings {
@@ -1607,7 +1605,6 @@ columns {
       }
     }
   }
-  not_null: false
 }
 columns {
   name: "IValue"
@@ -1618,7 +1615,6 @@ columns {
       }
     }
   }
-  not_null: false
 }
 primary_key: "Key"
 indexes {