diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2023-09-20 13:45:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-20 13:45:51 +0200 |
| commit | 2c6ebb65c9eb6b11347d907127b82d31e04569e5 (patch) | |
| tree | 9fb8a476675fd382ea17fd6aa5c59a14a1e86bc8 /tests | |
| parent | 0b506bfe1ab9f1c38e439c77b3c3f81c8ac663ea (diff) | |
Fixed #34851 -- Dropped support for PostgreSQL 12 and PostGIS 2.5.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/backends/postgresql/tests.py | 8 | ||||
| -rw-r--r-- | tests/gis_tests/gis_migrations/migrations/0001_setup_extensions.py | 12 | ||||
| -rw-r--r-- | tests/gis_tests/rasterapp/migrations/0001_setup_extensions.py | 12 | ||||
| -rw-r--r-- | tests/postgres_tests/migrations/0001_setup_extensions.py | 10 | ||||
| -rw-r--r-- | tests/queries/test_explain.py | 3 |
5 files changed, 12 insertions, 33 deletions
diff --git a/tests/backends/postgresql/tests.py b/tests/backends/postgresql/tests.py index 590dbe6073..31aac022c8 100644 --- a/tests/backends/postgresql/tests.py +++ b/tests/backends/postgresql/tests.py @@ -404,12 +404,12 @@ class Tests(TestCase): def test_get_database_version(self): new_connection = connection.copy() - new_connection.pg_version = 110009 - self.assertEqual(new_connection.get_database_version(), (11, 9)) + new_connection.pg_version = 130009 + self.assertEqual(new_connection.get_database_version(), (13, 9)) - @mock.patch.object(connection, "get_database_version", return_value=(11,)) + @mock.patch.object(connection, "get_database_version", return_value=(12,)) def test_check_database_version_supported(self, mocked_get_database_version): - msg = "PostgreSQL 12 or later is required (found 11)." + msg = "PostgreSQL 13 or later is required (found 12)." with self.assertRaisesMessage(NotSupportedError, msg): connection.check_database_version_supported() self.assertTrue(mocked_get_database_version.called) diff --git a/tests/gis_tests/gis_migrations/migrations/0001_setup_extensions.py b/tests/gis_tests/gis_migrations/migrations/0001_setup_extensions.py index 227d6b668d..96569abfac 100644 --- a/tests/gis_tests/gis_migrations/migrations/0001_setup_extensions.py +++ b/tests/gis_tests/gis_migrations/migrations/0001_setup_extensions.py @@ -3,16 +3,10 @@ from django.db import connection, migrations if connection.features.supports_raster: from django.contrib.postgres.operations import CreateExtension - pg_version = connection.ops.postgis_version_tuple() - class Migration(migrations.Migration): - # PostGIS 3+ requires postgis_raster extension. - if pg_version[1:] >= (3,): - operations = [ - CreateExtension("postgis_raster"), - ] - else: - operations = [] + operations = [ + CreateExtension("postgis_raster"), + ] else: diff --git a/tests/gis_tests/rasterapp/migrations/0001_setup_extensions.py b/tests/gis_tests/rasterapp/migrations/0001_setup_extensions.py index 227d6b668d..96569abfac 100644 --- a/tests/gis_tests/rasterapp/migrations/0001_setup_extensions.py +++ b/tests/gis_tests/rasterapp/migrations/0001_setup_extensions.py @@ -3,16 +3,10 @@ from django.db import connection, migrations if connection.features.supports_raster: from django.contrib.postgres.operations import CreateExtension - pg_version = connection.ops.postgis_version_tuple() - class Migration(migrations.Migration): - # PostGIS 3+ requires postgis_raster extension. - if pg_version[1:] >= (3,): - operations = [ - CreateExtension("postgis_raster"), - ] - else: - operations = [] + operations = [ + CreateExtension("postgis_raster"), + ] else: diff --git a/tests/postgres_tests/migrations/0001_setup_extensions.py b/tests/postgres_tests/migrations/0001_setup_extensions.py index 8045610aef..8fbc3e190e 100644 --- a/tests/postgres_tests/migrations/0001_setup_extensions.py +++ b/tests/postgres_tests/migrations/0001_setup_extensions.py @@ -1,6 +1,6 @@ from unittest import mock -from django.db import connection, migrations +from django.db import migrations try: from django.contrib.postgres.operations import ( @@ -9,7 +9,6 @@ try: BtreeGistExtension, CITextExtension, CreateExtension, - CryptoExtension, HStoreExtension, TrigramExtension, UnaccentExtension, @@ -23,11 +22,6 @@ except ImportError: HStoreExtension = mock.Mock() TrigramExtension = mock.Mock() UnaccentExtension = mock.Mock() - needs_crypto_extension = False -else: - needs_crypto_extension = ( - connection.vendor == "postgresql" and not connection.features.is_postgresql_13 - ) class Migration(migrations.Migration): @@ -39,8 +33,6 @@ class Migration(migrations.Migration): # Ensure CreateExtension quotes extension names by creating one with a # dash in its name. CreateExtension("uuid-ossp"), - # CryptoExtension is required for RandomUUID() on PostgreSQL < 13. - CryptoExtension() if needs_crypto_extension else mock.Mock(), HStoreExtension(), TrigramExtension(), UnaccentExtension(), diff --git a/tests/queries/test_explain.py b/tests/queries/test_explain.py index 11684356b9..f04153754b 100644 --- a/tests/queries/test_explain.py +++ b/tests/queries/test_explain.py @@ -83,9 +83,8 @@ class ExplainTests(TestCase): {"verbose": False, "timing": False, "analyze": True}, {"summary": True}, {"settings": True}, + {"analyze": True, "wal": True}, ] - if connection.features.is_postgresql_13: - test_options.append({"analyze": True, "wal": True}) for options in test_options: with self.subTest(**options), transaction.atomic(): with CaptureQueriesContext(connection) as captured_queries: |
