From aa93853c5d03f8231caf392cc523af7db9e09412 Mon Sep 17 00:00:00 2001
From: Ben Cail <bcail@crossway.org>
Date: Fri, 23 Feb 2024 08:57:08 -0500
Subject: [PATCH] assume OPTIONS is always in DATABASES[alias]

---
 django/db/backends/base/schema.py   | 14 ++++++--------
 django/db/models/fields/__init__.py |  6 +++---
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/django/db/backends/base/schema.py b/django/db/backends/base/schema.py
index 3e64d6d81b..896d3a6acf 100644
--- a/django/db/backends/base/schema.py
+++ b/django/db/backends/base/schema.py
@@ -291,10 +291,8 @@ class BaseDatabaseSchemaEditor:
             ),
         }
         db_tablespace = None
-        if (
-            settings.DATABASES[self.connection.alias]
-            .get("OPTIONS", {})
-            .get("DEFAULT_TABLESPACE")
+        if settings.DATABASES[self.connection.alias]["OPTIONS"].get(
+            "DEFAULT_TABLESPACE"
         ):
             db_tablespace = settings.DATABASES[self.connection.alias]["OPTIONS"][
                 "DEFAULT_TABLESPACE"
@@ -370,9 +368,9 @@ class BaseDatabaseSchemaEditor:
         # Optionally add the tablespace if it's an implicitly indexed column.
         tablespace = (
             field.db_tablespace
-            or settings.DATABASES[self.connection.alias]
-            .get("OPTIONS", {})
-            .get("DEFAULT_TABLESPACE")
+            or settings.DATABASES[self.connection.alias]["OPTIONS"].get(
+                "DEFAULT_TABLESPACE"
+            )
             or model._meta.db_tablespace
         )
         if (
@@ -1532,7 +1530,7 @@ class BaseDatabaseSchemaEditor:
 
     def _get_index_tablespace_sql(self, model, fields, db_tablespace=None):
         if db_tablespace is None:
-            db_options = settings.DATABASES[self.connection.alias].get("OPTIONS", {})
+            db_options = settings.DATABASES[self.connection.alias]["OPTIONS"]
             if len(fields) == 1 and fields[0].db_tablespace:
                 db_tablespace = fields[0].db_tablespace
             elif db_options.get("DEFAULT_INDEX_TABLESPACE"):
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 881afc8253..88dd867ff4 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -924,9 +924,9 @@ class Field(RegisterLookupMixin):
     def db_tablespace(self):
         return (
             self._db_tablespace
-            or settings.DATABASES[connection.alias]
-            .get("OPTIONS", {})
-            .get("DEFAULT_INDEX_TABLESPACE")
+            or settings.DATABASES[connection.alias]["OPTIONS"].get(
+                "DEFAULT_INDEX_TABLESPACE"
+            )
             or settings.DEFAULT_INDEX_TABLESPACE
         )