[Sqlalchemy-commits] [6014] sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/postgres: initial
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [6014] sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/postgres: initial 3.0-only driver for py-postgresql.
|
From: <co...@sq...> - 2009-05-31 22:48:02
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!-- #msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } #msg dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; } #msg ul, pre { overflow: auto; } #header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <title>[6014] sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/postgres: initial 3.0-only driver for py-postgresql.</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>6014</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2009-05-31 18:47:50 -0400 (Sun, 31 May 2009)</dd> </dl> <h3>Log Message</h3> <pre>initial 3.0-only driver for py-postgresql. tests are maybe 60/40 at the moment.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesrel_0_6libsqlalchemydialectspostgresbasepy">sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/postgres/base.py</a></li> </ul> <h3>Added Paths</h3> <ul> <li><a href="#sqlalchemybranchesrel_0_6libsqlalchemydialectspostgrespypostgresqlpy">sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/postgres/pypostgresql.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesrel_0_6libsqlalchemydialectspostgresbasepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/postgres/base.py (6013 => 6014)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/postgres/base.py 2009-05-31 22:03:44 UTC (rev 6013) +++ sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/postgres/base.py 2009-05-31 22:47:50 UTC (rev 6014) </span><span class="lines">@@ -514,7 +514,7 @@ </span><span class="cx"> sql.bindparam('schema', unicode(schema), type_=sqltypes.Unicode)] </span><span class="cx"> ) </span><span class="cx"> ) </span><del>- return bool( cursor.rowcount ) </del><ins>+ return bool(cursor.fetchone()) </ins><span class="cx"> </span><span class="cx"> def has_sequence(self, connection, sequence_name): </span><span class="cx"> cursor = connection.execute( </span><span class="lines">@@ -523,7 +523,7 @@ </span><span class="cx"> "AND nspname != 'information_schema' AND relname = :seqname)", </span><span class="cx"> bindparams=[sql.bindparam('seqname', unicode(sequence_name), type_=sqltypes.Unicode)] </span><span class="cx"> )) </span><del>- return bool(cursor.rowcount) </del><ins>+ return bool(cursor.fetchone()) </ins><span class="cx"> </span><span class="cx"> def table_names(self, connection, schema): </span><span class="cx"> result = connection.execute( </span></span></pre></div> <a id="sqlalchemybranchesrel_0_6libsqlalchemydialectspostgrespypostgresqlpy"></a> <div class="addfile"><h4>Added: sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/postgres/pypostgresql.py (0 => 6014)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/postgres/pypostgresql.py (rev 0) +++ sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/postgres/pypostgresql.py 2009-05-31 22:47:50 UTC (rev 6014) </span><span class="lines">@@ -0,0 +1,80 @@ </span><ins>+"""Support for the PostgreSQL database via py-postgresql. + +Connecting +---------- + +URLs are of the form `postgres+pypostgresql://user@password@host:port/dbname[?key=value&key=value...]`. + + +""" +from sqlalchemy.engine import default +import decimal +from sqlalchemy import util +from sqlalchemy import types as sqltypes +from sqlalchemy.dialects.postgres.base import PGDialect, PGDefaultRunner + +class PGNumeric(sqltypes.Numeric): + def bind_processor(self, dialect): + return None + + def result_processor(self, dialect): + if self.asdecimal: + return None + else: + def process(value): + if isinstance(value, decimal.Decimal): + return float(value) + else: + return value + return process + +class Postgres_pypostgresqlExecutionContext(default.DefaultExecutionContext): + pass + +class Postgres_pypostgresqlDefaultRunner(PGDefaultRunner): + def execute_string(self, stmt, params=None): + return PGDefaultRunner.execute_string(self, stmt, params or ()) + +class Postgres_pypostgresql(PGDialect): + driver = 'pypostgresql' + + supports_unicode_statements = True + + supports_unicode_binds = True + description_encoding = None + + defaultrunner = Postgres_pypostgresqlDefaultRunner + + default_paramstyle = 'format' + + supports_sane_rowcount = False # alas....posting a bug now + + supports_sane_multi_rowcount = False + + execution_ctx_cls = Postgres_pypostgresqlExecutionContext + colspecs = util.update_copy( + PGDialect.colspecs, + { + sqltypes.Numeric : PGNumeric, + sqltypes.Float: sqltypes.Float, # prevents PGNumeric from being used + } + ) + + @classmethod + def dbapi(cls): + from postgresql.driver import dbapi20 + return dbapi20 + + def create_connect_args(self, url): + opts = url.translate_connect_args(username='user') + if 'port' in opts: + opts['port'] = int(opts['port']) + else: + opts['port'] = 5432 + opts.update(url.query) + return ([], opts) + + def is_disconnect(self, e): + return "connection is closed" in str(e) + +dialect = Postgres_pypostgresql </ins></span></pre> </div> </div> </body> </html> |