diff --git a/VERSION b/VERSION index 75bb0f59..0691567b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.6.0-development+timestamp.2013.08.09.13.37.02 +Version 2.6.0-development+timestamp.2013.08.09.14.13.07 diff --git a/gluon/dal.py b/gluon/dal.py index bafc4e86..63f58d17 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -4373,6 +4373,7 @@ class GoogleSQLAdapter(UseDatabaseStoredFile,MySQLAdapter): self.pool_size = pool_size self.db_codec = db_codec self._after_connection = after_connection + if do_connect: self.find_driver(adapter_args, uri) self.folder = folder or pjoin('$HOME',THREAD_LOCAL.folder.split( os.sep+'applications'+os.sep,1)[1]) ruri = uri.split("://")[1] @@ -4403,6 +4404,10 @@ class GoogleSQLAdapter(UseDatabaseStoredFile,MySQLAdapter): def execute(self, command, *a, **b): return self.log_execute(command.decode('utf8'), *a, **b) + def find_driver(self,adapter_args,uri=None): + self.adapter_args = adapter_args + self.driver = "google" + class NoSQLAdapter(BaseAdapter): can_select_for_update = False