[Sqlalchemy-commits] [6013] sqlalchemy/branches/rel_0_6: fixes for MySQL
Brought to you by:
zzzeek
Menu
▾
▴
[Sqlalchemy-commits] [6013] sqlalchemy/branches/rel_0_6: fixes for MySQL
|
From: <co...@sq...> - 2009-05-31 22:03:49
|
<!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>[6013] sqlalchemy/branches/rel_0_6: fixes for MySQL</title> </head> <body> <div id="msg"> <dl> <dt>Revision</dt> <dd>6013</dd> <dt>Author</dt> <dd>zzzeek</dd> <dt>Date</dt> <dd>2009-05-31 18:03:44 -0400 (Sun, 31 May 2009)</dd> </dl> <h3>Log Message</h3> <pre>fixes for MySQL</pre> <h3>Modified Paths</h3> <ul> <li><a href="#sqlalchemybranchesrel_0_6libsqlalchemydialectsmysqlbasepy">sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/mysql/base.py</a></li> <li><a href="#sqlalchemybranchesrel_0_6testengineddleventspy">sqlalchemy/branches/rel_0_6/test/engine/ddlevents.py</a></li> <li><a href="#sqlalchemybranchesrel_0_6testtestlibenginespy">sqlalchemy/branches/rel_0_6/test/testlib/engines.py</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="sqlalchemybranchesrel_0_6libsqlalchemydialectsmysqlbasepy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/mysql/base.py (6012 => 6013)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/mysql/base.py 2009-05-31 21:41:20 UTC (rev 6012) +++ sqlalchemy/branches/rel_0_6/lib/sqlalchemy/dialects/mysql/base.py 2009-05-31 22:03:44 UTC (rev 6013) </span><span class="lines">@@ -1466,10 +1466,12 @@ </span><span class="cx"> (self.preparer.quote(self._validate_identifier(index.name, False), index.quote), </span><span class="cx"> self.preparer.format_table(index.table)) </span><span class="cx"> </span><del>- def visit_drop_foreignkey(self, drop): </del><ins>+ def visit_drop_constraint(self, drop): </ins><span class="cx"> constraint = drop.element </span><del>- return "ALTER TABLE %s DROP FOREIGN KEY %s" % \ </del><ins>+ is_fk = isinstance(constraint, sa_schema.ForeignKeyConstraint) + return "ALTER TABLE %s DROP %s%s" % \ </ins><span class="cx"> (self.preparer.format_table(constraint.table), </span><ins>+ is_fk and "FOREIGN KEY " or "", </ins><span class="cx"> self.preparer.format_constraint(constraint)) </span><span class="cx"> </span><span class="cx"> class MySQLTypeCompiler(compiler.GenericTypeCompiler): </span><span class="lines">@@ -1832,6 +1834,7 @@ </span><span class="cx"> self._server_casing = self._detect_casing(connection) </span><span class="cx"> self._server_collations = self._detect_collations(connection) </span><span class="cx"> self._server_ansiquotes = self._detect_ansiquotes(connection) </span><ins>+ </ins><span class="cx"> if self._server_ansiquotes: </span><span class="cx"> self.preparer = MySQLANSIIdentifierPreparer </span><span class="cx"> else: </span><span class="lines">@@ -2068,6 +2071,7 @@ </span><span class="cx"> row = self._compat_fetchone( </span><span class="cx"> connection.execute("SHOW VARIABLES LIKE 'sql_mode'"), </span><span class="cx"> charset=self._connection_charset) </span><ins>+ </ins><span class="cx"> if not row: </span><span class="cx"> mode = '' </span><span class="cx"> else: </span><span class="lines">@@ -2609,7 +2613,7 @@ </span><span class="cx"> </span><span class="cx"> def __init__(self, dialect): </span><span class="cx"> super(MySQLIdentifierPreparer, self).__init__(dialect, initial_quote="`") </span><del>- </del><ins>+ </ins><span class="cx"> def _escape_identifier(self, value): </span><span class="cx"> return value.replace('`', '``') </span><span class="cx"> </span></span></pre></div> <a id="sqlalchemybranchesrel_0_6testengineddleventspy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/rel_0_6/test/engine/ddlevents.py (6012 => 6013)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/rel_0_6/test/engine/ddlevents.py 2009-05-31 21:41:20 UTC (rev 6012) +++ sqlalchemy/branches/rel_0_6/test/engine/ddlevents.py 2009-05-31 22:03:44 UTC (rev 6013) </span><span class="lines">@@ -328,7 +328,7 @@ </span><span class="cx"> </span><span class="cx"> ddl = DDL('%(schema)s-%(table)s-%(fullname)s') </span><span class="cx"> </span><del>- dialect = testing.db.dialect </del><ins>+ dialect = self.mock_engine().dialect </ins><span class="cx"> self.assert_compile(ddl.against(sane_alone), '-t-t', dialect=dialect) </span><span class="cx"> self.assert_compile(ddl.against(sane_schema), 's-t-s.t', dialect=dialect) </span><span class="cx"> self.assert_compile(ddl.against(insane_alone), '-"t t"-"t t"', dialect=dialect) </span></span></pre></div> <a id="sqlalchemybranchesrel_0_6testtestlibenginespy"></a> <div class="modfile"><h4>Modified: sqlalchemy/branches/rel_0_6/test/testlib/engines.py (6012 => 6013)</h4> <pre class="diff"><span> <span class="info">--- sqlalchemy/branches/rel_0_6/test/testlib/engines.py 2009-05-31 21:41:20 UTC (rev 6012) +++ sqlalchemy/branches/rel_0_6/test/testlib/engines.py 2009-05-31 22:03:44 UTC (rev 6013) </span><span class="lines">@@ -131,7 +131,11 @@ </span><span class="cx"> listeners.append(testing_reaper) </span><span class="cx"> </span><span class="cx"> engine = create_engine(url, **options) </span><del>- </del><ins>+ + # may want to call this, results + # in first-connect initializers + #engine.connect() + </ins><span class="cx"> return engine </span><span class="cx"> </span><span class="cx"> def utf8_engine(url=None, options=None): </span></span></pre> </div> </div> </body> </html> |