Merge pull request #45 from PageUpPeopleOrg/feature/OSC-1373-normalise-schema

remove setup code from alembic scripts

Author: ChintanRaval

appveyor.yml

@@ -28,17 +28,19 @@ install:
   #Setup Python
   - SET PATH=%PYTHON%;%PYTHON%\Scripts;%PATH% #Swap path to python to latest version (as per matrix above)
   - python --version
+  #Create Virtual Environment
   - python -m venv c:\projects\relational-data-loader\venv\
 
 build_script:
   #Setup the source MSSQL database
   - sqlcmd -b -E -S "(local)\SQL2016" -i .\tests\integration_tests\mssql_source\source_database_setup\create_database.sql
   - sqlcmd -b -E -f 65001 -S "(local)\SQL2016" -d RelationalDataLoaderIntegrationTestSource -i .\tests\integration_tests\mssql_source\source_database_setup\create_large_table.sql
   - sqlcmd -b -E -f 65001 -S "(local)\SQL2016" -d RelationalDataLoaderIntegrationTestSource -i .\tests\integration_tests\mssql_source\source_database_setup\create_compound_pk.sql
-
   #Setup the target PostgreSQL database
   - psql -c "SELECT VERSION()"
   - createdb %DBNAME%
+  - psql -d %DBNAME% -U postgres -a -v ON_ERROR_STOP=1 -f .\tests\integration_tests\psql_destination\setup.sql
+  #Activate Virtual Environment
   - C:\projects\relational-data-loader\venv\Scripts\activate.bat
   #Install the dependencies for rdl.
   - pip install .

rdl/alembic/versions/710e28aa5978_add_data_load_execution_table.py

@@ -19,7 +19,6 @@
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     op.execute('CREATE SCHEMA IF NOT EXISTS rdl')
-    op.execute('CREATE EXTENSION IF NOT EXISTS CITEXT')
     op.create_table('data_load_execution',
                     sa.Column('id', sa.Integer(), nullable=False),
                     sa.Column('correlation_id', postgresql.UUID(as_uuid=True), nullable=True),

tests/integration_tests/psql_destination/setup.sql

@@ -0,0 +1,2 @@
+-- create extensions
+CREATE EXTENSION IF NOT EXISTS CITEXT;