From ff3df488f5d84a1fa6288adaaa48948fe1614e7d Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 7 Oct 2008 16:58:53 +0000 Subject: [PATCH] - Oracle will detect string-based statements which contain comments at the front before a SELECT as SELECT statements. [ticket:1187] --- CHANGES | 5 ++++- lib/sqlalchemy/databases/oracle.py | 5 +++++ test/dialect/oracle.py | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 3ad0f12c06..22e96cafc0 100644 --- a/CHANGES +++ b/CHANGES @@ -74,7 +74,10 @@ CHANGES - mysql - Temporary tables are now reflectable. - +- oracle + - Oracle will detect string-based statements which contain + comments at the front before a SELECT as SELECT statements. + [ticket:1187] 0.5.0rc1 ======== diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py index 3f5077d1ae..eb02d45051 100644 --- a/lib/sqlalchemy/databases/oracle.py +++ b/lib/sqlalchemy/databases/oracle.py @@ -14,6 +14,8 @@ from sqlalchemy.sql import operators as sql_operators, functions as sql_function from sqlalchemy import types as sqltypes +SELECT_REGEXP = re.compile(r'(\s*/\*\+.*?\*/)?\s*SELECT', re.I | re.UNICODE) + class OracleNumeric(sqltypes.Numeric): def get_col_spec(self): if self.precision is None: @@ -206,6 +208,9 @@ class OracleExecutionContext(default.DefaultExecutionContext): self.out_parameters[name] = self.cursor.var(dbtype) self.parameters[0][name] = self.out_parameters[name] + def returns_rows_text(self, statement): + return SELECT_REGEXP.match(statement) + def create_cursor(self): c = self._connection.connection.cursor() if self.dialect.arraysize: diff --git a/test/dialect/oracle.py b/test/dialect/oracle.py index ac52b26a98..6803508f5b 100644 --- a/test/dialect/oracle.py +++ b/test/dialect/oracle.py @@ -356,6 +356,10 @@ class SequenceTest(TestBase, AssertsCompiledSQL): seq = Sequence("My_Seq", schema="Some_Schema") assert dialect.identifier_preparer.format_sequence(seq) == '"Some_Schema"."My_Seq"' +class ExecuteTest(TestBase): + __only_on__ = 'oracle' + def test_basic(self): + assert testing.db.execute("/*+ this is a comment */ SELECT 1 FROM DUAL").fetchall() == [(1,)] if __name__ == '__main__': testenv.main() -- 2.47.3