[Sqlalchemy-commits] sqlalchemy: - [bug] Quoting information is now passed along
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] sqlalchemy: - [bug] Quoting information is now passed along
|
From: <co...@sq...> - 2012-05-04 22:41:14
|
details: http://hg.sqlalchemy.org/sqlalchemy/sqlalchemy/rev/8cb2dcad6ba3 changeset: 8281:8cb2dcad6ba3 user: Mike Bayer <mi...@zz...> date: Fri May 04 18:40:55 2012 -0400 description: - [bug] Quoting information is now passed along from a Column with quote=True when generating a same-named bound parameter to the bindparam() object, as is the case in generated INSERT and UPDATE statements, so that unknown reserved names can be fully supported. [ticket:2437] diffstat: CHANGES | 8 ++++ lib/sqlalchemy/dialects/oracle/cx_oracle.py | 5 +- lib/sqlalchemy/sql/compiler.py | 7 ++- lib/sqlalchemy/sql/expression.py | 28 ++++++++++---- test/dialect/test_oracle.py | 54 ++++++++++++++++++++++++++++- 5 files changed, 88 insertions(+), 14 deletions(-) diffs (206 lines): diff -r 8afecdfb0047 -r 8cb2dcad6ba3 CHANGES --- a/CHANGES Fri May 04 17:50:44 2012 -0400 +++ b/CHANGES Fri May 04 18:40:55 2012 -0400 @@ -330,6 +330,14 @@ expressions. [ticket:2467] also in 0.7.7. +- oracle + - [bug] Quoting information is now passed along + from a Column with quote=True when generating + a same-named bound parameter to the bindparam() + object, as is the case in generated INSERT and UPDATE + statements, so that unknown reserved names can + be fully supported. [ticket:2437] + - extensions - [removed] The SQLSoup extension is removed from SQLAlchemy, and is now an external project. diff -r 8afecdfb0047 -r 8cb2dcad6ba3 lib/sqlalchemy/dialects/oracle/cx_oracle.py --- a/lib/sqlalchemy/dialects/oracle/cx_oracle.py Fri May 04 17:50:44 2012 -0400 +++ b/lib/sqlalchemy/dialects/oracle/cx_oracle.py Fri May 04 18:40:55 2012 -0400 @@ -296,8 +296,9 @@ return dbapi.ROWID class OracleCompiler_cx_oracle(OracleCompiler): - def bindparam_string(self, name): - if self.preparer._bindparam_requires_quotes(name): + def bindparam_string(self, name, quote=None): + if quote is True or quote is not False and \ + self.preparer._bindparam_requires_quotes(name): quoted_name = '"%s"' % name self._quoted_bind_names[name] = quoted_name return OracleCompiler.bindparam_string(self, quoted_name) diff -r 8afecdfb0047 -r 8cb2dcad6ba3 lib/sqlalchemy/sql/compiler.py --- a/lib/sqlalchemy/sql/compiler.py Fri May 04 17:50:44 2012 -0400 +++ b/lib/sqlalchemy/sql/compiler.py Fri May 04 18:40:55 2012 -0400 @@ -686,7 +686,7 @@ self.binds[bindparam.key] = self.binds[name] = bindparam - return self.bindparam_string(name) + return self.bindparam_string(name, quote=bindparam.quote) def render_literal_bindparam(self, bindparam, **kw): value = bindparam.value @@ -756,7 +756,7 @@ self.anon_map[derived] = anonymous_counter + 1 return derived + "_" + str(anonymous_counter) - def bindparam_string(self, name): + def bindparam_string(self, name, quote=None): if self.positional: self.positiontup.append(name) return self.bindtemplate % { @@ -1206,7 +1206,8 @@ def _create_crud_bind_param(self, col, value, required=False): bindparam = sql.bindparam(col.key, value, - type_=col.type, required=required) + type_=col.type, required=required, + quote=col.quote) bindparam._is_crud = True return bindparam._compiler_dispatch(self) diff -r 8afecdfb0047 -r 8cb2dcad6ba3 lib/sqlalchemy/sql/expression.py --- a/lib/sqlalchemy/sql/expression.py Fri May 04 17:50:44 2012 -0400 +++ b/lib/sqlalchemy/sql/expression.py Fri May 04 18:40:55 2012 -0400 @@ -987,7 +987,8 @@ """ return TableClause(name, *columns) -def bindparam(key, value=None, type_=None, unique=False, required=False, callable_=None): +def bindparam(key, value=None, type_=None, unique=False, required=False, + quote=None, callable_=None): """Create a bind parameter clause with the given key. :param key: @@ -1024,15 +1025,19 @@ :param required: a value is required at execution time. + :param quote: + True if this parameter name requires quoting and is not + currently known as a SQLAlchemy reserved word; this currently + only applies to the Oracle backend. + """ if isinstance(key, ColumnClause): - return _BindParamClause(key.name, value, type_=key.type, - callable_=callable_, - unique=unique, required=required) - else: - return _BindParamClause(key, value, type_=type_, - callable_=callable_, - unique=unique, required=required) + type_ = key.type + key = key.name + return _BindParamClause(key, value, type_=type_, + callable_=callable_, + unique=unique, required=required, + quote=quote) def outparam(key, type_=None): """Create an 'OUT' parameter for usage in functions (stored procedures), @@ -2613,6 +2618,7 @@ def __init__(self, key, value, type_=None, unique=False, callable_=None, isoutparam=False, required=False, + quote=None, _compared_to_operator=None, _compared_to_type=None): """Construct a _BindParamClause. @@ -2648,6 +2654,11 @@ already has been located within the containing :class:`.ClauseElement`. + :param quote: + True if this parameter name requires quoting and is not + currently known as a SQLAlchemy reserved word; this currently + only applies to the Oracle backend. + :param required: a value is required at execution time. @@ -2677,6 +2688,7 @@ self.callable = callable_ self.isoutparam = isoutparam self.required = required + self.quote = quote if type_ is None: if _compared_to_type is not None: self.type = \ diff -r 8afecdfb0047 -r 8cb2dcad6ba3 test/dialect/test_oracle.py --- a/test/dialect/test_oracle.py Fri May 04 17:50:44 2012 -0400 +++ b/test/dialect/test_oracle.py Fri May 04 18:40:55 2012 -0400 @@ -47,10 +47,42 @@ def teardown_class(cls): testing.db.execute("DROP PROCEDURE foo") +class QuotedBindRoundTripTest(fixtures.TestBase): + + __only_on__ = 'oracle' + + @testing.provide_metadata + def test_table_round_trip(self): + oracle.RESERVED_WORDS.remove('UNION') + + metadata = self.metadata + table = Table("t1", metadata, + Column("option", Integer), + Column("plain", Integer, quote=True), + # test that quote works for a reserved word + # that the dialect isn't aware of when quote + # is set + Column("union", Integer, quote=True) + ) + metadata.create_all() + + table.insert().execute( + {"option":1, "plain":1, "union":1} + ) + eq_( + testing.db.execute(table.select()).first(), + (1, 1, 1) + ) + table.update().values(option=2, plain=2, union=2).execute() + eq_( + testing.db.execute(table.select()).first(), + (2, 2, 2) + ) + class CompileTest(fixtures.TestBase, AssertsCompiledSQL): - __dialect__ = oracle.OracleDialect() + __dialect__ = oracle.dialect() def test_owner(self): meta = MetaData() @@ -73,6 +105,26 @@ "sometable.col1 AS col1, sometable.col2 " "AS col2 FROM sometable)") + def test_bindparam_quote(self): + """test that bound parameters take on quoting for reserved words, + column names quote flag enabled.""" + # note: this is only in cx_oracle at the moment. not sure + # what other hypothetical oracle dialects might need + + self.assert_compile( + bindparam("option"), ':"option"' + ) + self.assert_compile( + bindparam("plain"), ':plain' + ) + t = Table("s", MetaData(), Column('plain', Integer, quote=True)) + self.assert_compile( + t.insert().values(plain=5), 'INSERT INTO s ("plain") VALUES (:"plain")' + ) + self.assert_compile( + t.update().values(plain=5), 'UPDATE s SET "plain"=:"plain"' + ) + def test_limit(self): t = table('sometable', column('col1'), column('col2')) s = select([t]) |