From: <fwi...@us...> - 2007-08-04 20:53:18
|
Revision: 3389 http://jython.svn.sourceforge.net/jython/?rev=3389&view=rev Author: fwierzbicki Date: 2007-08-04 13:53:17 -0700 (Sat, 04 Aug 2007) Log Message: ----------- a little closer to a connection. Modified Paths: -------------- branches/august-boulder-sprint/sandbox/django/django/db/backends/jdbc_mysql/base.py Modified: branches/august-boulder-sprint/sandbox/django/django/db/backends/jdbc_mysql/base.py =================================================================== --- branches/august-boulder-sprint/sandbox/django/django/db/backends/jdbc_mysql/base.py 2007-08-04 17:56:16 UTC (rev 3388) +++ branches/august-boulder-sprint/sandbox/django/django/db/backends/jdbc_mysql/base.py 2007-08-04 20:53:17 UTC (rev 3389) @@ -72,14 +72,7 @@ self.options = kwargs def _valid_connection(self): - if self.connection is not None: - try: - self.connection.ping() - return True - except DatabaseError: - self.connection.close() - self.connection = None - return False + return self.connection is not None def cursor(self): from django.conf import settings @@ -96,20 +89,27 @@ kwargs['db'] = settings.DATABASE_NAME if settings.DATABASE_PASSWORD: kwargs['passwd'] = settings.DATABASE_PASSWORD - if settings.DATABASE_HOST.startswith('/'): - kwargs['unix_socket'] = settings.DATABASE_HOST - elif settings.DATABASE_HOST: + else: + kwargs['passwd'] = '' + if settings.DATABASE_HOST: kwargs['host'] = settings.DATABASE_HOST + else: + kwargs['host'] = 'localhost' if settings.DATABASE_PORT: kwargs['port'] = int(settings.DATABASE_PORT) + else: + kwargs['port'] = 3306 kwargs.update(self.options) - self.connection = Database.connect(**kwargs) + ###FJW + ###self.connection = Database.connect(**kwargs) + self.connection = Database.connect('jdbc:mysql://%(host)s:%(port)s/%(db)s' % kwargs, kwargs['user'], kwargs['passwd'], 'org.gjt.mm.mysql.Driver') cursor = self.connection.cursor() else: cursor = self.connection.cursor() - if settings.DEBUG: - filterwarnings("error", category=Database.Warning) - return util.CursorDebugWrapper(cursor, self) + ###FJW: temp + ###if settings.DEBUG: + ### filterwarnings("error", category=Database.Warning) + ### return util.CursorDebugWrapper(cursor, self) return cursor def _commit(self): This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |