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

Merge pull request #500 from niphlod/fix/postgresql_json

Browse Source 
postgresql: identifies what adapter auto-loads json values
This commit is contained in:
mdipierro
2014-09-14 14:53:45 -05:00
parent f1ac5126a1 c4a4ee27c4
commit ec62375f6d
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/dal.py
+10 -5
View File
@@ -2917,16 +2917,21 @@ class PostgreSQLAdapter(BaseAdapter):
# (to be added to after_connection)
if self.driver_name == "pg8000":
supports_json = self.connection.server_version >= "9.2.0"
elif (self.driver_name == "psycopg2") and \
(self.driver.__version__ >= "2.0.12"):
elif (self.driver_name == "psycopg2" and
self.driver.__version__ >= "2.0.12"):
supports_json = self.connection.server_version >= 90200
elif self.driver_name == "zxJDBC":
supports_json = self.connection.dbversion >= "9.2.0"
else: supports_json = None
else:
supports_json = None
if supports_json:
self.types["json"] = "JSON"
self.driver_auto_json = ['loads']
else: LOGGER.debug("Your database version does not support the JSON data type (using TEXT instead)")
if (self.driver_name == "psycopg2" and
self.driver.__version__ >= '2.5.0'):
self.driver_auto_json = ['loads']
else:
LOGGER.debug("Your database version does not support the JSON"
" data type (using TEXT instead)")
def LIKE(self, first, second):
args = (self.expand(first), self.expand(second, 'string'))