Merge pull request #81 from qld-gov-au/develop

add extend_existing
qld-gov-au · Feb 15, 2023 · 8aea548 · 8aea548
2 parents ef274aa + 85d91f3
commit 8aea548
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,11 +11,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ckan-version: [2.9, 2.9-py2, 2.8]
+        ckan-version: [2.9, 2.9-py2]
 
     name: Continuous Integration build on CKAN ${{ matrix.ckan-version }}
     runs-on: ubuntu-latest
-    container: integratedexperts/ci-builder
+    container: drevops/ci-builder
     env:
       CKAN_VERSION: ${{ matrix.ckan-version }}
 

diff --git a/ckanext/datarequests/db.py b/ckanext/datarequests/db.py
@@ -105,7 +105,8 @@ def get_open_datarequests_number(cls):
                                       sa.Column('close_circumstance', sa.types.Unicode(constants.CLOSE_CIRCUMSTANCE_MAX_LENGTH), primary_key=False, default=u'')
                                       if closing_circumstances_enabled else None,
                                       sa.Column('approx_publishing_date', sa.types.DateTime, primary_key=False, default=None)
-                                      if closing_circumstances_enabled else None
+                                      if closing_circumstances_enabled else None,
+                                      extend_existing=True,
                                       )
 
         # Create the table only if it does not exist
@@ -146,7 +147,8 @@ def get_comment_datarequests_number(cls, **kw):
                                   sa.Column('user_id', sa.types.UnicodeText, primary_key=False, default=u''),
                                   sa.Column('datarequest_id', sa.types.UnicodeText, primary_key=True, default=uuid4),
                                   sa.Column('time', sa.types.DateTime, primary_key=True, default=u''),
-                                  sa.Column('comment', sa.types.Unicode(constants.COMMENT_MAX_LENGTH), primary_key=False, default=u'')
+                                  sa.Column('comment', sa.types.Unicode(constants.COMMENT_MAX_LENGTH), primary_key=False, default=u''),
+                                  extend_existing=True
                                   )
 
         # Create the table only if it does not exist
@@ -177,7 +179,8 @@ def get_datarequest_followers_number(cls, **kw):
                                    sa.Column('id', sa.types.UnicodeText, primary_key=True, default=uuid4),
                                    sa.Column('user_id', sa.types.UnicodeText, primary_key=False, default=u''),
                                    sa.Column('datarequest_id', sa.types.UnicodeText, primary_key=True, default=uuid4),
-                                   sa.Column('time', sa.types.DateTime, primary_key=True, default=u'')
+                                   sa.Column('time', sa.types.DateTime, primary_key=True, default=u''),
+                                   extend_existing=True
                                    )
 
         # Create the table only if it does not exist