Explorar o código

Receiving invalid syntax error when using MySql with RDBMS under interperter (#3045)

Internal Jira: CDPD-45759
Mahesh Balakrishnan %!s(int64=3) %!d(string=hai) anos
pai
achega
688b03585a

+ 4 - 1
desktop/libs/notebook/src/notebook/connectors/jdbc.py

@@ -45,7 +45,10 @@ def query_error_handler(func):
     except Exception as e:
       message = force_unicode(smart_str(e))
       if 'error occurred while trying to connect to the Java server' in message:
-        raise QueryError, _('%s: is the DB Proxy server running?') % message, sys.exc_info()[2]
+        if sys.version_info[0] > 2:
+          raise QueryError(_('%s: is the DB Proxy server running?') % message).with_traceback(sys.exc_info()[2])
+        else:
+          raise QueryError, _('%s: is the DB Proxy server running?') % message, sys.exc_info()[2]
       elif 'Access denied' in message:
         raise AuthenticationRequired, '', sys.exc_info()[2]
       else:

+ 4 - 1
desktop/libs/notebook/src/notebook/connectors/rdbms.py

@@ -40,7 +40,10 @@ def query_error_handler(func):
       if 'Invalid query handle' in message or 'Invalid OperationHandle' in message:
         raise QueryExpired(e)
       else:
-        raise QueryError, message, sys.exc_info()[2]
+        if sys.version_info[0] > 2:
+          raise QueryError(message).with_traceback(sys.exc_info()[2])
+        else:
+          raise QueryError, message, sys.exc_info()[2]
   return decorator