Merge pull request #69 from keboola/fix/table-metadata-schema-support

Fix/table metadata schema support

Author: davidesner

docs/base.html

@@ -250,6 +250,18 @@ <h2 id="raises">Raises</h2>
             raise AttributeError(f&#34;The defined action {action} is not implemented!&#34;) from e
         return action_method()
 
+    def _generate_table_metadata_legacy(self, table_schema: ts.TableSchema) -&gt; dao.TableMetadata:
+        &#34;&#34;&#34;
+            Generates a TableMetadata object for the table definition using a TableSchema object.
+
+        &#34;&#34;&#34;
+        table_metadata = dao.TableMetadata()
+        if table_schema.description:
+            table_metadata.add_table_description(table_schema.description)
+        table_metadata.add_column_descriptions({field.name: field.description for field in table_schema.fields})
+        table_metadata = self._add_field_data_types_to_table_metadata(table_schema, table_metadata)
+        return table_metadata
+
     def create_out_table_definition_from_schema(self, table_schema: ts.TableSchema, is_sliced: bool = False,
                                                 destination: str = &#39;&#39;, incremental: bool = None,
                                                 enclosure: str = &#39;&#34;&#39;, delimiter: str = &#39;,&#39;,
@@ -272,17 +284,33 @@ <h2 id="raises">Raises</h2>
                 TableDefinition object initialized with all table metadata defined in a schema
 
         &#34;&#34;&#34;
-        table_metadata = self._generate_table_metadata(table_schema)
-        return self.create_out_table_definition(name=table_schema.csv_name,
-                                                columns=table_schema.field_names,
-                                                primary_key=table_schema.primary_keys,
-                                                table_metadata=table_metadata,
-                                                is_sliced=is_sliced,
-                                                destination=destination,
-                                                incremental=incremental,
-                                                enclosure=enclosure,
-                                                delimiter=delimiter,
-                                                delete_where=delete_where)
+        if self._expects_legacy_manifest():
+            table_metadata = self._generate_table_metadata_legacy(table_schema)
+            table_def = self.create_out_table_definition(name=table_schema.csv_name,
+                                                         columns=table_schema.field_names,
+                                                         primary_key=table_schema.primary_keys,
+                                                         table_metadata=table_metadata,
+                                                         is_sliced=is_sliced,
+                                                         destination=destination,
+                                                         incremental=incremental,
+                                                         enclosure=enclosure,
+                                                         delimiter=delimiter,
+                                                         delete_where=delete_where)
+        else:
+            schema = self._generate_schema_definition(table_schema)
+
+            table_def = self.create_out_table_definition(name=table_schema.csv_name,
+                                                         primary_key=table_schema.primary_keys,
+                                                         schema=schema,
+                                                         is_sliced=is_sliced,
+                                                         destination=destination,
+                                                         incremental=incremental,
+                                                         enclosure=enclosure,
+                                                         delimiter=delimiter,
+                                                         delete_where=delete_where,
+                                                         description=table_schema.description)
+
+        return table_def
 
     def get_table_schema_by_name(self, schema_name: str,
                                  schema_folder_path: Optional[str] = None) -&gt; ts.TableSchema:
@@ -325,18 +353,24 @@ <h2 id="raises">Raises</h2>
                                     &#34;from a schema. If a schema folder path is not defined, the schemas folder must be&#34;
                                     &#34; located in the &#39;src&#39; directory of a component : src/schemas&#34;)
 
-    def _generate_table_metadata(self, table_schema: ts.TableSchema) -&gt; dao.TableMetadata:
+    def _generate_schema_definition(self, table_schema: ts.TableSchema) -&gt; Dict[str, dao.ColumnDefinition]:
         &#34;&#34;&#34;
             Generates a TableMetadata object for the table definition using a TableSchema object.
 
         &#34;&#34;&#34;
-        table_metadata = dao.TableMetadata()
-        if table_schema.description:
-            table_metadata.add_table_description(table_schema.description)
-        table_metadata.add_column_descriptions({field.name: field.description for field in table_schema.fields})
-        table_metadata = self._add_field_data_types_to_table_metadata(table_schema, table_metadata)
-
-        return table_metadata
+        column_definitions = {}
+        for field in table_schema.fields:
+            if field.base_type:
+                data_types = dao.BaseType(field.base_type,
+                                          length=field.length,
+                                          default=field.default)
+            else:
+                data_types = dao.BaseType()
+            column_definitions[field.name] = dao.ColumnDefinition(data_types=data_types,
+                                                                  nullable=field.nullable,
+                                                                  description=field.description)
+
+        return column_definitions
 
     @staticmethod
     def _add_field_data_types_to_table_metadata(table_schema: ts.TableSchema,