Merge branch 'qgov-master-2.10.4' of https://github.com/qld-gov-au/ckan…

… into snyk-fix-286e44e58ec2bdb8712ec037b4f6a635

ckanext/datastore/backend/postgres.py

@@ -1973,6 +1973,7 @@ def delete(self, context: Context, data_dict: dict[str, Any]):
         try:
             # check if table exists
             if 'filters' not in data_dict:
+                context['connection'].execute("SET LOCAL lock_timeout = '20s'")
                 context['connection'].execute(
                     u'DROP TABLE "{0}" CASCADE'.format(
                         data_dict['resource_id'])

dev-requirements.txt

@@ -23,4 +23,10 @@ pytest-factoryboy==2.4.0
 pytest-freezegun==0.4.2
 pytest-rerunfailures==10.2
 pytest-split==0.8.0
-urllib3>=2.2.2 # not directly required, pinned by Snyk to avoid a vulnerability
+certifi>=2024.7.4 # not directly required, pinned by Snyk to avoid a vulnerability
+idna>=3.7 # not directly required, pinned by Snyk to avoid a vulnerability
+ipython>=7.16.3 # not directly required, pinned by Snyk to avoid a vulnerability
+prompt-toolkit>=3.0.13 # not directly required, pinned by Snyk to avoid a vulnerability
+pygments>=2.15.0 # not directly required, pinned by Snyk to avoid a vulnerability
+requests>=2.31.0 # not directly required, pinned by Snyk to avoid a vulnerability
+urllib3>=1.26.19 # not directly required, pinned by Snyk to avoid a vulnerability