dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'niphlod-fix/pg8000'

Browse Source
This commit is contained in:
mdipierro
2014-10-22 21:28:01 -05:00
parent 8ec68e393a 50540b2f97
commit 8eef404e29
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/dal/adapters/postgres.py
+6 -3
View File
@@ -173,9 +173,12 @@ class PostgreSQLAdapter(BaseAdapter):
def try_json(self): def try_json(self):
# check JSON data type support # check JSON data type support
# (to be added to after_connection) # (to be added to after_connection)
if self.driver_name == "pg8000":
supports_json = self.connection.server_version >= "9.2.0" # until pg8000 supports json, leave this commented
elif (self.driver_name == "psycopg2" and #if self.driver_name == "pg8000":
# supports_json = self.connection.server_version >= "9.2.0"
if (self.driver_name == "psycopg2" and
self.driver.__version__ >= "2.0.12"): self.driver.__version__ >= "2.0.12"):
supports_json = self.connection.server_version >= 90200 supports_json = self.connection.server_version >= 90200
elif self.driver_name == "zxJDBC": elif self.driver_name == "zxJDBC":