Merge d833bea into cacc0f6

Maltcommunity · Aug 7, 2017 · 53408f9 · 53408f9
2 parents cacc0f6 + d833bea
commit 53408f9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/mongo_connector/doc_managers/mapping_schema.py b/mongo_connector/doc_managers/mapping_schema.py
@@ -123,6 +123,9 @@
                 },
                 "dest": {
                     "type": "string"
+                },
+                "nullable": {
+                    "type": "boolean"
                 }
             },
             "required": ["type"]
@@ -131,7 +134,10 @@
             "properties": {
                 "type": {"enum": ["_ARRAY"]},
                 "dest": {"type": "string"},
-                "fk": {"type": "string"}
+                "fk": {"type": "string"},
+                "nullable": {
+                    "type": "boolean"
+                }
             },
             "required": ["type", "dest", "fk"]
         },
@@ -140,7 +146,10 @@
                 "type": {"enum": ["_ARRAY_OF_SCALARS"]},
                 "dest": {"type": "string"},
                 "fk": {"type": "string"},
-                "valueField": {"type": "string"}
+                "valueField": {"type": "string"},
+                "nullable": {
+                    "type": "boolean"
+                }
             },
             "required": ["type", "dest", "fk", "valueField"]
         }

diff --git a/mongo_connector/doc_managers/postgresql_manager.py b/mongo_connector/doc_managers/postgresql_manager.py
@@ -97,12 +97,16 @@ def _init_schema(self):
                         if 'dest' in column_mapping:
                             name = column_mapping['dest']
                             column_type = column_mapping['type']
+                            nullable = column_mapping.get('nullable', True)
 
                             constraints = ''
                             if name == pk_name:
                                 constraints = "CONSTRAINT {0}_PK PRIMARY KEY".format(collection.upper())
                                 pk_found = True
 
+                            if not nullable:
+                                constraints = '{} NOT NULL'.format(constraints)
+
                             if column_type != ARRAY_TYPE and column_type != ARRAY_OF_SCALARS_TYPE:
                                 columns.append(name + ' ' + column_type + ' ' + constraints)