merge 0.6 series to trunk.

1 files changed, 28 insertions, 0 deletions

diff --git a/lib/sqlalchemy/dialects/postgresql/zxjdbc.py b/lib/sqlalchemy/dialects/postgresql/zxjdbc.py
new file mode 100644
index 000000000..b707d2d9e
--- /dev/null
+++ b/lib/sqlalchemy/dialects/postgresql/zxjdbc.py
@@ -0,0 +1,28 @@
+"""Support for the PostgreSQL database via the zxjdbc JDBC connector.
+
+JDBC Driver
+-----------
+
+The official Postgresql JDBC driver is at http://jdbc.postgresql.org/.
+
+"""
+from sqlalchemy.connectors.zxJDBC import ZxJDBCConnector
+from sqlalchemy.dialects.postgresql.base import PGCompiler, PGDialect
+
+class PostgreSQL_jdbcCompiler(PGCompiler):
+
+    def post_process_text(self, text):
+        # Don't escape '%' like PGCompiler
+        return text
+
+
+class PostgreSQL_jdbc(ZxJDBCConnector, PGDialect):
+    statement_compiler = PostgreSQL_jdbcCompiler
+
+    jdbc_db_name = 'postgresql'
+    jdbc_driver_name = 'org.postgresql.Driver'
+
+    def _get_server_version_info(self, connection):
+        return tuple(int(x) for x in connection.connection.dbversion.split('.'))
+
+dialect = PostgreSQL_jdbc