12Parker/python-migrations

1{"repo": "frictionlessdata/tableschema-sql-py", "pull_number": 67, "instance_id": "frictionlessdata__tableschema-sql-py-67", "issue_numbers": "", "base_commit": "829c7032bd61ad86055d4764ced09d0c806a411f", "patch": "diff --git a/examples/storage.py b/examples/storage.py\n--- a/examples/storage.py\n+++ b/examples/storage.py\n@@ -11,7 +11,7 @@\n from sqlalchemy import create_engine\n from dotenv import load_dotenv; load_dotenv('.env')\n \n-from jsontableschema_sql import Storage\n+from tableschema_sql import Storage\n \n \n # Get resources\ndiff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -18,15 +18,14 @@ def read(*paths):\n \n \n # Prepare\n-PACKAGE = 'jsontableschema_sql'\n+PACKAGE = 'tableschema_sql'\n NAME = PACKAGE.replace('_', '-')\n INSTALL_REQUIRES = [\n     'six>=1.9,<2.0',\n     'sqlalchemy>=1.0,<2.0',\n     'pybloom_live>=2.2,<3.0',\n     'tabulator>=1.0.0a5,<2.0',\n-    # TODO: update after specs-v1\n-    'jsontableschema>=0.7,<1.0',\n+    'tableschema>=1.0,<2.0',\n ]\n TESTS_REQUIRE = [\n     'pylama',\n@@ -55,7 +54,7 @@ def read(*paths):\n     description='Generate SQL tables, load and extract data, based on JSON Table Schema descriptors.',\n     author='Open Knowledge Foundation',\n     author_email='info@okfn.org',\n-    url='https://github.com/frictionlessdata/jsontableschema-sql-py',\n+    url='https://github.com/frictionlessdata/tableschema-sql-py',\n     license='MIT',\n     keywords=[\n         'frictionless data',\ndiff --git a/jsontableschema_sql/__init__.py b/tableschema_sql/__init__.py\nsimilarity index 100%\nrename from jsontableschema_sql/__init__.py\nrename to tableschema_sql/__init__.py\ndiff --git a/jsontableschema_sql/mappers.py b/tableschema_sql/mappers.py\nsimilarity index 98%\nrename from jsontableschema_sql/mappers.py\nrename to tableschema_sql/mappers.py\n--- a/jsontableschema_sql/mappers.py\n+++ b/tableschema_sql/mappers.py\n@@ -96,7 +96,7 @@ def descriptor_to_columns_and_constraints(prefix, bucket, descriptor,\n         foreign_fields = fk['reference']['fields']\n         if isinstance(fields, six.string_types):\n             fields = [fields]\n-        if resource != 'self':\n+        if resource != '':\n             tablename = bucket_to_tablename(prefix, resource)\n         if isinstance(foreign_fields, six.string_types):\n             foreign_fields = [foreign_fields]\n@@ -169,7 +169,7 @@ def columns_and_constraints_to_descriptor(prefix, tablename, columns,\n     for constraint in constraints:\n         if isinstance(constraint, ForeignKeyConstraint):\n             fields = []\n-            resource = 'self'\n+            resource = ''\n             foreign_fields = []\n             for element in constraint.elements:\n                 fields.append(element.parent.name)\ndiff --git a/jsontableschema_sql/storage.py b/tableschema_sql/storage.py\nsimilarity index 98%\nrename from jsontableschema_sql/storage.py\nrename to tableschema_sql/storage.py\n--- a/jsontableschema_sql/storage.py\n+++ b/tableschema_sql/storage.py\n@@ -6,7 +6,7 @@\n \n import six\n import collections\n-import jsontableschema\n+import tableschema\n from sqlalchemy import Table, MetaData\n from . import mappers\n from .writer import StorageWriter\n@@ -17,7 +17,7 @@\n class Storage(object):\n     \"\"\"SQL Tabular Storage.\n \n-    It's an implementation of `jsontablescema.Storage`.\n+    It's an implementation of `tablescema.Storage`.\n \n     Args:\n         engine (object): SQLAlchemy engine\n@@ -119,7 +119,7 @@ def create(self, bucket, descriptor, force=False, indexes_fields=None):\n             self.__descriptors[bucket] = descriptor\n \n             # Create table\n-            jsontableschema.validate(descriptor)\n+            tableschema.validate(descriptor)\n             tablename = mappers.bucket_to_tablename(self.__prefix, bucket)\n             columns, constraints, indexes = mappers.descriptor_to_columns_and_constraints(\n                 self.__prefix, bucket, descriptor, index_fields, self.__autoincrement)\ndiff --git a/jsontableschema_sql/writer.py b/tableschema_sql/writer.py\nsimilarity index 95%\nrename from jsontableschema_sql/writer.py\nrename to tableschema_sql/writer.py\n--- a/jsontableschema_sql/writer.py\n+++ b/tableschema_sql/writer.py\n@@ -10,9 +10,8 @@\n from sqlalchemy import select\n from collections import namedtuple\n \n-import jsontableschema\n-from jsontableschema.exceptions import InvalidObjectType\n-\n+import tableschema\n+from tableschema.exceptions import CastError\n \n BUFFER_SIZE = 1000\n WrittenRow = namedtuple('WrittenRow', ['row', 'updated', 'updated_id'])\n@@ -32,7 +31,7 @@ def __init__(self, table, descriptor, update_keys, autoincrement):\n \n     def write(self, rows, keyed):\n         # Prepare\n-        schema = jsontableschema.Schema(self.descriptor)\n+        schema = tableschema.Schema(self.descriptor)\n \n         # Write\n         for row in rows:\n@@ -102,7 +101,7 @@ def __convert_to_keyed(schema, row):\n             value = row[index]\n             try:\n                 value = field.cast_value(value)\n-            except InvalidObjectType:\n+            except CastError:\n                 value = json.loads(value)\n             keyed_row[field.name] = value\n \n", "test_patch": "diff --git a/tests/test_mappers.py b/tests/test_mappers.py\n--- a/tests/test_mappers.py\n+++ b/tests/test_mappers.py\n@@ -6,7 +6,7 @@\n \n import pytest\n from mock import Mock\n-from jsontableschema_sql import mappers\n+from tableschema_sql import mappers\n \n \n # Tests\ndiff --git a/tests/test_storage.py b/tests/test_storage.py\n--- a/tests/test_storage.py\n+++ b/tests/test_storage.py\n@@ -10,9 +10,9 @@\n import pytest\n from copy import deepcopy\n from tabulator import Stream\n-from jsontableschema import Schema\n+from tableschema import Schema\n from sqlalchemy import create_engine\n-from jsontableschema_sql import Storage\n+from tableschema_sql import Storage\n from dotenv import load_dotenv; load_dotenv('.env')\n \n \n", "problem_statement": "", "hints_text": "", "created_at": "2017-09-07T12:57:50Z"}2