From: Jason Kirtland <jek@discorporate.us>
Date: Wed, 12 Dec 2007 16:39:10 +0000 (+0000)
Subject: - on mysql, emit inner joins as 'INNER JOIN ... ON' (for version 3.23)
X-Git-Tag: rel_0_4_2~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfb33f7959244e1ac15d3d713e0abbd49f7a5e31;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- on mysql, emit inner joins as 'INNER JOIN ... ON' (for version 3.23)
---

diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index 7421644128..ba0ad5e0af 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -1881,6 +1881,14 @@ class MySQLCompiler(compiler.DefaultCompiler):
         else:
             return ""
 
+    def visit_join(self, join, asfrom=False, **kwargs):
+        return ''.join(
+            (self.process(join.left, asfrom=True),
+             (join.isouter and " LEFT OUTER JOIN " or " INNER JOIN "),
+             self.process(join.right, asfrom=True),
+             " ON ",
+             self.process(join.onclause)))
+
     def for_update_clause(self, select):
         if select.for_update == 'read':
              return ' LOCK IN SHARE MODE'