[OSC-1302] Rename tables to match rdl (#22)

Author: seanbudd

.travis.yml

@@ -13,3 +13,4 @@ install: make install_deps
 script:
   - make test_unit
   - make test_integration
+  - make test_downgrade_schema

Makefile

@@ -11,3 +11,6 @@ test_unit:
 # Run integration tests
 test_integration:
 	./tests/integration/test_integration.sh
+
+test_downgrade_schema:
+	alembic -c dpo/alembic.ini -x postgresql+psycopg2://postgres:travisci@localhost:5432/postgres downgrade base

dpo/DataRepository.py

@@ -4,8 +4,8 @@
 from dpo import Shared
 from dpo.BaseObject import BaseObject
 from dpo.Shared import Constants
-from dpo.entities.DataPipelineExecutionEntity import DataPipelineExecutionEntity
-from dpo.entities.ModelChecksumEntity import ModelChecksumEntity
+from dpo.entities import ExecutionEntity
+from dpo.entities import ExecutionModelEntity
 
 
 class DataRepository(BaseObject):
@@ -20,48 +20,48 @@ def get_current_db_datetime_with_timezone(self):
     def initialise_execution(self):
         session = self.session_maker()
 
-        data_pipeline_execution = DataPipelineExecutionEntity()
+        data_pipeline_execution = ExecutionEntity()
         session.add(data_pipeline_execution)
 
         session.commit()
         return data_pipeline_execution
 
     def get_execution(self, execution_id):
         session = self.session_maker()
-        result = session.query(DataPipelineExecutionEntity) \
+        result = session.query(ExecutionEntity) \
             .filter_by(id=execution_id) \
             .first()
         session.close()
         return result
 
     def get_last_successful_execution(self):
         session = self.session_maker()
-        result = session.query(DataPipelineExecutionEntity) \
+        result = session.query(ExecutionEntity) \
             .filter_by(status=Constants.DataPipelineExecutionStatus.COMPLETED) \
-            .order_by(desc(DataPipelineExecutionEntity.last_updated_on)) \
-            .order_by(desc(DataPipelineExecutionEntity.created_on)) \
+            .order_by(desc(ExecutionEntity.last_updated_on)) \
+            .order_by(desc(ExecutionEntity.created_on)) \
             .first()
         session.close()
         return result
 
     def get_execution_models(self, execution_id, model_type):
         session = self.session_maker()
-        results = session.query(ModelChecksumEntity) \
+        results = session.query(ExecutionModelEntity) \
             .filter_by(execution_id=execution_id, type=model_type)
         session.close()
         return results.all()
 
     def save_execution_models(self, execution_id, model_type, model_checksums):
         session = self.session_maker()
 
-        data_pipeline_execution = session.query(DataPipelineExecutionEntity) \
+        data_pipeline_execution = session.query(ExecutionEntity) \
             .filter_by(id=execution_id) \
             .one()
 
         data_pipeline_execution.status = \
             Constants.DataPipelineExecutionStatus.IN_PROGRESS
         for model, checksum in sorted(model_checksums.items()):
-            model_checksum_entity = ModelChecksumEntity(execution_id=data_pipeline_execution.id,
+            model_checksum_entity = ExecutionModelEntity(execution_id=data_pipeline_execution.id,
                                                         type=model_type,
                                                         name=model,
                                                         checksum=checksum)
@@ -74,7 +74,7 @@ def save_execution_models(self, execution_id, model_type, model_checksums):
     def complete_execution(self, execution_id):
         session = self.session_maker()
 
-        data_pipeline_execution = session.query(DataPipelineExecutionEntity) \
+        data_pipeline_execution = session.query(ExecutionEntity) \
             .filter_by(id=execution_id) \
             .one()
 

dpo/alembic/README.md

@@ -8,8 +8,8 @@
 from alembic import context
 
 from dpo.Shared import BaseEntity
-from dpo.entities import ModelChecksumEntity
-from dpo.entities import DataPipelineExecutionEntity
+from dpo.entities import ExecutionModelEntity
+from dpo.entities import ExecutionEntity
 from dpo.Shared import Constants
 
 # this is the Alembic Config object, which provides

dpo/alembic/env.py

@@ -0,0 +1,30 @@
+"""rename tables
+
+Revision ID: fe9eed6d812f
+Revises: 7d9871ef8afa
+Create Date: 2019-04-11 15:33:25.591043
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = 'fe9eed6d812f'
+down_revision = '7d9871ef8afa'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.execute('ALTER TABLE dpo.model_checksum RENAME TO execution_model')
+    op.execute('ALTER TABLE dpo.data_pipeline_execution RENAME TO execution')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.execute('ALTER TABLE dpo.execution RENAME TO data_pipeline_execution')
+    op.execute('ALTER TABLE dpo.execution_model RENAME TO model_checksum')
+    # ### end Alembic commands ###

dpo/alembic/versions/fe9eed6d812f_rename_tables.py

@@ -0,0 +1,2 @@
+from dpo.entities.execution_entity import ExecutionEntity
+from dpo.entities.execution_model_entity import ExecutionModelEntity

dpo/entities/__init__.py

@@ -5,11 +5,10 @@
 from dpo.Shared import Constants
 from dpo import Shared
 
-TABLE_NAME = 'data_pipeline_execution'
-PRIMARY_KEY_COL_NAME = 'id'
 
-
-class DataPipelineExecutionEntity(Shared.BaseEntity):
+class ExecutionEntity(Shared.BaseEntity):
+    TABLE_NAME = 'execution'
+    PRIMARY_KEY_COL_NAME = 'id'
 
     __tablename__ = TABLE_NAME
     __table_args__ = {'schema': Constants.DATA_PIPELINE_EXECUTION_SCHEMA_NAME}

dpo/entities/DataPipelineExecutionEntity.py renamed to dpo/entities/execution_entity.py

@@ -3,12 +3,12 @@
 from sqlalchemy.dialects.postgresql import UUID
 from dpo import Shared
 from dpo.Shared import Constants
-from dpo.entities import DataPipelineExecutionEntity
+from dpo.entities import ExecutionEntity
 
-TABLE_NAME = 'model_checksum'
 
+class ExecutionModelEntity(Shared.BaseEntity):
+    TABLE_NAME = 'execution_model'
 
-class ModelChecksumEntity(Shared.BaseEntity):
     __tablename__ = TABLE_NAME
     __table_args__ = {'schema': Constants.DATA_PIPELINE_EXECUTION_SCHEMA_NAME}
 
@@ -20,8 +20,8 @@ class ModelChecksumEntity(Shared.BaseEntity):
     execution_id = Column('execution_id',
                           UUID(as_uuid=True),
                           ForeignKey(f'{Constants.DATA_PIPELINE_EXECUTION_SCHEMA_NAME}.'
-                                     f'{DataPipelineExecutionEntity.TABLE_NAME}.'
-                                     f'{DataPipelineExecutionEntity.PRIMARY_KEY_COL_NAME}'),
+                                     f'{ExecutionEntity.TABLE_NAME}.'
+                                     f'{ExecutionEntity.PRIMARY_KEY_COL_NAME}'),
                           nullable=False)
 
     created_on = Column('created_on',