diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-03-05 20:31:44 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2006-03-05 20:31:44 +0000 |
| commit | 9c4f3c0480f54e08b3aa2800ed76e89f957f8131 (patch) | |
| tree | e7cad83cbd55ff0e2a3f4103160e7e8fed6b6a2c /lib/sqlalchemy/databases | |
| parent | c1d0c2dffc0eedfa63de5b90addb70bfd3a81540 (diff) | |
| download | sqlalchemy-9c4f3c0480f54e08b3aa2800ed76e89f957f8131.tar.gz | |
got column onupdate working
improvement to Function so that they can more easily be called standalone without having to throw them into a select().
Diffstat (limited to 'lib/sqlalchemy/databases')
| -rw-r--r-- | lib/sqlalchemy/databases/oracle.py | 5 | ||||
| -rw-r--r-- | lib/sqlalchemy/databases/postgres.py | 16 |
2 files changed, 5 insertions, 16 deletions
diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py index 6f5e98265..eab200317 100644 --- a/lib/sqlalchemy/databases/oracle.py +++ b/lib/sqlalchemy/databases/oracle.py @@ -209,6 +209,11 @@ class OracleCompiler(ansisql.ANSICompiler): self._use_ansi = use_ansi ansisql.ANSICompiler.__init__(self, statement, parameters, engine=engine, **kwargs) + def default_from(self): + """called when a SELECT statement has no froms, and no FROM clause is to be appended. + gives Oracle a chance to tack on a "FROM DUAL" to the string output. """ + return " FROM DUAL" + def visit_join(self, join): if self._use_ansi: return ansisql.ANSICompiler.visit_join(self, join) diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py index 105fe7a76..db20b636c 100644 --- a/lib/sqlalchemy/databases/postgres.py +++ b/lib/sqlalchemy/databases/postgres.py @@ -103,16 +103,6 @@ class PGBoolean(sqltypes.Boolean): def get_col_spec(self): return "BOOLEAN" -ANSI_FUNCS = util.HashSet([ -'CURRENT_TIME', -'CURRENT_TIMESTAMP', -'CURRENT_DATE', -'LOCAL_TIME', -'LOCAL_TIMESTAMP', -'CURRENT_USER', -'SESSION_USER', -'USER' -]) pg2_colspecs = { sqltypes.Integer : PGInteger, @@ -283,12 +273,6 @@ class PGSQLEngine(ansisql.ANSISQLEngine): class PGCompiler(ansisql.ANSICompiler): - def visit_function(self, func): - # PG has a bunch of funcs that explicitly need no parenthesis - if func.name.upper() in ANSI_FUNCS and not len(func.clauses): - self.strings[func] = func.name - else: - super(PGCompiler, self).visit_function(func) def visit_insert_column(self, column): # Postgres advises against OID usage and turns it off in 8.1, |
