[SQL-CVS] r228 - in trunk/SQLObject/sqlobject: . mysql
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
|
From: <sub...@co...> - 2004-09-27 21:46:46
|
Author: ianb
Date: 2004-09-27 13:34:05 -0400 (Mon, 27 Sep 2004)
New Revision: 228
Modified:
trunk/SQLObject/sqlobject/dbconnection.py
trunk/SQLObject/sqlobject/mysql/mysqlconnection.py
Log:
Some fixes for the .uri() connection function (that produces a URI).
Modified: trunk/SQLObject/sqlobject/dbconnection.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/SQLObject/sqlobject/dbconnection.py 2004-09-27 17:33:17 UTC (re=
v 227)
+++ trunk/SQLObject/sqlobject/dbconnection.py 2004-09-27 17:34:05 UTC (re=
v 228)
@@ -47,9 +47,10 @@
uri =3D '%s://%s' % (self.dbName, auth)
if self.host:
uri +=3D self.host + '/'
- if path.startswith('/'):
- path =3D path[1:]
- return uri + path
+ db =3D self.db
+ if db.startswith('/'):
+ db =3D path[1:]
+ return uri + db
=20
def isSupported(cls):
raise NotImplemented
Modified: trunk/SQLObject/sqlobject/mysql/mysqlconnection.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/SQLObject/sqlobject/mysql/mysqlconnection.py 2004-09-27 17:33:1=
7 UTC (rev 227)
+++ trunk/SQLObject/sqlobject/mysql/mysqlconnection.py 2004-09-27 17:34:0=
5 UTC (rev 228)
@@ -16,7 +16,7 @@
self.host =3D host
self.db =3D db
self.user =3D user
- self.passwd =3D passwd
+ self.password =3D passwd
DBAPI.__init__(self, **kw)
=20
def connectionFromURI(cls, uri):
@@ -27,7 +27,7 @@
=20
def makeConnection(self):
return MySQLdb.connect(host=3Dself.host, db=3Dself.db,
- user=3Dself.user, passwd=3Dself.passwd)
+ user=3Dself.user, passwd=3Dself.password)
=20
def _executeRetry(self, conn, cursor, query):
while 1:
|