Fixed #20960 - moved DEFAULT_TABLESPACE to DATABASES #17902
Conversation
| def test_default_index_tablespace(self): | ||
| index_tablespace = "default_index_tablespace" | ||
| databases = copy.deepcopy(settings.DATABASES) | ||
| databases["default"]["OPTIONS"]["DEFAULT_INDEX_TABLESPACE"] = index_tablespace |
There was a problem hiding this comment.
I could be wrong here but I think these options should live at the same level as OPTIONS and not be nested within OPTIONS?
In other words, I think they should be defined as
DATABASES = {
"default": {
"ENGINE": "...",
...,
"DEFAULT_TABLESPACE": "..."
"DEFAULT_INDEX_TABLESPACE": "...",
}
}
As OPTIONS is meant to be per-backend flags that are usually passed directly to the underlying client bindings.
There was a problem hiding this comment.
Thanks, @charettes. The ticket comment seems to suggest they should be inside "OPTIONS", but I'm fine with whatever. @aaugustin do you have any comments?
There was a problem hiding this comment.
Sorry, I haven't been involved in developing Django for several years now and I'm unable to help there.
There was a problem hiding this comment.
No problem, thanks.
I'll update the code to move these options up to the same level as OPTIONS.
There was a problem hiding this comment.
@charettes @felixxm @shangxiao I've updated the code to move those options up.
bcail
force-pushed
the
issue-20960-move-default-tablespace-settings
branch
from
87672cb
to
cfc948e
Compare
| db_tablespace = None | ||
| if settings.DATABASES[self.connection.alias].get("DEFAULT_TABLESPACE"): | ||
| db_tablespace = settings.DATABASES[self.connection.alias][ | ||
| "DEFAULT_TABLESPACE" | ||
| ] | ||
| elif model._meta.db_tablespace: | ||
| db_tablespace = model._meta.db_tablespace |
There was a problem hiding this comment.
This way the DEFAULT_TABLESPACE has a higher priority than the model's Meta tablespace.
I think it's because of the DEFAULT_TABLESPACE assignment in options, but it might lead to unexpected behaviour if someone is not using the default.
No description provided.