deriva 1.7.4__tar.gz → 1.7.5__tar.gz

{deriva-1.7.4/deriva.egg-info → deriva-1.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deriva
-Version: 1.7.4
+Version: 1.7.5
 Summary: Python APIs and CLIs (Command-Line Interfaces) for the DERIVA platform.
 Home-page: https://github.com/informatics-isi-edu/deriva-py
 Author: USC Information Sciences Institute, Informatics Systems Research Division

{deriva-1.7.4 → deriva-1.7.5}/deriva/core/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.7.4"
+__version__ = "1.7.5"
 
 from deriva.core.utils.core_utils import *
 from deriva.core.base_cli import BaseCLI, KeyValuePairArgs

{deriva-1.7.4 → deriva-1.7.5}/deriva/core/ermrest_model.py

@@ -2098,7 +2098,7 @@ class Table (object):
         if keys:
             parts.extend([ key.sqlite3_ddl() for key in self.keys ])
         return ("""
-CREATE TABLE IF NOT EXISTS %(tname)s
+CREATE TABLE IF NOT EXISTS %(tname)s (
   %(body)s
 );
 """ % {

{deriva-1.7.4 → deriva-1.7.5}/deriva/transfer/upload/deriva_upload.py

@@ -329,6 +329,10 @@ class DerivaUpload(object):
     @staticmethod
     def getCatalogTable(asset_mapping, metadata_dict=None):
         schema_name, table_name = asset_mapping.get('target_table', [None, None])
+        # allow for template substitution in the schema/table name tuple
+        if (schema_name and table_name) and metadata_dict is not None:
+            schema_name = schema_name.format(**metadata_dict)
+            table_name = table_name.format(**metadata_dict)
         if not (schema_name and table_name):
             metadata_dict_lower = {k.lower(): v for k, v in metadata_dict.items()}
             schema_name = metadata_dict_lower.get("schema")

{deriva-1.7.4 → deriva-1.7.5/deriva.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deriva
-Version: 1.7.4
+Version: 1.7.5
 Summary: Python APIs and CLIs (Command-Line Interfaces) for the DERIVA platform.
 Home-page: https://github.com/informatics-isi-edu/deriva-py
 Author: USC Information Sciences Institute, Informatics Systems Research Division