sqlobject-cvs — CVS notification

[SQL-CVS] [ sqlobject-Patches-1675319 ] DatabaseIndex.get() fix and simplification.

[SourceForge.net <no...@so...>]

Patches item #1675319, was opened at 2007-03-06 19:31
Message generated for change (Comment added) made by llucax
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1675319&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: None
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Leandro Lucarella (llucax)
Assigned to: Nobody/Anonymous (nobody)
Summary: DatabaseIndex.get() fix and simplification.

Initial Comment:
This is a reimplementation of DatabaseIndex.get() using selectBy() + getOne().

The current implementation had some issues with inheritance and when passing objects if a member of the index was a ForeingKey (passing something=something fails where somethingID=something.id works).

This implementations is:
1) Simpler.
2) Smarter. Don't reinvent the wheel (uses existing, more tested and more robust functions).
3) Backward compatible.

Attached is the patch, and 2 testcases: one testing Inheritance and the other object arguments passing.

----------------------------------------------------------------------

>Comment By: Leandro Lucarella (llucax)
Date: 2007-03-06 19:35

Message:
Logged In: YES 
user_id=240225
Originator: YES

File Added: DatabaseIndex.get-selectBy.getOne.patch

----------------------------------------------------------------------

Comment By: Leandro Lucarella (llucax)
Date: 2007-03-06 19:32

Message:
Logged In: YES 
user_id=240225
Originator: YES

File Added: test.inherit.py

----------------------------------------------------------------------

Comment By: Leandro Lucarella (llucax)
Date: 2007-03-06 19:32

Message:
Logged In: YES 
user_id=240225
Originator: YES

File Added: test.ids.py

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1675319&group_id=74338

[SQL-CVS] [ sqlobject-Patches-1675319 ] DatabaseIndex.get() fix and simplification.

[SourceForge.net <no...@so...>]

Patches item #1675319, was opened at 2007-03-06 19:31
Message generated for change (Comment added) made by llucax
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1675319&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: None
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Leandro Lucarella (llucax)
Assigned to: Nobody/Anonymous (nobody)
Summary: DatabaseIndex.get() fix and simplification.

Initial Comment:
This is a reimplementation of DatabaseIndex.get() using selectBy() + getOne().

The current implementation had some issues with inheritance and when passing objects if a member of the index was a ForeingKey (passing something=something fails where somethingID=something.id works).

This implementations is:
1) Simpler.
2) Smarter. Don't reinvent the wheel (uses existing, more tested and more robust functions).
3) Backward compatible.

Attached is the patch, and 2 testcases: one testing Inheritance and the other object arguments passing.

----------------------------------------------------------------------

>Comment By: Leandro Lucarella (llucax)
Date: 2007-03-06 19:32

Message:
Logged In: YES 
user_id=240225
Originator: YES

File Added: test.inherit.py

----------------------------------------------------------------------

Comment By: Leandro Lucarella (llucax)
Date: 2007-03-06 19:32

Message:
Logged In: YES 
user_id=240225
Originator: YES

File Added: test.ids.py

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1675319&group_id=74338

[SQL-CVS] [ sqlobject-Patches-1675319 ] DatabaseIndex.get() fix and simplification.

[SourceForge.net <no...@so...>]

Patches item #1675319, was opened at 2007-03-06 19:31
Message generated for change (Comment added) made by llucax
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1675319&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: None
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Leandro Lucarella (llucax)
Assigned to: Nobody/Anonymous (nobody)
Summary: DatabaseIndex.get() fix and simplification.

Initial Comment:
This is a reimplementation of DatabaseIndex.get() using selectBy() + getOne().

The current implementation had some issues with inheritance and when passing objects if a member of the index was a ForeingKey (passing something=something fails where somethingID=something.id works).

This implementations is:
1) Simpler.
2) Smarter. Don't reinvent the wheel (uses existing, more tested and more robust functions).
3) Backward compatible.

Attached is the patch, and 2 testcases: one testing Inheritance and the other object arguments passing.

----------------------------------------------------------------------

>Comment By: Leandro Lucarella (llucax)
Date: 2007-03-06 19:32

Message:
Logged In: YES 
user_id=240225
Originator: YES

File Added: test.ids.py

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1675319&group_id=74338

[SQL-CVS] [ sqlobject-Patches-1675319 ] DatabaseIndex.get() fix and simplification.

[SourceForge.net <no...@so...>]

Patches item #1675319, was opened at 2007-03-06 19:31
Message generated for change (Tracker Item Submitted) made by Item Submitter
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1675319&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: None
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Leandro Lucarella (llucax)
Assigned to: Nobody/Anonymous (nobody)
Summary: DatabaseIndex.get() fix and simplification.

Initial Comment:
This is a reimplementation of DatabaseIndex.get() using selectBy() + getOne().

The current implementation had some issues with inheritance and when passing objects if a member of the index was a ForeingKey (passing something=something fails where somethingID=something.id works).

This implementations is:
1) Simpler.
2) Smarter. Don't reinvent the wheel (uses existing, more tested and more robust functions).
3) Backward compatible.

Attached is the patch, and 2 testcases: one testing Inheritance and the other object arguments passing.

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1675319&group_id=74338

[SQL-CVS] r2403 - home/phd/SQLObject/paramstyles/sqlobject/mysql

[<sub...@co...>]

Author: phd
Date: 2007-03-06 08:31:37 -0700 (Tue, 06 Mar 2007)
New Revision: 2403

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py
Log:
Merged patches from the revisions 2393:2402 from the trunk

Modified: home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py	2007-03-06 15:30:43 UTC (rev 2402)
+++ home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py	2007-03-06 15:31:37 UTC (rev 2403)
@@ -20,7 +20,7 @@
     def __init__(self, db, user, password='', host='localhost', port=0, **kw):
         global MySQLdb
         if MySQLdb is None:
-            import MySQLdb
+            import MySQLdb, MySQLdb.constants.CR, MySQLdb.constants.ER
         self.module = MySQLdb
         self.host = host
         self.port = port
@@ -28,9 +28,7 @@
         self.user = user
         self.password = password
         self.kw = {}
-        if MySQLdb.version_info[0] > 1 or (MySQLdb.version_info[0] == 1 and \
-               (MySQLdb.version_info[1] > 2 or \
-               (MySQLdb.version_info[1] == 2 and MySQLdb.version_info[2] >= 1))):
+        if MySQLdb.version_info[:3] >= (1, 2, 1):
             self.need_unicode = True
         else:
             self.need_unicode = False
@@ -62,10 +60,12 @@
         try:
             conn = self.module.connect(host=self.host, port=self.port,
                 db=self.db, user=self.user, passwd=self.password, **self.kw)
+            if MySQLdb.version_info[:3] >= (1, 2, 2):
+                conn.ping(True) # Attempt to reconnect. This setting is persistent.
         except self.module.OperationalError, e:
             raise OperationalError(
                 "%s; used connection string: host=%s, port=%s, db=%s, user=%s, pwd=%s" % (
-                e, self.host, self.port, self.db, self.user, self.password)                
+                e, self.host, self.port, self.db, self.user, self.password)
             )
 
         if hasattr(conn, 'autocommit'):
@@ -85,12 +85,12 @@
         # SERVER_GONE exception, the second attempt the SERVER_LOST exception
         # and only the third succeeds. Thus the 3 in the loop count.
         # If it doesn't reconnect even after 3 attempts, while the database is
-        # up and running, it is because a 5.0.x (or newer) server is used
-        # which no longer permits autoreconnects by default. In their case a
+        # up and running, it is because a 5.0.3 (or newer) server is used
+        # which no longer permits autoreconnects by default. In that case a
         # reconnect flag must be set when making the connection to indicate
-        # that autoreconnecting is desired and the python-mysqldb module
-        # doesn't set this flag.
-        for c in range(0, 3):
+        # that autoreconnecting is desired. In MySQLdb 1.2.2 or newer this is
+        # done by calling ping(True) on the connection.
+        for count in range(3):
             try:
                 if self.need_unicode:
                     # For MysqlDB 1.2.1 and later, we go
@@ -100,8 +100,8 @@
                 else:
                     return DBAPI._executeRetry(self, conn, cursor, query)
             except MySQLdb.OperationalError, e:
-                if e.args[0] in (2006, 2013): # SERVER_GONE or SERVER_LOST error
-                    if c == 2:
+                if e.args[0] in (MySQLdb.constants.CR.SERVER_GONE_ERROR, MySQLdb.constants.CR.SERVER_LOST):
+                    if count == 2:
                         raise OperationalError(ErrorMessage(e))
                     if self.debug:
                         self.printDebug(conn, str(e), 'ERROR')
@@ -109,7 +109,7 @@
                     raise OperationalError(ErrorMessage(e))
             except MySQLdb.IntegrityError, e:
                 msg = ErrorMessage(e)
-                if e.args[0] == 1062:
+                if e.args[0] == MySQLdb.constants.ER.DUP_ENTRY:
                     raise DuplicateEntryError(msg)
                 else:
                     raise IntegrityError(msg)

[SQL-CVS] r2402 - SQLObject/trunk/sqlobject/mysql

[<sub...@co...>]

Author: phd
Date: 2007-03-06 08:30:43 -0700 (Tue, 06 Mar 2007)
New Revision: 2402

Modified:
   SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
Log:
MySQLdb.version_info[:3] >= (1, 2, 1) is much more readable and pythonic.


Modified: SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/mysql/mysqlconnection.py	2007-03-06 15:30:33 UTC (rev 2401)
+++ SQLObject/trunk/sqlobject/mysql/mysqlconnection.py	2007-03-06 15:30:43 UTC (rev 2402)
@@ -28,9 +28,7 @@
         self.user = user
         self.password = password
         self.kw = {}
-        if MySQLdb.version_info[0] > 1 or (MySQLdb.version_info[0] == 1 and \
-               (MySQLdb.version_info[1] > 2 or \
-               (MySQLdb.version_info[1] == 2 and MySQLdb.version_info[2] >= 1))):
+        if MySQLdb.version_info[:3] >= (1, 2, 1):
             self.need_unicode = True
         else:
             self.need_unicode = False
@@ -62,9 +60,7 @@
         try:
             conn = self.module.connect(host=self.host, port=self.port,
                 db=self.db, user=self.user, passwd=self.password, **self.kw)
-            if MySQLdb.version_info[0] > 1 or (MySQLdb.version_info[0] == 1 and
-                                               (MySQLdb.version_info[1] > 2 or (MySQLdb.version_info[1] == 2 and
-                                                                                MySQLdb.version_info[2] >= 2))):
+            if MySQLdb.version_info[:3] >= (1, 2, 2):
                 conn.ping(True) # Attempt to reconnect. This setting is persistent.
         except self.module.OperationalError, e:
             raise OperationalError(

[SQL-CVS] r2401 - SQLObject/branches/0.8/sqlobject/mysql

[<sub...@co...>]

Author: phd
Date: 2007-03-06 08:30:33 -0700 (Tue, 06 Mar 2007)
New Revision: 2401

Modified:
   SQLObject/branches/0.8/sqlobject/mysql/mysqlconnection.py
Log:
MySQLdb.version_info[:3] >= (1, 2, 1) is much more readable and pythonic.


Modified: SQLObject/branches/0.8/sqlobject/mysql/mysqlconnection.py
===================================================================
--- SQLObject/branches/0.8/sqlobject/mysql/mysqlconnection.py	2007-03-06 15:30:21 UTC (rev 2400)
+++ SQLObject/branches/0.8/sqlobject/mysql/mysqlconnection.py	2007-03-06 15:30:33 UTC (rev 2401)
@@ -28,9 +28,7 @@
         self.user = user
         self.password = password
         self.kw = {}
-        if MySQLdb.version_info[0] > 1 or (MySQLdb.version_info[0] == 1 and \
-               (MySQLdb.version_info[1] > 2 or \
-               (MySQLdb.version_info[1] == 2 and MySQLdb.version_info[2] >= 1))):
+        if MySQLdb.version_info[:3] >= (1, 2, 1):
             self.need_unicode = True
         else:
             self.need_unicode = False
@@ -62,9 +60,7 @@
         try:
             conn = self.module.connect(host=self.host, port=self.port,
                 db=self.db, user=self.user, passwd=self.password, **self.kw)
-            if MySQLdb.version_info[0] > 1 or (MySQLdb.version_info[0] == 1 and
-                                               (MySQLdb.version_info[1] > 2 or (MySQLdb.version_info[1] == 2 and
-                                                                                MySQLdb.version_info[2] >= 2))):
+            if MySQLdb.version_info[:3] >= (1, 2, 2):
                 conn.ping(True) # Attempt to reconnect. This setting is persistent.
         except self.module.OperationalError, e:
             raise OperationalError(

[SQL-CVS] r2400 - SQLObject/branches/0.7/sqlobject/mysql

[<sub...@co...>]

Author: phd
Date: 2007-03-06 08:30:21 -0700 (Tue, 06 Mar 2007)
New Revision: 2400

Modified:
   SQLObject/branches/0.7/sqlobject/mysql/mysqlconnection.py
Log:
MySQLdb.version_info[:3] >= (1, 2, 1) is much more readable and pythonic.


Modified: SQLObject/branches/0.7/sqlobject/mysql/mysqlconnection.py
===================================================================
--- SQLObject/branches/0.7/sqlobject/mysql/mysqlconnection.py	2007-03-06 15:11:05 UTC (rev 2399)
+++ SQLObject/branches/0.7/sqlobject/mysql/mysqlconnection.py	2007-03-06 15:30:21 UTC (rev 2400)
@@ -19,9 +19,7 @@
         self.user = user
         self.password = passwd
         self.kw = {}
-        if MySQLdb.version_info[0] > 1 or (MySQLdb.version_info[0] == 1 and \
-               (MySQLdb.version_info[1] > 2 or \
-               (MySQLdb.version_info[1] == 2 and MySQLdb.version_info[2] >= 1))):
+        if MySQLdb.version_info[:3] >= (1, 2, 1):
             self.need_unicode = True
         else:
             self.need_unicode = False
@@ -53,9 +51,7 @@
         try:
             conn = self.module.connect(host=self.host, port=self.port,
                 db=self.db, user=self.user, passwd=self.password, **self.kw)
-            if MySQLdb.version_info[0] > 1 or (MySQLdb.version_info[0] == 1 and
-                                               (MySQLdb.version_info[1] > 2 or (MySQLdb.version_info[1] == 2 and
-                                                                                MySQLdb.version_info[2] >= 2))):
+            if MySQLdb.version_info[:3] >= (1, 2, 2):
                 conn.ping(True) # Attempt to reconnect. This setting is persistent.
         except self.module.OperationalError, e:
             raise self.module.OperationalError(

[SQL-CVS] [ sqlobject-Bugs-1547004 ] SQLObject does not reconnect

[SourceForge.net <no...@so...>]

Bugs item #1547004, was opened at 2006-08-26 08:05
Message generated for change (Comment added) made by phd
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=1547004&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: DBM
Group: SQLObject from repository
Status: Open
>Resolution: Fixed
Priority: 5
Private: No
Submitted By: elpargo (elpargo)
Assigned to: Nobody/Anonymous (nobody)
Summary: SQLObject does not reconnect

Initial Comment:
this is from the 0.7bug fix branch

a lot of background has been created on this in
Turbogears bug tracker.

mainly in
http://trac.turbogears.org/turbogears/ticket/872
http://trac.turbogears.org/turbogears/ticket/781

Basically the connection after being idle is drop and
SO engine is not aware of this. 

Many patches have been proposed but none accepted.



----------------------------------------------------------------------

>Comment By: Oleg Broytmann (phd)
Date: 2007-03-06 18:23

Message:
Logged In: YES 
user_id=4799
Originator: NO

Partially fixed: in the revisions 2396-2399 there were patches that allows
autoreconnect for MySQLdb 1.2.2+.

----------------------------------------------------------------------

Comment By: sophana (sophana)
Date: 2006-12-10 23:56

Message:
Logged In: YES 
user_id=931678
Originator: NO

I think the best solution is the one included in this mysqldb patch. The
reconnection is handled directly in the mysql C api with an option.
The problem Is that this option is only available from mysql 5.0.x

http://sourceforge.net/tracker/index.php?func=detail&aid=1483074&group_id=22307&atid=374934

Other problem this patch is for mysqldb 1.2.1p2 which has problems with
unicode.

Have to see if the patch is already applied or applicable to 1.2.2

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=1547004&group_id=74338

[SQL-CVS] r2399 - SQLObject/docs

[<sub...@co...>]

Author: phd
Date: 2007-03-06 08:11:05 -0700 (Tue, 06 Mar 2007)
New Revision: 2399

Modified:
   SQLObject/docs/News.txt
Log:
A patch by Markus Gritsch <m.g...@gm...>: for MySQLdb 1.2.2+
call ping(True) on the connection to allow autoreconnect after a timeout.


Modified: SQLObject/docs/News.txt
===================================================================
--- SQLObject/docs/News.txt	2007-03-06 15:10:48 UTC (rev 2398)
+++ SQLObject/docs/News.txt	2007-03-06 15:11:05 UTC (rev 2399)
@@ -182,6 +182,12 @@
 SQLObject 0.7.4
 ===============
 
+Small Features
+--------------
+
+* For MySQLdb 1.2.2+ call ping(True) on the connection to allow
+  autoreconnect after a timeout.
+
 Bug Fixes
 ---------
 

[SQL-CVS] r2398 - SQLObject/trunk/sqlobject/mysql

[<sub...@co...>]

Author: phd
Date: 2007-03-06 08:10:48 -0700 (Tue, 06 Mar 2007)
New Revision: 2398

Modified:
   SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
Log:
A patch by Markus Gritsch <m.g...@gm...>: for MySQLdb 1.2.2+
call ping(True) on the connection to allow autoreconnect after a timeout.


Modified: SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/mysql/mysqlconnection.py	2007-03-06 15:10:14 UTC (rev 2397)
+++ SQLObject/trunk/sqlobject/mysql/mysqlconnection.py	2007-03-06 15:10:48 UTC (rev 2398)
@@ -20,7 +20,7 @@
     def __init__(self, db, user, password='', host='localhost', port=0, **kw):
         global MySQLdb
         if MySQLdb is None:
-            import MySQLdb
+            import MySQLdb, MySQLdb.constants.CR, MySQLdb.constants.ER
         self.module = MySQLdb
         self.host = host
         self.port = port
@@ -62,10 +62,14 @@
         try:
             conn = self.module.connect(host=self.host, port=self.port,
                 db=self.db, user=self.user, passwd=self.password, **self.kw)
+            if MySQLdb.version_info[0] > 1 or (MySQLdb.version_info[0] == 1 and
+                                               (MySQLdb.version_info[1] > 2 or (MySQLdb.version_info[1] == 2 and
+                                                                                MySQLdb.version_info[2] >= 2))):
+                conn.ping(True) # Attempt to reconnect. This setting is persistent.
         except self.module.OperationalError, e:
             raise OperationalError(
                 "%s; used connection string: host=%s, port=%s, db=%s, user=%s, pwd=%s" % (
-                e, self.host, self.port, self.db, self.user, self.password)                
+                e, self.host, self.port, self.db, self.user, self.password)
             )
 
         if hasattr(conn, 'autocommit'):
@@ -85,12 +89,12 @@
         # SERVER_GONE exception, the second attempt the SERVER_LOST exception
         # and only the third succeeds. Thus the 3 in the loop count.
         # If it doesn't reconnect even after 3 attempts, while the database is
-        # up and running, it is because a 5.0.x (or newer) server is used
-        # which no longer permits autoreconnects by default. In their case a
+        # up and running, it is because a 5.0.3 (or newer) server is used
+        # which no longer permits autoreconnects by default. In that case a
         # reconnect flag must be set when making the connection to indicate
-        # that autoreconnecting is desired and the python-mysqldb module
-        # doesn't set this flag.
-        for c in range(0, 3):
+        # that autoreconnecting is desired. In MySQLdb 1.2.2 or newer this is
+        # done by calling ping(True) on the connection.
+        for count in range(3):
             try:
                 if self.need_unicode:
                     # For MysqlDB 1.2.1 and later, we go
@@ -100,8 +104,8 @@
                 else:
                     return cursor.execute(query)
             except MySQLdb.OperationalError, e:
-                if e.args[0] in (2006, 2013): # SERVER_GONE or SERVER_LOST error
-                    if c == 2:
+                if e.args[0] in (MySQLdb.constants.CR.SERVER_GONE_ERROR, MySQLdb.constants.CR.SERVER_LOST):
+                    if count == 2:
                         raise OperationalError(ErrorMessage(e))
                     if self.debug:
                         self.printDebug(conn, str(e), 'ERROR')
@@ -109,7 +113,7 @@
                     raise OperationalError(ErrorMessage(e))
             except MySQLdb.IntegrityError, e:
                 msg = ErrorMessage(e)
-                if e.args[0] == 1062:
+                if e.args[0] == MySQLdb.constants.ER.DUP_ENTRY:
                     raise DuplicateEntryError(msg)
                 else:
                     raise IntegrityError(msg)

[SQL-CVS] r2397 - in SQLObject/branches/0.8: docs sqlobject/mysql

[<sub...@co...>]

Author: phd
Date: 2007-03-06 08:10:14 -0700 (Tue, 06 Mar 2007)
New Revision: 2397

Modified:
   SQLObject/branches/0.8/docs/News.txt
   SQLObject/branches/0.8/sqlobject/mysql/mysqlconnection.py
Log:
A patch by Markus Gritsch <m.g...@gm...>: for MySQLdb 1.2.2+
call ping(True) on the connection to allow autoreconnect after a timeout.


Modified: SQLObject/branches/0.8/docs/News.txt
===================================================================
--- SQLObject/branches/0.8/docs/News.txt	2007-03-06 15:09:34 UTC (rev 2396)
+++ SQLObject/branches/0.8/docs/News.txt	2007-03-06 15:10:14 UTC (rev 2397)
@@ -129,6 +129,12 @@
 SQLObject 0.7.4
 ===============
 
+Small Features
+--------------
+
+* For MySQLdb 1.2.2+ call ping(True) on the connection to allow
+  autoreconnect after a timeout.
+
 Bug Fixes
 ---------
 

Modified: SQLObject/branches/0.8/sqlobject/mysql/mysqlconnection.py
===================================================================
--- SQLObject/branches/0.8/sqlobject/mysql/mysqlconnection.py	2007-03-06 15:09:34 UTC (rev 2396)
+++ SQLObject/branches/0.8/sqlobject/mysql/mysqlconnection.py	2007-03-06 15:10:14 UTC (rev 2397)
@@ -20,7 +20,7 @@
     def __init__(self, db, user, password='', host='localhost', port=None, **kw):
         global MySQLdb
         if MySQLdb is None:
-            import MySQLdb
+            import MySQLdb, MySQLdb.constants.CR, MySQLdb.constants.ER
         self.module = MySQLdb
         self.host = host
         self.port = port
@@ -62,6 +62,10 @@
         try:
             conn = self.module.connect(host=self.host, port=self.port,
                 db=self.db, user=self.user, passwd=self.password, **self.kw)
+            if MySQLdb.version_info[0] > 1 or (MySQLdb.version_info[0] == 1 and
+                                               (MySQLdb.version_info[1] > 2 or (MySQLdb.version_info[1] == 2 and
+                                                                                MySQLdb.version_info[2] >= 2))):
+                conn.ping(True) # Attempt to reconnect. This setting is persistent.
         except self.module.OperationalError, e:
             raise OperationalError(
                 "%s; used connection string: host=%s, port=%s, db=%s, user=%s, pwd=%s" % (
@@ -85,12 +89,12 @@
         # SERVER_GONE exception, the second attempt the SERVER_LOST exception
         # and only the third succeeds. Thus the 3 in the loop count.
         # If it doesn't reconnect even after 3 attempts, while the database is
-        # up and running, it is because a 5.0.x (or newer) server is used
-        # which no longer permits autoreconnects by default. In their case a
+        # up and running, it is because a 5.0.3 (or newer) server is used
+        # which no longer permits autoreconnects by default. In that case a
         # reconnect flag must be set when making the connection to indicate
-        # that autoreconnecting is desired and the python-mysqldb module
-        # doesn't set this flag.
-        for c in range(0, 3):
+        # that autoreconnecting is desired. In MySQLdb 1.2.2 or newer this is
+        # done by calling ping(True) on the connection.
+        for count in range(3):
             try:
                 if self.need_unicode:
                     # For MysqlDB 1.2.1 and later, we go
@@ -100,8 +104,8 @@
                 else:
                     return cursor.execute(query)
             except MySQLdb.OperationalError, e:
-                if e.args[0] in (2006, 2013): # SERVER_GONE or SERVER_LOST error
-                    if c == 2:
+                if e.args[0] in (MySQLdb.constants.CR.SERVER_GONE_ERROR, MySQLdb.constants.CR.SERVER_LOST):
+                    if count == 2:
                         raise OperationalError(ErrorMessage(e))
                     if self.debug:
                         self.printDebug(conn, str(e), 'ERROR')
@@ -109,7 +113,7 @@
                     raise OperationalError(ErrorMessage(e))
             except MySQLdb.IntegrityError, e:
                 msg = ErrorMessage(e)
-                if e.args[0] == 1062:
+                if e.args[0] == MySQLdb.constants.ER.DUP_ENTRY:
                     raise DuplicateEntryError(msg)
                 else:
                     raise IntegrityError(msg)

[SQL-CVS] r2396 - in SQLObject/branches/0.7: docs sqlobject/mysql

[<sub...@co...>]

Author: phd
Date: 2007-03-06 08:09:34 -0700 (Tue, 06 Mar 2007)
New Revision: 2396

Modified:
   SQLObject/branches/0.7/docs/News.txt
   SQLObject/branches/0.7/sqlobject/mysql/mysqlconnection.py
Log:
A patch by Markus Gritsch <m.g...@gm...>: for MySQLdb 1.2.2+
call ping(True) on the connection to allow autoreconnect after a timeout.


Modified: SQLObject/branches/0.7/docs/News.txt
===================================================================
--- SQLObject/branches/0.7/docs/News.txt	2007-03-05 22:57:11 UTC (rev 2395)
+++ SQLObject/branches/0.7/docs/News.txt	2007-03-06 15:09:34 UTC (rev 2396)
@@ -10,6 +10,12 @@
 SQLObject 0.7.4
 ===============
 
+Small Features
+--------------
+
+* For MySQLdb 1.2.2+ call ping(True) on the connection to allow
+  autoreconnect after a timeout.
+
 Bug Fixes
 ---------
 

Modified: SQLObject/branches/0.7/sqlobject/mysql/mysqlconnection.py
===================================================================
--- SQLObject/branches/0.7/sqlobject/mysql/mysqlconnection.py	2007-03-05 22:57:11 UTC (rev 2395)
+++ SQLObject/branches/0.7/sqlobject/mysql/mysqlconnection.py	2007-03-06 15:09:34 UTC (rev 2396)
@@ -11,7 +11,7 @@
     def __init__(self, db, user, passwd='', host='localhost', port=None, **kw):
         global MySQLdb
         if MySQLdb is None:
-            import MySQLdb
+            import MySQLdb, MySQLdb.constants.CR, MySQLdb.constants.ER
         self.module = MySQLdb
         self.host = host
         self.port = port
@@ -53,6 +53,10 @@
         try:
             conn = self.module.connect(host=self.host, port=self.port,
                 db=self.db, user=self.user, passwd=self.password, **self.kw)
+            if MySQLdb.version_info[0] > 1 or (MySQLdb.version_info[0] == 1 and
+                                               (MySQLdb.version_info[1] > 2 or (MySQLdb.version_info[1] == 2 and
+                                                                                MySQLdb.version_info[2] >= 2))):
+                conn.ping(True) # Attempt to reconnect. This setting is persistent.
         except self.module.OperationalError, e:
             raise self.module.OperationalError(
                 "%s; used connection string: host=%s, port=%s, db=%s, user=%s, pwd=%s" % (

[SQL-CVS] [ sqlobject-Bugs-1673173 ] Update DB schema from Class description

[SourceForge.net <no...@so...>]

Bugs item #1673173, was opened at 2007-03-03 14:43
Message generated for change (Tracker Item Submitted) made by Item Submitter
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=1673173&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: General
Group: None
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Tim Kientzle (kientzle)
Assigned to: Nobody/Anonymous (nobody)
Summary: Update DB schema from Class description

Initial Comment:
According to the documentation, SO can update a
class with information about new columns in the database:

"SQLObject can read the table description from the database, and fill in the class columns"

However, I would prefer to update my SO class descriptions and have new DB columns created automatically.   I can manually addCol to create new columns if I know what they are, but I would like for SO to query the DB, identify columns missing from the DB and automatically create them.  (Dropping and recreating the entire table is clearly out of the question.)

This would cover 90% of my requirements for managing schema evolution.


----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=1673173&group_id=74338

[SQL-CVS] [ sqlobject-Patches-1673015 ] Use sets instead of dicts for used tables.

[SourceForge.net <no...@so...>]

Patches item #1673015, was opened at 2007-03-03 11:26
Message generated for change (Comment added) made by llucax
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1673015&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: None
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Leandro Lucarella (llucax)
Assigned to: Nobody/Anonymous (nobody)
Summary: Use sets instead of dicts for used tables.

Initial Comment:
Since dicts are used as plain sets there, why not to just use sets? Yeah, I know, because of Python 2.2 compatibility :)

Maybe some day...

----------------------------------------------------------------------

>Comment By: Leandro Lucarella (llucax)
Date: 2007-03-03 11:27

Message:
Logged In: YES 
user_id=240225
Originator: YES

File Added: tablesdict.str.set-trunk.patch

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1673015&group_id=74338

[SQL-CVS] [ sqlobject-Patches-1673015 ] Use sets instead of dicts for used tables.

[SourceForge.net <no...@so...>]

Patches item #1673015, was opened at 2007-03-03 11:26
Message generated for change (Tracker Item Submitted) made by Item Submitter
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1673015&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: None
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Leandro Lucarella (llucax)
Assigned to: Nobody/Anonymous (nobody)
Summary: Use sets instead of dicts for used tables.

Initial Comment:
Since dicts are used as plain sets there, why not to just use sets? Yeah, I know, because of Python 2.2 compatibility :)

Maybe some day...

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1673015&group_id=74338

[SQL-CVS] [ sqlobject-Patches-1673013 ] Convert used tables dict keys to string.

[SourceForge.net <no...@so...>]

Patches item #1673013, was opened at 2007-03-03 11:23
Message generated for change (Comment added) made by llucax
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1673013&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: None
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Leandro Lucarella (llucax)
Assigned to: Nobody/Anonymous (nobody)
Summary: Convert used tables dict keys to string.

Initial Comment:
Convert used tables dict keys to string so you can use SQLBuilder.Table in some places you actually can't.

See bug 1642143: http://sourceforge.net/tracker/index.php?func=detail&aid=1642143&group_id=74338&atid=540672

----------------------------------------------------------------------

>Comment By: Leandro Lucarella (llucax)
Date: 2007-03-03 11:24

Message:
Logged In: YES 
user_id=240225
Originator: YES

File Added: tablesdict.str-trunk.patch

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1673013&group_id=74338

[SQL-CVS] [ sqlobject-Patches-1673013 ] Convert used tables dict keys to string.

[SourceForge.net <no...@so...>]

Patches item #1673013, was opened at 2007-03-03 11:23
Message generated for change (Tracker Item Submitted) made by Item Submitter
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1673013&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: None
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Leandro Lucarella (llucax)
Assigned to: Nobody/Anonymous (nobody)
Summary: Convert used tables dict keys to string.

Initial Comment:
Convert used tables dict keys to string so you can use SQLBuilder.Table in some places you actually can't.

See bug 1642143: http://sourceforge.net/tracker/index.php?func=detail&aid=1642143&group_id=74338&atid=540672

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=1673013&group_id=74338

[SQL-CVS] [ sqlobject-Bugs-1495030 ] sql drop fails with soClasses

[SourceForge.net <no...@so...>]

Bugs item #1495030, was opened at 2006-05-25 19:48
Message generated for change (Comment added) made by phd
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=1495030&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: General
Group: None
Status: Closed
Resolution: Fixed
Priority: 5
Private: No
Submitted By: Nobody/Anonymous (nobody)
Assigned to: Nobody/Anonymous (nobody)
Summary: sql drop fails with soClasses

Initial Comment:

sqlobject-admin sql create

respects soClasses, but sqlobject-admin drop tries to 
drop the tables in the same order instead of in the
reverse order. 

See

http://trac.turbogears.org/turbogears/ticket/882

for an example and possible patch.

Arthur Clune (pu...@cl...)

----------------------------------------------------------------------

>Comment By: Oleg Broytmann (phd)
Date: 2007-03-03 14:12

Message:
Logged In: YES 
user_id=4799
Originator: NO

It is fixed after 0.7.3. It is in
http://cheeseshop.python.org/pypi/SQLObject/0.7.4b1. Will be in 0.7.4 and
0.8.1.

----------------------------------------------------------------------

Comment By: Nobody/Anonymous (nobody)
Date: 2007-03-03 03:54

Message:
Logged In: NO 

Im still having this problem with SQLObject 0.7.3 and comparing my
sqlobject\manager\command.py with the patch
http://trac.turbogears.org/attachment/ticket/279/command.patch tells it
hasnt been included even though it is marked as fixed

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=1495030&group_id=74338

[SQL-CVS] r2393 - in home/phd/SQLObject/paramstyles/sqlobject: firebird maxdb

[<sub...@co...>]

Author: phd
Date: 2007-03-03 04:04:32 -0700 (Sat, 03 Mar 2007)
New Revision: 2393

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/firebird/firebirdconnection.py
   home/phd/SQLObject/paramstyles/sqlobject/maxdb/maxdbconnection.py
Log:
Merged patches from the revisions 2389:2392 from the trunk

Modified: home/phd/SQLObject/paramstyles/sqlobject/firebird/firebirdconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/firebird/firebirdconnection.py	2007-03-03 11:03:28 UTC (rev 2392)
+++ home/phd/SQLObject/paramstyles/sqlobject/firebird/firebirdconnection.py	2007-03-03 11:04:32 UTC (rev 2393)
@@ -127,6 +127,7 @@
         self.query('CREATE TABLE %s (\n%s\n)' % \
                    (soClass.sqlmeta.table, self.createColumns(soClass)))
         self.query("CREATE GENERATOR GEN_%s" % soClass.sqlmeta.table)
+        return []
 
     def createReferenceConstraint(self, soClass, col):
         return None

Modified: home/phd/SQLObject/paramstyles/sqlobject/maxdb/maxdbconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/maxdb/maxdbconnection.py	2007-03-03 11:03:28 UTC (rev 2392)
+++ home/phd/SQLObject/paramstyles/sqlobject/maxdb/maxdbconnection.py	2007-03-03 11:04:32 UTC (rev 2393)
@@ -168,6 +168,7 @@
                    (soClass.sqlmeta.table, self.createColumns(soClass)))
         self.query("CREATE SEQUENCE %s"
                    % self.createSequenceName(soClass.sqlmeta.table))
+        return []
 
     def createReferenceConstraint(self, soClass, col):
         return col.maxdbCreateReferenceConstraint()

[SQL-CVS] r2392 - SQLObject/docs

[<sub...@co...>]

Author: phd
Date: 2007-03-03 04:03:28 -0700 (Sat, 03 Mar 2007)
New Revision: 2392

Modified:
   SQLObject/docs/News.txt
Log:
Fixed return value from Firebird/MaxdbConnection.createTable().


Modified: SQLObject/docs/News.txt
===================================================================
--- SQLObject/docs/News.txt	2007-03-03 11:02:42 UTC (rev 2391)
+++ SQLObject/docs/News.txt	2007-03-03 11:03:28 UTC (rev 2392)
@@ -69,6 +69,8 @@
 * ID columns are reverted back from INT UNSIGNED to INT for MySQL to be in
   accord with FOREIGN KEYs.
 
+* Fixed return value from Firebird/MaxdbConnection.createTable().
+
 SQLObject 0.8.0
 ===============
 

[SQL-CVS] r2391 - in SQLObject/trunk/sqlobject: firebird maxdb

[<sub...@co...>]

Author: phd
Date: 2007-03-03 04:02:42 -0700 (Sat, 03 Mar 2007)
New Revision: 2391

Modified:
   SQLObject/trunk/sqlobject/firebird/firebirdconnection.py
   SQLObject/trunk/sqlobject/maxdb/maxdbconnection.py
Log:
Fixed return value - it must an empty list, not None.


Modified: SQLObject/trunk/sqlobject/firebird/firebirdconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/firebird/firebirdconnection.py	2007-03-03 11:02:11 UTC (rev 2390)
+++ SQLObject/trunk/sqlobject/firebird/firebirdconnection.py	2007-03-03 11:02:42 UTC (rev 2391)
@@ -127,6 +127,7 @@
         self.query('CREATE TABLE %s (\n%s\n)' % \
                    (soClass.sqlmeta.table, self.createColumns(soClass)))
         self.query("CREATE GENERATOR GEN_%s" % soClass.sqlmeta.table)
+        return []
 
     def createReferenceConstraint(self, soClass, col):
         return None

Modified: SQLObject/trunk/sqlobject/maxdb/maxdbconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/maxdb/maxdbconnection.py	2007-03-03 11:02:11 UTC (rev 2390)
+++ SQLObject/trunk/sqlobject/maxdb/maxdbconnection.py	2007-03-03 11:02:42 UTC (rev 2391)
@@ -168,6 +168,7 @@
                    (soClass.sqlmeta.table, self.createColumns(soClass)))
         self.query("CREATE SEQUENCE %s"
                    % self.createSequenceName(soClass.sqlmeta.table))
+        return []
 
     def createReferenceConstraint(self, soClass, col):
         return col.maxdbCreateReferenceConstraint()

[SQL-CVS] r2390 - in SQLObject/branches/0.8: docs sqlobject/firebird sqlobject/maxdb

[<sub...@co...>]

Author: phd
Date: 2007-03-03 04:02:11 -0700 (Sat, 03 Mar 2007)
New Revision: 2390

Modified:
   SQLObject/branches/0.8/docs/News.txt
   SQLObject/branches/0.8/sqlobject/firebird/firebirdconnection.py
   SQLObject/branches/0.8/sqlobject/maxdb/maxdbconnection.py
Log:
Fixed return value - it must an empty list, not None.


Modified: SQLObject/branches/0.8/docs/News.txt
===================================================================
--- SQLObject/branches/0.8/docs/News.txt	2007-03-03 10:46:45 UTC (rev 2389)
+++ SQLObject/branches/0.8/docs/News.txt	2007-03-03 11:02:11 UTC (rev 2390)
@@ -124,6 +124,8 @@
 * ID columns are reverted back from INT UNSIGNED to INT for MySQL to be in
   accord with FOREIGN KEYs.
 
+* Fixed return value from Firebird/MaxdbConnection.createTable().
+
 SQLObject 0.7.4
 ===============
 

Modified: SQLObject/branches/0.8/sqlobject/firebird/firebirdconnection.py
===================================================================
--- SQLObject/branches/0.8/sqlobject/firebird/firebirdconnection.py	2007-03-03 10:46:45 UTC (rev 2389)
+++ SQLObject/branches/0.8/sqlobject/firebird/firebirdconnection.py	2007-03-03 11:02:11 UTC (rev 2390)
@@ -127,6 +127,7 @@
         self.query('CREATE TABLE %s (\n%s\n)' % \
                    (soClass.sqlmeta.table, self.createColumns(soClass)))
         self.query("CREATE GENERATOR GEN_%s" % soClass.sqlmeta.table)
+        return []
 
     def createReferenceConstraint(self, soClass, col):
         return None

Modified: SQLObject/branches/0.8/sqlobject/maxdb/maxdbconnection.py
===================================================================
--- SQLObject/branches/0.8/sqlobject/maxdb/maxdbconnection.py	2007-03-03 10:46:45 UTC (rev 2389)
+++ SQLObject/branches/0.8/sqlobject/maxdb/maxdbconnection.py	2007-03-03 11:02:11 UTC (rev 2390)
@@ -168,6 +168,7 @@
                    (soClass.sqlmeta.table, self.createColumns(soClass)))
         self.query("CREATE SEQUENCE %s"
                    % self.createSequenceName(soClass.sqlmeta.table))
+        return []
 
     def createReferenceConstraint(self, soClass, col):
         return col.maxdbCreateReferenceConstraint()

[SQL-CVS] r2389 - home/phd/SQLObject/paramstyles/sqlobject/mysql

[<sub...@co...>]

Author: phd
Date: 2007-03-03 03:46:45 -0700 (Sat, 03 Mar 2007)
New Revision: 2389

Modified:
   home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py
Log:
Merged patches from the revisions 2379:2388 from the trunk

Modified: home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py	2007-03-03 10:30:09 UTC (rev 2388)
+++ home/phd/SQLObject/paramstyles/sqlobject/mysql/mysqlconnection.py	2007-03-03 10:46:45 UTC (rev 2389)
@@ -169,7 +169,7 @@
     def createIDColumn(self, soClass):
         if soClass.sqlmeta.idType == str:
             return '%s TEXT PRIMARY KEY' % soClass.sqlmeta.idName
-        return '%s INT UNSIGNED PRIMARY KEY AUTO_INCREMENT' % soClass.sqlmeta.idName
+        return '%s INT PRIMARY KEY AUTO_INCREMENT' % soClass.sqlmeta.idName
 
     def joinSQLType(self, join):
         return 'INT NOT NULL'

[SQL-CVS] r2388 - SQLObject/tags/0.8.1b1

[<sub...@co...>]

Author: phd
Date: 2007-03-03 03:30:09 -0700 (Sat, 03 Mar 2007)
New Revision: 2388

Modified:
   SQLObject/tags/0.8.1b1/setup.cfg
Log:
Stable version.


Modified: SQLObject/tags/0.8.1b1/setup.cfg
===================================================================
--- SQLObject/tags/0.8.1b1/setup.cfg	2007-03-03 10:29:20 UTC (rev 2387)
+++ SQLObject/tags/0.8.1b1/setup.cfg	2007-03-03 10:30:09 UTC (rev 2388)
@@ -1,10 +1,6 @@
 [easy_install]
 #find_links = http://svn.pythonpaste.org/package_index.html
 
-[egg_info]
-tag_build = dev
-tag_svn_revision = true
-
 [pudge]
 theme = pythonpaste.org
 docs = docs/index.txt docs/SQLObject.txt docs/TODO.txt