diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-08-11 14:03:23 +0000 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-08-11 14:03:23 +0000 |
commit | e8793a5b59a05fb1d96c228bcd2e9f3ec381c0b4 (patch) | |
tree | 08adf229eaa4dc2613d21e6009c5a205d3eb3d4d /lib/sqlalchemy/ansisql.py | |
parent | 41c734b5a38a615c2f175659a6e8e0c37c482118 (diff) | |
download | sqlalchemy-e8793a5b59a05fb1d96c228bcd2e9f3ec381c0b4.tar.gz |
- case_sensitive=(True|False) setting removed from schema items, since
checking this state added a lot of method call overhead and there was
no decent reason to ever set it to False. Table and column names which are
all lower case will be treated as case-insenstive (yes we adjust for
Oracle's UPPERCASE style too).
Diffstat (limited to 'lib/sqlalchemy/ansisql.py')
-rw-r--r-- | lib/sqlalchemy/ansisql.py | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/lib/sqlalchemy/ansisql.py b/lib/sqlalchemy/ansisql.py index 0efaf8657..14bae1d17 100644 --- a/lib/sqlalchemy/ansisql.py +++ b/lib/sqlalchemy/ansisql.py @@ -1013,35 +1013,34 @@ class ANSIIdentifierPreparer(object): def _illegal_initial_characters(self): return ILLEGAL_INITIAL_CHARACTERS - def _requires_quotes(self, value, case_sensitive): + def _requires_quotes(self, value): """Return True if the given identifier requires quoting.""" return \ value in self._reserved_words() \ or (value[0] in self._illegal_initial_characters()) \ or bool(len([x for x in unicode(value) if x not in self._legal_characters()])) \ - or (case_sensitive and value.lower() != value) + or (value.lower() != value) def __generic_obj_format(self, obj, ident): if getattr(obj, 'quote', False): return self.quote_identifier(ident) if self.dialect.cache_identifiers: - case_sens = getattr(obj, 'case_sensitive', None) try: - return self.__strings[(ident, case_sens)] + return self.__strings[ident] except KeyError: - if self._requires_quotes(ident, getattr(obj, 'case_sensitive', ident == ident.lower())): - self.__strings[(ident, case_sens)] = self.quote_identifier(ident) + if self._requires_quotes(ident): + self.__strings[ident] = self.quote_identifier(ident) else: - self.__strings[(ident, case_sens)] = ident - return self.__strings[(ident, case_sens)] + self.__strings[ident] = ident + return self.__strings[ident] else: - if self._requires_quotes(ident, getattr(obj, 'case_sensitive', ident == ident.lower())): + if self._requires_quotes(ident): return self.quote_identifier(ident) else: return ident def should_quote(self, object): - return object.quote or self._requires_quotes(object.name, object.case_sensitive) + return object.quote or self._requires_quotes(object.name) def format_sequence(self, sequence): return self.__generic_obj_format(sequence, sequence.name) |