diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-04-21 22:54:35 +0000 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2007-04-21 22:54:35 +0000 |
commit | 60571ea137b461aaee977fab9fd922987a2a2001 (patch) | |
tree | 67be518178c9ae6b0a96fec3d9e0df9237ea8b7c /lib/sqlalchemy/databases | |
parent | 6296e343ea02b037d4bcabb7260e69336e465b34 (diff) | |
download | sqlalchemy-60571ea137b461aaee977fab9fd922987a2a2001.tar.gz |
- converted logger.warn() to warnings.warn()
- implemented #302
Diffstat (limited to 'lib/sqlalchemy/databases')
-rw-r--r-- | lib/sqlalchemy/databases/oracle.py | 4 | ||||
-rw-r--r-- | lib/sqlalchemy/databases/sqlite.py | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py index f49f1d4c0..081b00d42 100644 --- a/lib/sqlalchemy/databases/oracle.py +++ b/lib/sqlalchemy/databases/oracle.py @@ -5,7 +5,7 @@ # the MIT License: http://www.opensource.org/licenses/mit-license.php -import sys, StringIO, string, re +import sys, StringIO, string, re, warnings from sqlalchemy import util, sql, engine, schema, ansisql, exceptions, logging from sqlalchemy.engine import default, base @@ -391,7 +391,7 @@ class OracleDialect(ansisql.ANSIDialect): fks[cons_name] = fk if remote_table is None: # ticket 363 - self.logger.warn("Got 'None' querying 'table_name' from all_cons_columns%(dblink)s - does the user have proper rights to the table?" % {'dblink':dblink}) + warnings.warn("Got 'None' querying 'table_name' from all_cons_columns%(dblink)s - does the user have proper rights to the table?" % {'dblink':dblink}) continue refspec = ".".join([remote_table, remote_column]) schema.Table(remote_table, table.metadata, autoload=True, autoload_with=connection, owner=remote_owner) diff --git a/lib/sqlalchemy/databases/sqlite.py b/lib/sqlalchemy/databases/sqlite.py index 6c1234542..187630523 100644 --- a/lib/sqlalchemy/databases/sqlite.py +++ b/lib/sqlalchemy/databases/sqlite.py @@ -10,8 +10,8 @@ import sys, StringIO, string, types, re from sqlalchemy import sql, engine, schema, ansisql, exceptions, pool, PassiveDefault import sqlalchemy.engine.default as default import sqlalchemy.types as sqltypes +import datetime,time, warnings import sqlalchemy.util as util -import datetime,time class SLNumeric(sqltypes.Numeric): @@ -143,12 +143,19 @@ class SQLiteExecutionContext(default.DefaultExecutionContext): super(SQLiteExecutionContext, self).post_exec() class SQLiteDialect(ansisql.ANSIDialect): + def __init__(self, **kwargs): ansisql.ANSIDialect.__init__(self, default_paramstyle='qmark', **kwargs) def vers(num): return tuple([int(x) for x in num.split('.')]) self.supports_cast = (self.dbapi is None or vers(self.dbapi.sqlite_version) >= vers("3.2.3")) - + if self.dbapi is not None: + sqlite_ver = self.dbapi.version_info + if sqlite_ver < (2,2) and sqlite_ver != (2,1,'3'): + warnings.warn(RuntimeWarning("The installed version of pysqlite2 is out-dated, and will cause errors in some cases. Version 2.1.3 or greater is recommended.")) + if vers(self.dbapi.sqlite_version) < vers("3.3.13"): + warnings.warn(RuntimeWarning("The installed version of sqlite is out-dated, and will cause errors in some cases. Version 3.3.13 or greater is recommended.")) + def dbapi(cls): try: from pysqlite2 import dbapi2 as sqlite |