sqlobject-cvs — CVS notification

[SQL-CVS] [ sqlobject-Bugs-3290104 ] http://psychragme.t35.com/ANAL-CREAMPIE.html Anal creampie

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

Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
X-SourceForge-Tracker-unixname: sqlobject
X-SourceForge-Tracker-trackerid: 540672
X-SourceForge-Tracker-itemid: 3290104
X-SourceForge-Tracker-itemstatus: Open
X-SourceForge-Tracker-itemassignee: nobody
X-SourceForge-Tracker-itemupdate-reason: Tracker Item Submitted
X-SourceForge-Tracker-itemupdate-username: nobody

Bugs item #3290104, was opened at 2011-04-20 04:49
Message generated for change (Tracker Item Submitted) made by nobody
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=3290104&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: MySQL
Group: SQLObject from repository
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Nobody/Anonymous (nobody)
Assigned to: Nobody/Anonymous (nobody)
Summary: http://psychragme.t35.com/ANAL-CREAMPIE.html Anal creampie


Initial Comment:
http://psychragme.t35.com/ANAL-CREAMPIE.html Anal creampie
http://psychragme.t35.com/ANAL-FUCKING.html Anal fucking
http://psychragme.t35.com/ANAL-GALLERIES.html Anal galleries
http://psychragme.t35.com/ANAL-HARDCORE.html Anal hardcore
http://psychragme.t35.com/ANAL-MOVIES.html Anal movies
http://psychragme.t35.com/ANAL-PICTURES.html Anal pictures
http://psychragme.t35.com/ANAL-PORN.html Anal porn
http://psychragme.t35.com/ANAL-SEX.html Anal sex
http://psychragme.t35.com/ANAL-SITE.html Anal site
http://psychragme.t35.com/ANAL-VIDEOS.html Anal videos
http://psychragme.t35.com/ANAL-WEBSITE.html Anal website
http://psychragme.t35.com/FIRST-ANAL.html First anal
http://psychragme.t35.com/FREE-ANAL.html Free anal
http://psychragme.t35.com/HOT-ANAL-SEX.html Hot anal sex
http://psychragme.t35.com/TEEN-ANAL.html Teen anal 

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

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

[SQL-CVS] [ sqlobject-Bugs-3289886 ] http://lockrarold.t35.com/

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

Bugs item #3289886, was opened at 2011-04-19 21:55
Message generated for change (Tracker Item Submitted) made by nobody
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=3289886&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: SQLite
Group: SQLObject from repository
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Nobody/Anonymous (nobody)
Assigned to: Nobody/Anonymous (nobody)
Summary: http://lockrarold.t35.com/
http://hyasnotap.t35.com

Initial Comment:
http://lockrarold.t35.com/
http://hyasnotap.t35.com

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

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

[SQL-CVS] [ sqlobject-Bugs-3289874 ] http://lockrarold.t35.com/

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

Bugs item #3289874, was opened at 2011-04-19 21:43
Message generated for change (Tracker Item Submitted) made by nobody
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=3289874&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: Documentation
Group: SQLObject from repository
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Nobody/Anonymous (nobody)
Assigned to: Nobody/Anonymous (nobody)
Summary: http://lockrarold.t35.com/
http://hyasnotap.t35.com

Initial Comment:
http://lockrarold.t35.com/
http://hyasnotap.t35.com

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

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

[SQL-CVS] r4382 - in SQLObject/trunk: docs scripts

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

Author: phd
Date: Mon Apr 18 13:03:30 2011
New Revision: 4382

Log:
Merged revision 4381 from branch 1.0: version 1.0 has already been released.

Modified:
   SQLObject/trunk/docs/TODO.txt
   SQLObject/trunk/scripts/sqlobject-convertOldURI

Modified: SQLObject/trunk/docs/TODO.txt
==============================================================================
--- SQLObject/trunk/docs/TODO.txt	Mon Apr 18 13:01:18 2011	(r4381)
+++ SQLObject/trunk/docs/TODO.txt	Mon Apr 18 13:03:30 2011	(r4382)
@@ -1,8 +1,6 @@
 TODO
 ----
 
-* Release 1.0.
-
 * Decorators @classmethod and @staticmethod.
 
 * Declare one encoding for all UnicodeCol's per table or even per connection.

Modified: SQLObject/trunk/scripts/sqlobject-convertOldURI
==============================================================================
--- SQLObject/trunk/scripts/sqlobject-convertOldURI	Mon Apr 18 13:01:18 2011	(r4381)
+++ SQLObject/trunk/scripts/sqlobject-convertOldURI	Mon Apr 18 13:03:30 2011	(r4382)
@@ -9,7 +9,7 @@
 
 try:
     import pkg_resources
-    pkg_resources.require('SQLObject>=1.0.0a1')
+    pkg_resources.require('SQLObject>=1.0.0')
 except (ImportError, pkg_resources.DistributionNotFound):
     pass
 

[SQL-CVS] r4381 - in SQLObject/branches/1.0: docs scripts

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

Author: phd
Date: Mon Apr 18 13:01:18 2011
New Revision: 4381

Log:
Version 1.0 has already been released.

Modified:
   SQLObject/branches/1.0/docs/TODO.txt
   SQLObject/branches/1.0/scripts/sqlobject-convertOldURI

Modified: SQLObject/branches/1.0/docs/TODO.txt
==============================================================================
--- SQLObject/branches/1.0/docs/TODO.txt	Mon Apr 18 12:58:15 2011	(r4380)
+++ SQLObject/branches/1.0/docs/TODO.txt	Mon Apr 18 13:01:18 2011	(r4381)
@@ -1,8 +1,6 @@
 TODO
 ----
 
-* Release 1.0.
-
 * Decorators @classmethod and @staticmethod.
 
 * Declare one encoding for all UnicodeCol's per table or even per connection.

Modified: SQLObject/branches/1.0/scripts/sqlobject-convertOldURI
==============================================================================
--- SQLObject/branches/1.0/scripts/sqlobject-convertOldURI	Mon Apr 18 12:58:15 2011	(r4380)
+++ SQLObject/branches/1.0/scripts/sqlobject-convertOldURI	Mon Apr 18 13:01:18 2011	(r4381)
@@ -9,7 +9,7 @@
 
 try:
     import pkg_resources
-    pkg_resources.require('SQLObject>=1.0.0b1')
+    pkg_resources.require('SQLObject>=1.0.0')
 except (ImportError, pkg_resources.DistributionNotFound):
     pass
 

[SQL-CVS] r4380 - SQLObject/trunk/docs

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

Author: phd
Date: Mon Apr 18 12:58:15 2011
New Revision: 4380

Log:
Moved `Internals` to the trunk section.

Modified:
   SQLObject/trunk/docs/News.txt

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Mon Apr 18 05:26:24 2011	(r4379)
+++ SQLObject/trunk/docs/News.txt	Mon Apr 18 12:58:15 2011	(r4380)
@@ -15,6 +15,14 @@
 
 * SelectResults (returned from .select()) is allowed in IN(column, list).
 
+Internals
+---------
+
+* A different workaround is used in SQLiteConnection to prevent PySQLite
+  from converting strings to unicode - in the case of a registered text
+  conversion function PySQLite silently converts empty strings to Nones;
+  now SQLObject uses text_factory instead.
+
 SQLObject 1.0.0
 ===============
 
@@ -37,14 +45,6 @@
 * Parameter ``backend`` in DB URI is no longer supported, use parameter
   ``driver``.
 
-Internals
----------
-
-* A different workaround is used in SQLiteConnection to prevent PySQLite
-  from converting strings to unicode - in the case of a registered text
-  conversion function PySQLite silently converts empty strings to Nones;
-  now SQLObject uses text_factory instead.
-
 SQLObject 0.15.1
 ================
 

[SQL-CVS] r4379 - SQLObject/trunk/sqlobject

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

Author: phd
Date: Mon Apr 18 05:26:24 2011
New Revision: 4379

Log:
This is the trunk.

Modified:
   SQLObject/trunk/sqlobject/__version__.py

Modified: SQLObject/trunk/sqlobject/__version__.py
==============================================================================
--- SQLObject/trunk/sqlobject/__version__.py	Mon Apr 18 05:24:34 2011	(r4378)
+++ SQLObject/trunk/sqlobject/__version__.py	Mon Apr 18 05:26:24 2011	(r4379)
@@ -3,6 +3,6 @@
 major   = 1
 minor   = 1
 micro   = 0
-release_level = 'branch'
+release_level = 'trunk'
 serial  = 0
 version_info = (major, minor, micro, release_level, serial)

[SQL-CVS] r4378 - in SQLObject/trunk: docs sqlobject/sqlite sqlobject/tests

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

Author: phd
Date: Mon Apr 18 05:24:34 2011
New Revision: 4378

Log:
Set connection.text_factory to work around a bug in PySQLite.

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
   SQLObject/trunk/sqlobject/tests/test_sqlite.py

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Mon Apr 18 05:15:57 2011	(r4377)
+++ SQLObject/trunk/docs/News.txt	Mon Apr 18 05:24:34 2011	(r4378)
@@ -37,6 +37,14 @@
 * Parameter ``backend`` in DB URI is no longer supported, use parameter
   ``driver``.
 
+Internals
+---------
+
+* A different workaround is used in SQLiteConnection to prevent PySQLite
+  from converting strings to unicode - in the case of a registered text
+  conversion function PySQLite silently converts empty strings to Nones;
+  now SQLObject uses text_factory instead.
+
 SQLObject 0.15.1
 ================
 

Modified: SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
==============================================================================
--- SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	Mon Apr 18 05:15:57 2011	(r4377)
+++ SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	Mon Apr 18 05:24:34 2011	(r4378)
@@ -59,10 +59,6 @@
         if self.using_sqlite2:
             if autoCommit:
                 opts["isolation_level"] = None
-            opts["detect_types"] = sqlite.PARSE_DECLTYPES
-            for col_type in "text", "char", "varchar", "date", "time", "datetime", "timestamp":
-                sqlite.register_converter(col_type, stop_pysqlite2_converting_strings)
-                sqlite.register_converter(col_type.upper(), stop_pysqlite2_converting_strings)
             global sqlite2_Binary
             if sqlite2_Binary is None:
                 sqlite2_Binary = sqlite.Binary
@@ -95,6 +91,9 @@
         if self._memory:
             self._memoryConn = sqlite.connect(
                 self.filename, **self._connOptions)
+            # Convert text data from SQLite to str, not unicode -
+            # SQLObject converts it to unicode itself.
+            self._memoryConn.text_factory = str
 
     def _connectionFromParams(cls, user, password, host, port, path, args):
         assert host is None and port is None, (
@@ -188,7 +187,9 @@
     def makeConnection(self):
         if self._memory:
             return self._memoryConn
-        return self.module.connect(self.filename, **self._connOptions)
+        conn = self.module.connect(self.filename, **self._connOptions)
+        conn.text_factory = str # Convert text data to str, not unicode
+        return conn
 
     def _executeRetry(self, conn, cursor, query):
         if self.debug:
@@ -394,7 +395,3 @@
         if self._memory:
             return
         os.unlink(self.filename)
-
-
-def stop_pysqlite2_converting_strings(s):
-    return s

Modified: SQLObject/trunk/sqlobject/tests/test_sqlite.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_sqlite.py	Mon Apr 18 05:15:57 2011	(r4377)
+++ SQLObject/trunk/sqlobject/tests/test_sqlite.py	Mon Apr 18 05:24:34 2011	(r4378)
@@ -97,3 +97,10 @@
     # made above (at least will with most database drivers, but
     # this will cause an error in SQLite):
     do_select()
+
+
+def test_empty_string():
+    setupClass(TestSO1)
+    test = TestSO1(name=None, passwd='')
+    assert test.name is None
+    assert test.passwd == ''

[SQL-CVS] r4377 - SQLObject/trunk/sqlobject/tests

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

Author: phd
Date: Mon Apr 18 05:15:57 2011
New Revision: 4377

Log:
Sort the view by id.

Modified:
   SQLObject/trunk/sqlobject/tests/test_views.py

Modified: SQLObject/trunk/sqlobject/tests/test_views.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_views.py	Mon Apr 18 04:11:50 2011	(r4376)
+++ SQLObject/trunk/sqlobject/tests/test_views.py	Mon Apr 18 05:15:57 2011	(r4377)
@@ -32,7 +32,8 @@
     number = StringCol(dbName=PhoneNumber.q.number)
     phoneNumber = ForeignKey('PhoneNumber', dbName=PhoneNumber.q.id)
     calls = SQLMultipleJoin('PhoneCall', joinColumn='phoneNumberID')
-    vCalls = SQLMultipleJoin('ViewPhoneCall', joinColumn='phoneNumberID')
+    vCalls = SQLMultipleJoin('ViewPhoneCall', joinColumn='phoneNumberID',
+                                              orderBy='id')
 
 class ViewPhoneMore(ViewSQLObject):
     ''' View on top of view '''
@@ -130,4 +131,4 @@
 def testDistinctCount():
     # This test is for SelectResults non-* based count when distinct
     # We're really just checking this doesn't raise anything due to lack of sqlrepr'ing
-    assert ViewPhone.select(distinct=True).count() == 2
\ No newline at end of file
+    assert ViewPhone.select(distinct=True).count() == 2

[SQL-CVS] r4376 - SQLObject/trunk/sqlobject/tests

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

Author: phd
Date: Mon Apr 18 04:11:50 2011
New Revision: 4376

Log:
Merged test_sqlite_factory.py and test_sqlite_threaded.py into test_sqlite.py.

Added:
   SQLObject/trunk/sqlobject/tests/test_sqlite.py
      - copied, changed from r4373, SQLObject/trunk/sqlobject/tests/test_sqlite_factory.py
Deleted:
   SQLObject/trunk/sqlobject/tests/test_sqlite_factory.py
   SQLObject/trunk/sqlobject/tests/test_sqlite_threaded.py

Copied and modified: SQLObject/trunk/sqlobject/tests/test_sqlite.py (from r4373, SQLObject/trunk/sqlobject/tests/test_sqlite_factory.py)
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_sqlite_factory.py	Mon Mar 28 06:59:57 2011	(r4373, copy source)
+++ SQLObject/trunk/sqlobject/tests/test_sqlite.py	Mon Apr 18 04:11:50 2011	(r4376)
@@ -1,6 +1,8 @@
+import threading
 from sqlobject import *
 from sqlobject.tests.dbtest import *
 from sqlobject.tests.dbtest import setSQLiteConnectionFactory
+from test_basic import TestSO1
 
 class SQLiteFactoryTest(SQLObject):
     name = StringCol()
@@ -81,3 +83,17 @@
         SQLiteFactoryTest(name='sqlbuilder')
         assert SQLiteFactoryTest.select(orderBy="name").accumulateOne("group_concat", "name") == \
             "sqlbuilder, sqlobject"
+
+
+def do_select():
+    list(TestSO1.select())
+
+def test_sqlite_threaded():
+    setupClass(TestSO1)
+    t = threading.Thread(target=do_select)
+    t.start()
+    t.join()
+    # This should reuse the same connection as the connection
+    # made above (at least will with most database drivers, but
+    # this will cause an error in SQLite):
+    do_select()

[SQL-CVS] [ sqlobject-Bugs-3183831 ] Missing 'os' module in import (dbconnection.py)

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

Bugs item #3183831, was opened at 2011-02-16 18:16
Message generated for change (Settings changed) made by phd
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=3183831&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: SQLObject from repository
>Status: Closed
>Resolution: Fixed
Priority: 5
Private: No
Submitted By: Nobody/Anonymous (nobody)
>Assigned to: Oleg Broytman (phd)
Summary: Missing 'os' module in import (dbconnection.py)

Initial Comment:
[SQLObject 0.16dev-r4333, python 2.6]

See exception below:
 
Traceback (most recent call last):
 ... 
 File "... /python2.6/site-packages/SQLObject-0.16dev_r4333-py2.6.egg/sqlobject/dbconnection.py", line 147, in _parseURI
    if os.name == 'nt':
NameError: global name 'os' is not defined


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

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

[SQL-CVS] [ sqlobject-Bugs-3284084 ] Thanks, Shannon. Still wish I looked like that, tho. You are

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

Bugs item #3284084, was opened at 2011-04-11 12:03
Message generated for change (Settings changed) made by phd
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=3284084&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: Deleted
Resolution: None
>Priority: 1
>Private: Yes
Submitted By: Nobody/Anonymous (nobody)
Assigned to: Nobody/Anonymous (nobody)
Summary: Thanks, Shannon. Still wish I looked like that, tho. You are

Initial Comment:
Thanks, Shannon. Still wish I looked like that, tho. You are a very pretty lady yourself :)

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

>Comment By: Oleg Broytman (phd)
Date: 2011-04-12 21:20

Message:
SPAM!

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

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

[SQL-CVS] [ sqlobject-Bugs-3284084 ] Thanks, Shannon. Still wish I looked like that, tho. You are

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

Bugs item #3284084, was opened at 2011-04-11 08:03
Message generated for change (Tracker Item Submitted) made by nobody
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=3284084&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: Firebird/Interbase
Group: SQLObject from repository
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Nobody/Anonymous (nobody)
Assigned to: Nobody/Anonymous (nobody)
Summary: Thanks, Shannon. Still wish I looked like that, tho. You are

Initial Comment:
Thanks, Shannon. Still wish I looked like that, tho. You are a very pretty lady yourself :)

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

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

[SQL-CVS] r4375 - in SQLObject/tags/1.0.0: . sqlobject

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

Author: phd
Date: Mon Mar 28 07:06:45 2011
New Revision: 4375

Log:
Stable version 1.0.0.

Modified:
   SQLObject/tags/1.0.0/README.txt
   SQLObject/tags/1.0.0/setup.cfg
   SQLObject/tags/1.0.0/sqlobject/__init__.py
   SQLObject/tags/1.0.0/sqlobject/__version__.py
   SQLObject/tags/1.0.0/sqlobject/main.py

Modified: SQLObject/tags/1.0.0/README.txt
==============================================================================
--- SQLObject/tags/1.0.0/README.txt	Mon Mar 28 07:00:59 2011	(r4374)
+++ SQLObject/tags/1.0.0/README.txt	Mon Mar 28 07:06:45 2011	(r4375)
@@ -1,5 +1,5 @@
-SQLObject 1.0
-=============
+SQLObject 1.0.0
+===============
 
 Thanks for looking at SQLObject.  SQLObject is an object-relational
 mapper, i.e., a library that will wrap your database tables in Python

Modified: SQLObject/tags/1.0.0/setup.cfg
==============================================================================
--- SQLObject/tags/1.0.0/setup.cfg	Mon Mar 28 07:00:59 2011	(r4374)
+++ SQLObject/tags/1.0.0/setup.cfg	Mon Mar 28 07:06:45 2011	(r4375)
@@ -5,10 +5,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/Authors.txt docs/DeveloperGuide.txt docs/FAQ.txt

Modified: SQLObject/tags/1.0.0/sqlobject/__init__.py
==============================================================================
--- SQLObject/tags/1.0.0/sqlobject/__init__.py	Mon Mar 28 07:00:59 2011	(r4374)
+++ SQLObject/tags/1.0.0/sqlobject/__init__.py	Mon Mar 28 07:06:45 2011	(r4375)
@@ -1,5 +1,5 @@
 """
-SQLObject 1.0
+SQLObject 1.0.0
 """
 from __version__ import version, version_info
 

Modified: SQLObject/tags/1.0.0/sqlobject/__version__.py
==============================================================================
--- SQLObject/tags/1.0.0/sqlobject/__version__.py	Mon Mar 28 07:00:59 2011	(r4374)
+++ SQLObject/tags/1.0.0/sqlobject/__version__.py	Mon Mar 28 07:06:45 2011	(r4375)
@@ -1,8 +1,8 @@
 
-version = '1.0'
+version = '1.0.0'
 major   = 1
 minor   = 0
 micro   = 0
-release_level = 'branch'
+release_level = 'final'
 serial  = 0
 version_info = (major, minor, micro, release_level, serial)

Modified: SQLObject/tags/1.0.0/sqlobject/main.py
==============================================================================
--- SQLObject/tags/1.0.0/sqlobject/main.py	Mon Mar 28 07:00:59 2011	(r4374)
+++ SQLObject/tags/1.0.0/sqlobject/main.py	Mon Mar 28 07:06:45 2011	(r4375)
@@ -1,6 +1,6 @@
 """
-SQLObject 1.0
--------------
+SQLObject 1.0.0
+---------------
 
 :author: Ian Bicking <ia...@co...>
 

[SQL-CVS] r4374 - SQLObject/tags/1.0.0

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

Author: phd
Date: Mon Mar 28 07:00:59 2011
New Revision: 4374

Log:
Tagging 1.0.0

Added:
   SQLObject/tags/1.0.0/
      - copied from r4373, SQLObject/branches/1.0/

[SQL-CVS] r4373 - SQLObject/trunk/docs

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

Author: phd
Date: Mon Mar 28 06:59:57 2011
New Revision: 4373

Log:
Merged revision 4372 from branch 1.0: going to release version 1.0.0.

Modified:
   SQLObject/trunk/docs/News.txt

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Mon Mar 28 06:58:11 2011	(r4372)
+++ SQLObject/trunk/docs/News.txt	Mon Mar 28 06:59:57 2011	(r4373)
@@ -18,6 +18,8 @@
 SQLObject 1.0.0
 ===============
 
+Released 28 Mar 2011.
+
 Features & Interface
 --------------------
 

[SQL-CVS] r4372 - SQLObject/branches/1.0/docs

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

Author: phd
Date: Mon Mar 28 06:58:11 2011
New Revision: 4372

Log:
Going to release version 1.0.0.

Modified:
   SQLObject/branches/1.0/docs/News.txt

Modified: SQLObject/branches/1.0/docs/News.txt
==============================================================================
--- SQLObject/branches/1.0/docs/News.txt	Thu Mar 24 08:03:57 2011	(r4371)
+++ SQLObject/branches/1.0/docs/News.txt	Mon Mar 28 06:58:11 2011	(r4372)
@@ -13,6 +13,8 @@
 SQLObject 1.0.0
 ===============
 
+Released 28 Mar 2011.
+
 Features & Interface
 --------------------
 

[SQL-CVS] r4371 - in SQLObject/trunk: docs sqlobject sqlobject/tests

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

Author: phd
Date: Thu Mar 24 08:03:57 2011
New Revision: 4371

Log:
SelectResults (returned from .select()) is allowed in IN(column, list).

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/sqlbuilder.py
   SQLObject/trunk/sqlobject/tests/test_subqueries.py

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Tue Mar 22 10:26:50 2011	(r4370)
+++ SQLObject/trunk/docs/News.txt	Thu Mar 24 08:03:57 2011	(r4371)
@@ -10,6 +10,11 @@
 SQLObject (trunk)
 =================
 
+Features & Interface
+--------------------
+
+* SelectResults (returned from .select()) is allowed in IN(column, list).
+
 SQLObject 1.0.0
 ===============
 

Modified: SQLObject/trunk/sqlobject/sqlbuilder.py
==============================================================================
--- SQLObject/trunk/sqlobject/sqlbuilder.py	Tue Mar 22 10:26:50 2011	(r4370)
+++ SQLObject/trunk/sqlobject/sqlbuilder.py	Thu Mar 24 08:03:57 2011	(r4371)
@@ -836,6 +836,11 @@
     return SQLOp("IN", item, list)
 
 def IN(item, list):
+    from sresults import SelectResults # Import here to avoid circular import
+    if isinstance(list, SelectResults):
+        query = list.queryForSelect()
+        query.ops['items'] = [list.sourceClass.q.id]
+        list = query
     if isinstance(list, Select):
         return INSubquery(item, list)
     else:

Modified: SQLObject/trunk/sqlobject/tests/test_subqueries.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/test_subqueries.py	Tue Mar 22 10:26:50 2011	(r4370)
+++ SQLObject/trunk/sqlobject/tests/test_subqueries.py	Thu Mar 24 08:03:57 2011	(r4371)
@@ -31,6 +31,10 @@
     assert str(select) == \
         "SELECT test_in1.id, test_in1.col1 FROM test_in1 WHERE test_in1.col1 IN (SELECT test_in2.col2 FROM test_in2)"
 
+    select = TestIn1.select(IN(TestIn1.q.col1, TestIn2.select()))
+    assert str(select) == \
+        "SELECT test_in1.id, test_in1.col1 FROM test_in1 WHERE test_in1.col1 IN (SELECT test_in2.id FROM test_in2 WHERE 1 = 1)"
+
 def test_2perform_in():
     insert()
     select = TestIn1.select(IN(TestIn1.q.col1, Select(TestIn2.q.col2)))

[SQL-CVS] r4370 - in SQLObject/tags/1.0.0b2: . sqlobject

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

Author: phd
Date: Tue Mar 22 10:26:50 2011
New Revision: 4370

Log:
SQLObject 1.0.0b2.

Modified:
   SQLObject/tags/1.0.0b2/README.txt
   SQLObject/tags/1.0.0b2/setup.py
   SQLObject/tags/1.0.0b2/sqlobject/__init__.py
   SQLObject/tags/1.0.0b2/sqlobject/__version__.py
   SQLObject/tags/1.0.0b2/sqlobject/main.py

Modified: SQLObject/tags/1.0.0b2/README.txt
==============================================================================
--- SQLObject/tags/1.0.0b2/README.txt	Tue Mar 22 10:20:27 2011	(r4369)
+++ SQLObject/tags/1.0.0b2/README.txt	Tue Mar 22 10:26:50 2011	(r4370)
@@ -1,5 +1,5 @@
-SQLObject 1.0
-=============
+SQLObject 1.0.0b2
+=================
 
 Thanks for looking at SQLObject.  SQLObject is an object-relational
 mapper, i.e., a library that will wrap your database tables in Python

Modified: SQLObject/tags/1.0.0b2/setup.py
==============================================================================
--- SQLObject/tags/1.0.0b2/setup.py	Tue Mar 22 10:20:27 2011	(r4369)
+++ SQLObject/tags/1.0.0b2/setup.py	Tue Mar 22 10:26:50 2011	(r4370)
@@ -9,7 +9,7 @@
     from distutils.core import setup
     is_setuptools = False
 
-from sqlobject import version
+from sqlobject import version, version_info
 
 subpackages = ['firebird', 'include', 'include.pydispatch', 'inheritance',
                'manager', 'maxdb', 'mysql', 'mssql', 'postgres', 'rdbhost',
@@ -38,7 +38,7 @@
 
 For development see the `subversion repository
 <http://svn.colorstudy.com/SQLObject/branches/%s/>`_
-""" % version,
+""" % '.'.join([str(v) for v in version_info[:2]]),
       classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",
@@ -51,7 +51,7 @@
       author="Ian Bicking",
       author_email="ia...@co...",
       url="http://sqlobject.org/",
-      download_url="http://cheeseshop.python.org/pypi/SQLObject/%s" % version,
+      download_url="http://cheeseshop.python.org/pypi/SQLObject/%sdev-r4370" % version,
       license="LGPL",
       packages=["sqlobject"] + ['sqlobject.%s' % package for package in subpackages],
       scripts=["scripts/sqlobject-admin", "scripts/sqlobject-convertOldURI"],

Modified: SQLObject/tags/1.0.0b2/sqlobject/__init__.py
==============================================================================
--- SQLObject/tags/1.0.0b2/sqlobject/__init__.py	Tue Mar 22 10:20:27 2011	(r4369)
+++ SQLObject/tags/1.0.0b2/sqlobject/__init__.py	Tue Mar 22 10:26:50 2011	(r4370)
@@ -1,5 +1,5 @@
 """
-SQLObject 1.0
+SQLObject 1.0.0b2
 """
 from __version__ import version, version_info
 

Modified: SQLObject/tags/1.0.0b2/sqlobject/__version__.py
==============================================================================
--- SQLObject/tags/1.0.0b2/sqlobject/__version__.py	Tue Mar 22 10:20:27 2011	(r4369)
+++ SQLObject/tags/1.0.0b2/sqlobject/__version__.py	Tue Mar 22 10:26:50 2011	(r4370)
@@ -1,8 +1,8 @@
 
-version = '1.0'
+version = '1.0.0b2'
 major   = 1
 minor   = 0
 micro   = 0
-release_level = 'branch'
-serial  = 0
+release_level = 'beta'
+serial  = 2
 version_info = (major, minor, micro, release_level, serial)

Modified: SQLObject/tags/1.0.0b2/sqlobject/main.py
==============================================================================
--- SQLObject/tags/1.0.0b2/sqlobject/main.py	Tue Mar 22 10:20:27 2011	(r4369)
+++ SQLObject/tags/1.0.0b2/sqlobject/main.py	Tue Mar 22 10:26:50 2011	(r4370)
@@ -1,6 +1,6 @@
 """
-SQLObject 1.0
--------------
+SQLObject 1.0.0b2
+-----------------
 
 :author: Ian Bicking <ia...@co...>
 

[SQL-CVS] r4369 - SQLObject/branches/1.0

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

Author: phd
Date: Tue Mar 22 10:20:27 2011
New Revision: 4369

Log:
Fixed branch URL.

Modified:
   SQLObject/branches/1.0/setup.py

Modified: SQLObject/branches/1.0/setup.py
==============================================================================
--- SQLObject/branches/1.0/setup.py	Tue Mar 22 10:11:21 2011	(r4368)
+++ SQLObject/branches/1.0/setup.py	Tue Mar 22 10:20:27 2011	(r4369)
@@ -9,7 +9,7 @@
     from distutils.core import setup
     is_setuptools = False
 
-from sqlobject import version
+from sqlobject import version, version_info
 
 subpackages = ['firebird', 'include', 'include.pydispatch', 'inheritance',
                'manager', 'maxdb', 'mysql', 'mssql', 'postgres', 'rdbhost',
@@ -38,7 +38,7 @@
 
 For development see the `subversion repository
 <http://svn.colorstudy.com/SQLObject/branches/%s/>`_
-""" % version,
+""" % '.'.join([str(v) for v in version_info[:2]]),
       classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",

[SQL-CVS] r4368 - SQLObject/tags/1.0.0b2

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

Author: phd
Date: Tue Mar 22 10:11:21 2011
New Revision: 4368

Log:
Tagging 1.0.0b2

Added:
   SQLObject/tags/1.0.0b2/
      - copied from r4367, SQLObject/branches/1.0/

[SQL-CVS] r4367 - in SQLObject/tags/0.15.1: . sqlobject

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

Author: phd
Date: Tue Mar 22 09:53:24 2011
New Revision: 4367

Log:
Stable version 0.15.1.

Modified:
   SQLObject/tags/0.15.1/README.txt
   SQLObject/tags/0.15.1/setup.cfg
   SQLObject/tags/0.15.1/setup.py
   SQLObject/tags/0.15.1/sqlobject/__init__.py
   SQLObject/tags/0.15.1/sqlobject/main.py

Modified: SQLObject/tags/0.15.1/README.txt
==============================================================================
--- SQLObject/tags/0.15.1/README.txt	Tue Mar 22 09:50:29 2011	(r4366)
+++ SQLObject/tags/0.15.1/README.txt	Tue Mar 22 09:53:24 2011	(r4367)
@@ -1,5 +1,5 @@
-SQLObject 0.15
-==============
+SQLObject 0.15.1
+================
 
 Thanks for looking at SQLObject.  SQLObject is an object-relational
 mapper, i.e., a library that will wrap your database tables in Python

Modified: SQLObject/tags/0.15.1/setup.cfg
==============================================================================
--- SQLObject/tags/0.15.1/setup.cfg	Tue Mar 22 09:50:29 2011	(r4366)
+++ SQLObject/tags/0.15.1/setup.cfg	Tue Mar 22 09:53:24 2011	(r4367)
@@ -5,10 +5,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/Authors.txt docs/DeveloperGuide.txt docs/FAQ.txt

Modified: SQLObject/tags/0.15.1/setup.py
==============================================================================
--- SQLObject/tags/0.15.1/setup.py	Tue Mar 22 09:50:29 2011	(r4366)
+++ SQLObject/tags/0.15.1/setup.py	Tue Mar 22 09:53:24 2011	(r4367)
@@ -21,7 +21,7 @@
     """
 
 setup(name="SQLObject",
-      version="0.15",
+      version="0.15.1",
       description="Object-Relational Manager, aka database wrapper",
       long_description="""\
 SQLObject is a popular *Object Relational Manager* for providing an
@@ -49,7 +49,7 @@
       author="Ian Bicking",
       author_email="ia...@co...",
       url="http://sqlobject.org/",
-      download_url="http://cheeseshop.python.org/pypi/SQLObject/0.15",
+      download_url="http://cheeseshop.python.org/pypi/SQLObject/0.15.1",
       license="LGPL",
       packages=["sqlobject"] + ['sqlobject.%s' % package for package in subpackages],
       scripts=["scripts/sqlobject-admin"],

Modified: SQLObject/tags/0.15.1/sqlobject/__init__.py
==============================================================================
--- SQLObject/tags/0.15.1/sqlobject/__init__.py	Tue Mar 22 09:50:29 2011	(r4366)
+++ SQLObject/tags/0.15.1/sqlobject/__init__.py	Tue Mar 22 09:53:24 2011	(r4367)
@@ -1,5 +1,5 @@
 """
-SQLObject 0.15
+SQLObject 0.15.1
 """
 
 from col import *

Modified: SQLObject/tags/0.15.1/sqlobject/main.py
==============================================================================
--- SQLObject/tags/0.15.1/sqlobject/main.py	Tue Mar 22 09:50:29 2011	(r4366)
+++ SQLObject/tags/0.15.1/sqlobject/main.py	Tue Mar 22 09:53:24 2011	(r4367)
@@ -1,6 +1,6 @@
 """
-SQLObject 0.15
---------------
+SQLObject 0.15.1
+----------------
 
 :author: Ian Bicking <ia...@co...>
 

[SQL-CVS] r4366 - SQLObject/tags/0.15.1

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

Author: phd
Date: Tue Mar 22 09:50:29 2011
New Revision: 4366

Log:
Tagging 0.15.1

Added:
   SQLObject/tags/0.15.1/
      - copied from r4365, SQLObject/branches/0.15/

[SQL-CVS] r4365 - SQLObject/trunk/docs

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

Author: phd
Date: Tue Mar 22 09:49:46 2011
New Revision: 4365

Log:
Merged revision 4363 from branch 0.15: going to release SQLObject 0.15.1.

Modified:
   SQLObject/trunk/docs/News.txt

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Tue Mar 22 09:48:43 2011	(r4364)
+++ SQLObject/trunk/docs/News.txt	Tue Mar 22 09:49:46 2011	(r4365)
@@ -33,9 +33,11 @@
 SQLObject 0.15.1
 ================
 
+Released 22 Mar 2011.
+
 * A bug was fixed in MSSQLConnection.
 
-* A bugfix was ported from `SQLObject 0.14.2`_.
+* A minor bug was fixed in sqlbuilder.Union.
 
 SQLObject 0.15.0
 ================

[SQL-CVS] r4364 - SQLObject/branches/1.0/docs

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

Author: phd
Date: Tue Mar 22 09:48:43 2011
New Revision: 4364

Log:
Merged revision 4363 from branch 0.15: going to release SQLObject 0.15.1.

Modified:
   SQLObject/branches/1.0/docs/News.txt

Modified: SQLObject/branches/1.0/docs/News.txt
==============================================================================
--- SQLObject/branches/1.0/docs/News.txt	Tue Mar 22 09:47:16 2011	(r4363)
+++ SQLObject/branches/1.0/docs/News.txt	Tue Mar 22 09:48:43 2011	(r4364)
@@ -33,9 +33,11 @@
 SQLObject 0.15.1
 ================
 
+Released 22 Mar 2011.
+
 * A bug was fixed in MSSQLConnection.
 
-* A bugfix was ported from `SQLObject 0.14.2`_.
+* A minor bug was fixed in sqlbuilder.Union.
 
 SQLObject 0.15.0
 ================