TEIIDDES-1660 added check in createKey() for columns that are Nullabl…

…e or undefined, and change to Not Nullable
Teiid-Designer · May 6, 2013 · eded7d7 · eded7d7
1 parent 9c6c95e
commit eded7d7
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/DdlImporter.java b/plugins/org.teiid.designer.ddl.importer/src/org/teiid/designer/ddl/importer/DdlImporter.java
@@ -682,7 +682,12 @@ private void createKey( final AstNode node,
             initialize(key, node);
             for (final AstNode node1 : node) {
                 if (node1.hasMixin(StandardDdlLexicon.TYPE_COLUMN_REFERENCE)) try {
-                    key.getColumns().add(find(Column.class, node1, table, roots));
+                	Column column = find(Column.class, node1, table, roots);
+
+                	if( column.getNullable() == NullableType.NULLABLE_UNKNOWN_LITERAL || column.getNullable() == NullableType.NULLABLE_LITERAL ) {
+                		column.setNullable(NullableType.NO_NULLS_LITERAL);
+                	}
+                    key.getColumns().add(column);
                 } catch (final EntityNotFoundException error) {
                     messages.add(error.getMessage());
                 }
@@ -732,7 +737,12 @@ else for (final Object obj : foreignTable.getUniqueConstraints()) {
             initialize(key, node);
             for (final AstNode node1 : node) {
                 if (node1.hasMixin(StandardDdlLexicon.TYPE_COLUMN_REFERENCE)) try {
-                    key.getColumns().add(find(Column.class, node1, table, roots));
+                	Column column = find(Column.class, node1, table, roots);
+
+                	if( column.getNullable() == NullableType.NULLABLE_UNKNOWN_LITERAL || column.getNullable() == NullableType.NULLABLE_LITERAL ) {
+                		column.setNullable(NullableType.NO_NULLS_LITERAL);
+                	}
+                    key.getColumns().add(column);
                 } catch (final EntityNotFoundException error) {
                     messages.add(error.getMessage());
                 }