You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
(9) |
Apr
(74) |
May
(29) |
Jun
(16) |
Jul
(28) |
Aug
(10) |
Sep
(57) |
Oct
(9) |
Nov
(29) |
Dec
(12) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(7) |
Feb
(14) |
Mar
(6) |
Apr
(3) |
May
(12) |
Jun
(34) |
Jul
(9) |
Aug
(29) |
Sep
(22) |
Oct
(2) |
Nov
(15) |
Dec
(52) |
| 2005 |
Jan
(47) |
Feb
(78) |
Mar
(14) |
Apr
(35) |
May
(33) |
Jun
(16) |
Jul
(26) |
Aug
(63) |
Sep
(40) |
Oct
(96) |
Nov
(96) |
Dec
(123) |
| 2006 |
Jan
(159) |
Feb
(144) |
Mar
(64) |
Apr
(31) |
May
(88) |
Jun
(48) |
Jul
(16) |
Aug
(64) |
Sep
(87) |
Oct
(92) |
Nov
(56) |
Dec
(76) |
| 2007 |
Jan
(94) |
Feb
(103) |
Mar
(126) |
Apr
(123) |
May
(85) |
Jun
(11) |
Jul
(130) |
Aug
(47) |
Sep
(65) |
Oct
(70) |
Nov
(12) |
Dec
(11) |
| 2008 |
Jan
(30) |
Feb
(55) |
Mar
(88) |
Apr
(20) |
May
(50) |
Jun
|
Jul
(38) |
Aug
(1) |
Sep
(9) |
Oct
(5) |
Nov
(6) |
Dec
(39) |
| 2009 |
Jan
(8) |
Feb
(16) |
Mar
(3) |
Apr
(33) |
May
(44) |
Jun
(1) |
Jul
(10) |
Aug
(33) |
Sep
(74) |
Oct
(22) |
Nov
|
Dec
(15) |
| 2010 |
Jan
(28) |
Feb
(22) |
Mar
(46) |
Apr
(29) |
May
(1) |
Jun
(1) |
Jul
(27) |
Aug
(8) |
Sep
(5) |
Oct
(33) |
Nov
(24) |
Dec
(41) |
| 2011 |
Jan
(4) |
Feb
(12) |
Mar
(35) |
Apr
(29) |
May
(19) |
Jun
(16) |
Jul
(32) |
Aug
(25) |
Sep
(5) |
Oct
(11) |
Nov
(21) |
Dec
(12) |
| 2012 |
Jan
(3) |
Feb
(4) |
Mar
(20) |
Apr
(4) |
May
(25) |
Jun
(13) |
Jul
|
Aug
|
Sep
(2) |
Oct
(25) |
Nov
(9) |
Dec
(1) |
| 2013 |
Jan
(6) |
Feb
(8) |
Mar
|
Apr
(10) |
May
(31) |
Jun
(7) |
Jul
(18) |
Aug
(33) |
Sep
(4) |
Oct
(16) |
Nov
|
Dec
(27) |
| 2014 |
Jan
(2) |
Feb
|
Mar
|
Apr
(11) |
May
(39) |
Jun
(8) |
Jul
(11) |
Aug
(4) |
Sep
|
Oct
(27) |
Nov
|
Dec
(71) |
| 2015 |
Jan
(17) |
Feb
(47) |
Mar
(33) |
Apr
|
May
|
Jun
(9) |
Jul
(7) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(8) |
| 2016 |
Jan
(4) |
Feb
(4) |
Mar
|
Apr
|
May
(12) |
Jun
(7) |
Jul
(9) |
Aug
(31) |
Sep
(8) |
Oct
(3) |
Nov
(15) |
Dec
(1) |
| 2017 |
Jan
(13) |
Feb
(7) |
Mar
(14) |
Apr
(8) |
May
(10) |
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <subversion@co...> - 2004-12-27 17:24:27
|
Author: ianb
Date: 2004-12-27 17:24:24 +0000 (Mon, 27 Dec 2004)
New Revision: 495
Modified:
trunk/SQLObject/sqlobject/dbconnection.py
Log:
Got rid of tabs. Bad tabs!
Modified: trunk/SQLObject/sqlobject/dbconnection.py
===================================================================
--- trunk/SQLObject/sqlobject/dbconnection.py 2004-12-24 09:28:53 UTC (rev 494)
+++ trunk/SQLObject/sqlobject/dbconnection.py 2004-12-27 17:24:24 UTC (rev 495)
@@ -442,22 +442,22 @@
self.sqlrepr(value))
for key, value
in kw.items()])
- terms = []
- for key, value in kw.items():
- if hasattr(value, '_SO_joinDict'): #handle an object value
- # find the joinColumn
- for join in value._SO_joinDict.values():
- if join.otherClass is soClass:
- dbName = join.joinColumn
- break
- else: #if nothing found
- raise TypeError, "Cannot selectBy(%s=%r)" % (key, value)
- value = value.id
- else:
- dbName = soClass._SO_columnDict[key].dbName
- term = '%s = %s' % (dbName, self.sqlrepr(value))
- terms.append(term)
- return ' AND '.join(terms)
+ terms = []
+ for key, value in kw.items():
+ if hasattr(value, '_SO_joinDict'): #handle an object value
+ # find the joinColumn
+ for join in value._SO_joinDict.values():
+ if join.otherClass is soClass:
+ dbName = join.joinColumn
+ break
+ else: #if nothing found
+ raise TypeError, "Cannot selectBy(%s=%r)" % (key, value)
+ value = value.id
+ else:
+ dbName = soClass._SO_columnDict[key].dbName
+ term = '%s = %s' % (dbName, self.sqlrepr(value))
+ terms.append(term)
+ return ' AND '.join(terms)
def sqlrepr(self, v):
return sqlrepr(v, self.dbName)
|
|
From: <subversion@co...> - 2004-12-24 09:28:58
|
Author: phd
Date: 2004-12-24 09:28:53 +0000 (Fri, 24 Dec 2004)
New Revision: 494
Modified:
home/phd/SQLObject/inheritance/sqlobject/main.py
Log:
Extract tablesDict from orderBy in addition to clause.
Modified: home/phd/SQLObject/inheritance/sqlobject/main.py
===================================================================
--- home/phd/SQLObject/inheritance/sqlobject/main.py 2004-12-22 15:54:23 UTC (rev 493)
+++ home/phd/SQLObject/inheritance/sqlobject/main.py 2004-12-24 09:28:53 UTC (rev 494)
@@ -1340,6 +1340,9 @@
self.clause = clause
tablesDict = sqlbuilder.tablesUsedDict(self.clause)
tablesDict[sourceClass._table] = 1
+ orderBy = ops.get('orderBy')
+ if orderBy and not isinstance(orderBy, basestring):
+ tablesDict.update(sqlbuilder.tablesUsedDict(orderBy))
#DSM: if this class has a parent, we need to link it
#DSM: and be sure the parent is in the table list.
#DSM: The following code is before clauseTables
|
|
From: <subversion@co...> - 2004-12-16 14:23:51
|
Author: phd
Date: 2004-12-16 14:23:48 +0000 (Thu, 16 Dec 2004)
New Revision: 492
Modified:
home/phd/SQLObject/inheritance/docs/Inheritance.txt
Log:
Minor fix for SQLObject 0.6 API.
Modified: home/phd/SQLObject/inheritance/docs/Inheritance.txt
===================================================================
--- home/phd/SQLObject/inheritance/docs/Inheritance.txt 2004-12-16 14:23:02 UTC (rev 491)
+++ home/phd/SQLObject/inheritance/docs/Inheritance.txt 2004-12-16 14:23:48 UTC (rev 492)
@@ -55,7 +55,7 @@
p = Person(firstName='John', lastName='Doe')
e = Employee(firstName='Jane', lastName='Doe', position='Chief')
- p2 = Person(1)
+ p2 = Person.get(1)
Will create the following data in the database::
@@ -97,8 +97,8 @@
The SQLObject q magic also work. Using this select are valid::
- Employee.select(Employee.q.firstName == 'Jane' & Employee.q.position == 'Chief') will return Jane Doe
- Employee.select(Person.q.firstName == 'Jane' & Employee.q.position == 'Chief') will return Jane Doe
+ Employee.select(AND(Employee.q.firstName == 'Jane' Employee.q.position == 'Chief')) will return Jane Doe
+ Employee.select(AND(Person.q.firstName == 'Jane', Employee.q.position == 'Chief')) will return Jane Doe
Employee.select(Employee.q.lastName == 'Doe') will only return Jane Doe (as Joe isn't an employee)
Person.select(Person.q.lastName == 'Doe') will return both entries.
|
|
From: <subversion@co...> - 2004-12-16 14:23:09
|
Author: phd
Date: 2004-12-16 14:23:02 +0000 (Thu, 16 Dec 2004)
New Revision: 491
Modified:
home/phd/SQLObject/inheritance/sqlobject/col.py
Log:
Merged patches from trunk revisions 484:490.
Modified: home/phd/SQLObject/inheritance/sqlobject/col.py
===================================================================
--- home/phd/SQLObject/inheritance/sqlobject/col.py 2004-12-15 23:30:17 UTC (rev 490)
+++ home/phd/SQLObject/inheritance/sqlobject/col.py 2004-12-16 14:23:02 UTC (rev 491)
@@ -386,7 +386,7 @@
return sqlbuilder.FALSE
def toPython(self, value, state):
- if not value or not int(value):
+ if not value:
return sqlbuilder.FALSE
else:
return sqlbuilder.TRUE
|
|
From: <subversion@co...> - 2004-12-15 16:39:56
|
Author: ianb
Date: 2004-12-15 16:39:41 +0000 (Wed, 15 Dec 2004)
New Revision: 488
Modified:
trunk/SQLObject/sqlobject/col.py
Log:
Shouldn't try to convert values to integers when testing them for
truth -- they may not be coerceable at all, and it's debatable whether
'0' should be false.
Modified: trunk/SQLObject/sqlobject/col.py
===================================================================
--- trunk/SQLObject/sqlobject/col.py 2004-12-15 09:03:57 UTC (rev 487)
+++ trunk/SQLObject/sqlobject/col.py 2004-12-15 16:39:41 UTC (rev 488)
@@ -386,7 +386,7 @@
return sqlbuilder.FALSE
def toPython(self, value, state):
- if not value or not int(value):
+ if not value:
return sqlbuilder.FALSE
else:
return sqlbuilder.TRUE
|
|
From: <subversion@co...> - 2004-12-14 20:47:38
|
Author: phd
Date: 2004-12-14 20:47:30 +0000 (Tue, 14 Dec 2004)
New Revision: 484
Modified:
home/phd/SQLObject/inheritance/docs/Inheritance.txt
Log:
Fixed a minor bug in SELECT.
Modified: home/phd/SQLObject/inheritance/docs/Inheritance.txt
===================================================================
--- home/phd/SQLObject/inheritance/docs/Inheritance.txt 2004-12-14 15:29:52 UTC (rev 483)
+++ home/phd/SQLObject/inheritance/docs/Inheritance.txt 2004-12-14 20:47:30 UTC (rev 484)
@@ -106,7 +106,7 @@
'inherited' classes. These clauses are the link between the id and the
parent id. This will look like the following request::
- SELECT employee.id, employee.first_name, employee.last_name
+ SELECT employee.id, person.first_name, person.last_name
FROM person, employee WHERE person.first_name = 'Jane'
AND employee.position = 'Chief' AND person.id = employee.id
|
|
From: <subversion@co...> - 2004-12-14 15:29:59
|
Author: phd Date: 2004-12-14 15:29:52 +0000 (Tue, 14 Dec 2004) New Revision: 483 Modified: home/phd/SQLObject/inheritance/docs/News.txt Log: Merged patch for docs/News.txt from revisions 477:482 Modified: home/phd/SQLObject/inheritance/docs/News.txt =================================================================== --- home/phd/SQLObject/inheritance/docs/News.txt 2004-12-13 23:12:52 UTC (rev 482) +++ home/phd/SQLObject/inheritance/docs/News.txt 2004-12-14 15:29:52 UTC (rev 483) @@ -7,28 +7,14 @@ .. _start: -SQLObject 0.6.2 -=============== +SVN trunk +========= Interface Changes ----------------- * The long broken and unused ``DBMConnection`` has been removed. -* Removed DBMConnection. - -Features --------- - -* New ``UnicodeCol()`` that converts to and from Unicode - in the database. - -SQLObject 0.6.1 -=============== - -Interface Changes ------------------ - * Added a connection parameter to all class methods (patch 974755) * Connection objects have a ``.module`` attribute, which points to @@ -38,6 +24,11 @@ Features -------- +* New ``UnicodeCol()`` that converts to and from Unicode + in the database. See docs_. + +.. _docs: SQLObject.html#subclasses-of-col + * Added indexing (from Jeremy Fitzhardinge). See `the documentation`__ for more. |
|
From: <subversion@co...> - 2004-12-10 16:54:46
|
Author: ianb Date: 2004-12-10 16:54:44 +0000 (Fri, 10 Dec 2004) New Revision: 479 Modified: trunk/SQLObject/docs/News.txt Log: Combined 0.6.2 and 0.6.1; renamed 0.6.1 to News.txt Modified: trunk/SQLObject/docs/News.txt =================================================================== --- trunk/SQLObject/docs/News.txt 2004-12-10 16:52:05 UTC (rev 478) +++ trunk/SQLObject/docs/News.txt 2004-12-10 16:54:44 UTC (rev 479) @@ -7,28 +7,14 @@ .. _start: -SQLObject 0.6.2 -=============== +SVN trunk +========= Interface Changes ----------------- * The long broken and unused ``DBMConnection`` has been removed. -* Removed DBMConnection. - -Features --------- - -* New ``UnicodeCol()`` that converts to and from Unicode - in the database. - -SQLObject 0.6.1 -=============== - -Interface Changes ------------------ - * Added a connection parameter to all class methods (patch 974755) * Connection objects have a ``.module`` attribute, which points to @@ -38,6 +24,11 @@ Features -------- +* New ``UnicodeCol()`` that converts to and from Unicode + in the database. See docs_. + +.. _docs: SQLObject.html#subclasses-of-col + * Added indexing (from Jeremy Fitzhardinge). See `the documentation`__ for more. |
|
From: <subversion@co...> - 2004-12-10 14:01:04
|
Author: phd
Date: 2004-12-10 14:01:00 +0000 (Fri, 10 Dec 2004)
New Revision: 477
Modified:
home/phd/SQLObject/inheritance/sqlobject/col.py
Log:
Merged patch from revision 475:476: fixed a bug in UnicodeStringValidator: test if the value is None.
Modified: home/phd/SQLObject/inheritance/sqlobject/col.py
===================================================================
--- home/phd/SQLObject/inheritance/sqlobject/col.py 2004-12-10 13:59:05 UTC (rev 476)
+++ home/phd/SQLObject/inheritance/sqlobject/col.py 2004-12-10 14:01:00 UTC (rev 477)
@@ -11,8 +11,8 @@
NoDefault = sqlbuilder.NoDefault
True, False = 1==1, 0==1
-
+
########################################
## Columns
########################################
@@ -208,7 +208,7 @@
def _firebirdType(self):
return self._sqlType()
-
+
def _maxdbType(self):
return self._sqlType()
@@ -328,7 +328,7 @@
return 'BLOB SUB_TYPE TEXT'
else:
return self._sqlType()
-
+
def _maxdbType(self):
if not self.length:
return 'LONG ASCII'
@@ -344,9 +344,13 @@
self.db_encoding = db_encoding
def fromPython(self, value, state):
+ if value is None:
+ return None
return value.encode(self.db_encoding)
def toPython(self, value, state):
+ if value is None:
+ return None
return unicode(value, self.db_encoding)
class SOUnicodeCol(SOStringCol):
@@ -407,7 +411,7 @@
def _firebirdType(self):
return 'INT'
-
+
def _maxdbType(self):
return "BOOLEAN"
@@ -452,7 +456,7 @@
def _firebirdType(self):
return 'INT'
-
+
def _maxdbType(self):
return 'INT'
@@ -510,7 +514,7 @@
'idName':idName})
sql = ' '.join([sql, reference])
return sql
-
+
def maxdbCreateSQL(self):
from main import findClass
other = findClass(self.foreignKey)
@@ -562,7 +566,7 @@
checkConstraint = "CHECK (%s in (%s))" % (self.dbName, enumValues)
#NB. Return a tuple, not a string here
return "VARCHAR(%i)" % (length), checkConstraint
-
+
def _maxdbType(self):
raise "Enum type is not supported"
@@ -588,7 +592,7 @@
def _firebirdType(self):
return 'TIMESTAMP'
-
+
def _maxdbType(self):
return 'TIMESTAMP'
@@ -611,7 +615,7 @@
def _firebirdType(self):
return 'DATE'
-
+
def _maxdbType(self):
return 'DATE'
|
|
From: <subversion@co...> - 2004-12-10 13:59:09
|
Author: phd
Date: 2004-12-10 13:59:05 +0000 (Fri, 10 Dec 2004)
New Revision: 476
Modified:
trunk/SQLObject/sqlobject/col.py
Log:
Fixed a bug in UnicodeStringValidator: test if the value is None.
Modified: trunk/SQLObject/sqlobject/col.py
===================================================================
--- trunk/SQLObject/sqlobject/col.py 2004-12-10 00:20:52 UTC (rev 475)
+++ trunk/SQLObject/sqlobject/col.py 2004-12-10 13:59:05 UTC (rev 476)
@@ -11,8 +11,8 @@
NoDefault = sqlbuilder.NoDefault
True, False = 1==1, 0==1
-
+
########################################
## Columns
########################################
@@ -208,7 +208,7 @@
def _firebirdType(self):
return self._sqlType()
-
+
def _maxdbType(self):
return self._sqlType()
@@ -328,7 +328,7 @@
return 'BLOB SUB_TYPE TEXT'
else:
return self._sqlType()
-
+
def _maxdbType(self):
if not self.length:
return 'LONG ASCII'
@@ -344,9 +344,13 @@
self.db_encoding = db_encoding
def fromPython(self, value, state):
+ if value is None:
+ return None
return value.encode(self.db_encoding)
def toPython(self, value, state):
+ if value is None:
+ return None
return unicode(value, self.db_encoding)
class SOUnicodeCol(SOStringCol):
@@ -407,7 +411,7 @@
def _firebirdType(self):
return 'INT'
-
+
def _maxdbType(self):
return "BOOLEAN"
@@ -452,7 +456,7 @@
def _firebirdType(self):
return 'INT'
-
+
def _maxdbType(self):
return 'INT'
@@ -510,7 +514,7 @@
'idName':idName})
sql = ' '.join([sql, reference])
return sql
-
+
def maxdbCreateSQL(self):
from main import findClass
other = findClass(self.foreignKey)
@@ -562,7 +566,7 @@
checkConstraint = "CHECK (%s in (%s))" % (self.dbName, enumValues)
#NB. Return a tuple, not a string here
return "VARCHAR(%i)" % (length), checkConstraint
-
+
def _maxdbType(self):
raise "Enum type is not supported"
@@ -588,7 +592,7 @@
def _firebirdType(self):
return 'TIMESTAMP'
-
+
def _maxdbType(self):
return 'TIMESTAMP'
@@ -611,7 +615,7 @@
def _firebirdType(self):
return 'DATE'
-
+
def _maxdbType(self):
return 'DATE'
|
|
From: <subversion@co...> - 2004-12-07 17:58:10
|
Author: phd Date: 2004-12-07 17:58:06 +0000 (Tue, 07 Dec 2004) New Revision: 464 Added: home/phd/SQLObject/inheritance/sqlobject/util/ Removed: home/phd/SQLObject/inheritance/sqlobject/dbm/ Modified: home/phd/SQLObject/inheritance/README.txt home/phd/SQLObject/inheritance/docs/Authors.txt home/phd/SQLObject/inheritance/docs/News.txt home/phd/SQLObject/inheritance/docs/SQLObject.txt home/phd/SQLObject/inheritance/examples/config.py home/phd/SQLObject/inheritance/setup.py home/phd/SQLObject/inheritance/sqlobject/__init__.py home/phd/SQLObject/inheritance/sqlobject/col.py home/phd/SQLObject/inheritance/tests/SQLObjectTest.py home/phd/SQLObject/inheritance/tests/test_sqlobject.py Log: Merged patches from revisions 455:463: removed deadly broken dbm connection; updated docs. Modified: home/phd/SQLObject/inheritance/README.txt =================================================================== --- home/phd/SQLObject/inheritance/README.txt 2004-12-07 17:53:51 UTC (rev 463) +++ home/phd/SQLObject/inheritance/README.txt 2004-12-07 17:58:06 UTC (rev 464) @@ -10,9 +10,9 @@ mapper, i.e., a library that will wrap your database tables in Python classes, and your rows in Python instances. -It absolutely requires Python 2.2 or higher. It currently supports -MySQL through the `MySQLdb` package, PostgreSQL through the -`psycopg` package, SQLite, Firebird, and a DBM-based backend. +It absolutely requires Python 2.2 or higher. It currently supports +MySQL through the `MySQLdb` package, PostgreSQL through the +`psycopg` package, SQLite, Firebird, MaxDB (SAP DB) and Sybase. For more information please see the documentation in ``docs/SQLObject.html`` Modified: home/phd/SQLObject/inheritance/docs/Authors.txt =================================================================== --- home/phd/SQLObject/inheritance/docs/Authors.txt 2004-12-07 17:53:51 UTC (rev 463) +++ home/phd/SQLObject/inheritance/docs/Authors.txt 2004-12-07 17:58:06 UTC (rev 464) @@ -16,4 +16,4 @@ * Daniel Savard, Xsoli Inc <sqlobject at xsoli.com> * alexander smishlajev <alex at ank-sia.com> * Yaroslav Samchuk <yarcat at ank-sia.com> -* Oleg Broytmann <phd@...> +* Oleg Broytmann <phd at phd.pp.ru> Modified: home/phd/SQLObject/inheritance/docs/News.txt =================================================================== --- home/phd/SQLObject/inheritance/docs/News.txt 2004-12-07 17:53:51 UTC (rev 463) +++ home/phd/SQLObject/inheritance/docs/News.txt 2004-12-07 17:58:06 UTC (rev 464) @@ -7,6 +7,22 @@ .. _start: +SQLObject 0.6.2 +=============== + +Interface Changes +----------------- + +* The long broken and unused ``DBMConnection`` has been removed. + +* Removed DBMConnection. + +Features +-------- + +* New ``UnicodeCol()`` that converts to and from Unicode + in the database. + SQLObject 0.6.1 =============== Modified: home/phd/SQLObject/inheritance/docs/SQLObject.txt =================================================================== --- home/phd/SQLObject/inheritance/docs/SQLObject.txt 2004-12-07 17:53:51 UTC (rev 463) +++ home/phd/SQLObject/inheritance/docs/SQLObject.txt 2004-12-07 17:58:06 UTC (rev 464) @@ -43,8 +43,7 @@ ============ Currently SQLObject supports MySQL_, PostgreSQL_ (via ``psycopg``), -SQLite_, Firebird_, and a DBM-based store. The DBM backend is -experimental. +SQLite_, Firebird_, Sybase_, and `MAX DB`_ (also known as SAP DB). .. _PostgreSQL: http://postgresql.org .. _SQLite: http://sqlite.org @@ -97,9 +96,7 @@ SQLObject provides a strong database abstraction, allowing cross-database compatibility (so long as you don't sidestep -SQLObject). This compatibility extends not just to several databases, -but also to currently one non-SQL, non-relational backend (based on -the `dbm` module). +SQLObject). SQLObject has joins, one-to-many, and many-to-many, something which many ORMs do not have. The join system is also intended to be @@ -615,26 +612,34 @@ Will create a ``BOOLEAN`` column in Postgres, or ``INT`` in other databses. It will also convert values to ``"t"/"f"`` or ``0/1`` according to the database backend. + `CurrencyCol`: Equivalent to ``DecimalCol(size=10, precision=2)``. + `DateTimeCol`: A date and time (usually returned as an mxDateTime object). + `DecimalCol`: Base-10, precise number. Uses the keyword arguments `size` for number of digits stored, and `precision` for the number of digits after the decimal point. + `EnumCol`: One of several string values -- give the possible strings as a list, with the `enumValues` keyword argument. MySQL has a native ``ENUM`` type, but will work with other databases too (storage just won't be as efficient). + `FloatCol`: Floats. + `ForeignKey`: A key to another table/class. Use like ``user = ForeignKey('User')``. + `IntCol`: Integers. + `StringCol`: A string (character) column. Extra keywords: @@ -646,6 +651,15 @@ ``CHAR`` and ``VARCHAR``, default True, i.e., use ``VARCHAR``. +`UnicodeCol`: + A subclass of `StringCol`. Also accepts a dbEncoding keyword + argument, which defaults to ``"UTF-8"``. Values coming in and + out from the database will be encoded and decoded. **Note**: + parameters in queries will not be automatically encoded, so if + you do a query matching a UnicodeCol column you must apply the + encoding yourself. + + SQLObject Class: Specifying Your Class -------------------------------------- @@ -792,8 +806,7 @@ All the connections support creating and droping tables based on the class definition. First you have to prepare your class definition, -which means including type information in your columns (though -DBMConnection_ do not require or use type information). +which means including type information in your columns. Columns Types ~~~~~~~~~~~~~ @@ -942,7 +955,7 @@ While SQLObject tries not to make too many requirements on your schema, some assumptions are made. Some of these may be relaxed in -the future. (Of course, none of this applies to DBMConnection) +the future. All tables that you want to turn into a class need to have an integer primary key. That key should be defined like: @@ -1032,7 +1045,7 @@ The `DBConnection` module currently has four external classes, `MySQLConnection`, `PostgresConnection`, `SQLiteConnection`, -and `DBMConnection`. +`SybaseConnection`, and `MaxdbConnection`. You can pass the keyword argument `debug` to any connector. If set to true, then any SQL sent to the database will also be printed to the @@ -1097,46 +1110,46 @@ .. _this page: http://www.volny.cz/iprenosil/interbase/ip_ib_indexcalculator.htm -DBMConnection -------------- +SybaseConnection +---------------- -`DBMConnection` takes a single string, which is the path to a -directory in which to store the database. +`SybaseConnection` takes the arguments `host`, `db`, `user`, and +`passwd`. It also takes the extra boolean argument `locking` (default +True), which is passed through when performing a connection. You may +use a False value for `locking` if you are not using multiple threads, +for a slight performance boost. -DBMConnection uses flat hash databases to store all the data. These -databases are created by the standard `anydbm` module. This is -something of an experiment, and things like safety under concurrent -access (multithreaded or multiprocess) should not be expected. The -select interface using the magic ``q`` attribute is supported, though -other SQL is not supported. +It uses the Sybase_ module. -DBMConnection allows any kind of objects to be put in columns -- all -values are pickled, and so only normal pickling restrictions apply. +.. _Sybase: http://www.object-craft.com.au/projects/sybase/ -DBMConnection does not support `automatic class generation` or -transactions_. +MAX DB +------ +MAX DB, also known as SAP DB, is available from a partnership of SAP +and MySQL. It takes the typical arguments: `host`, `database`, +`user`, `password`. It also takes the arguments `sqlmode` (default +``"internal"``), `isolation`, and `timeout`, which are passed through +when creating the connection to the database. + +It uses the sapdb_ module. + +.. _sapdb: http://www.sapdb.org/sapdbPython.html + Exported Symbols ================ -You can use ``from SQLObject import *``, though you don't have to. It +You can use ``from sqlobject import *``, though you don't have to. It exports a minimal number of symbols. The symbols exported: -From `SQLObject.SQLObject`: +From `sqlobject.main`: * `NoDefault` * `SQLObject` * `getID` * `getObject` -From `SQLObject.DBConnection`: - -* `MySQLConnection` -* `PostgresConnection` -* `SQLiteConnection` -* `DBMConnection` - -From `SQLObject.Col`: +From `sqlobject.col`: * `Col` * `StringCol` * `IntCol` @@ -1148,17 +1161,17 @@ * `DecimalCol` * `CurrencyCol` -From `SQLObject.Join`: +From `sqlobject.joins`: * `MultipleJoin` * `RelatedJoin` -From `SQLObject.Style`: +From `sqlobject.styles`: * `Style` * `MixedCaseUnderscoreStyle` * `DefaultStyle` * `MixedCaseStyle` -From `SQLObject.SQLBuilder`: +From `sqlobject.sqlbuilder`: * `AND` * `OR` Modified: home/phd/SQLObject/inheritance/examples/config.py =================================================================== --- home/phd/SQLObject/inheritance/examples/config.py 2004-12-07 17:53:51 UTC (rev 463) +++ home/phd/SQLObject/inheritance/examples/config.py 2004-12-07 17:58:06 UTC (rev 464) @@ -13,8 +13,6 @@ conn = 'postgres://test@.../testdb'; conn = SQLiteConnection('database.db') conn = 'sqlite://path/to/database.db'; -conn = DBMConnection('database/') -conn = 'dbm://path/to/database/'; ## end snippet """ #conn = MySQLConnection(user='test', db='test') Modified: home/phd/SQLObject/inheritance/setup.py =================================================================== --- home/phd/SQLObject/inheritance/setup.py 2004-12-07 17:53:51 UTC (rev 463) +++ home/phd/SQLObject/inheritance/setup.py 2004-12-07 17:58:06 UTC (rev 464) @@ -2,7 +2,7 @@ import warnings warnings.filterwarnings("ignore", "Unknown distribution option") -subpackages = ['dbm', 'firebird', 'include', 'mysql', 'postgres', +subpackages = ['firebird', 'include', 'mysql', 'postgres', 'sqlite', 'sybase', 'maxdb'] import sys Modified: home/phd/SQLObject/inheritance/sqlobject/__init__.py =================================================================== --- home/phd/SQLObject/inheritance/sqlobject/__init__.py 2004-12-07 17:53:51 UTC (rev 463) +++ home/phd/SQLObject/inheritance/sqlobject/__init__.py 2004-12-07 17:58:06 UTC (rev 464) @@ -34,11 +34,6 @@ _warn('SQLiteConnection is deprecated; use connectionForURI("sqlite://...";) or "from sqlobject.sqlite import builder; SQLiteConnection = builder()"') return _sqlite.builder()(*args, **kw) -import dbm as _dbm -def DBMConnection(*args, **kw): - _warn('DBMConnection is deprecated; use connectionForURI("dbm://...";) or "from sqlobject.dbm import builder; DBMConnection = builder()"') - return _dbm.builder()(*args, **kw) - import sybase as _sybase def SybaseConnection(*args, **kw): _warn('SybaseConnection is deprecated; use connectionForURI("sybase://...";) or "from sqlobject.sybase import builder; SybaseConnection = builder()"') Modified: home/phd/SQLObject/inheritance/sqlobject/col.py =================================================================== --- home/phd/SQLObject/inheritance/sqlobject/col.py 2004-12-07 17:53:51 UTC (rev 463) +++ home/phd/SQLObject/inheritance/sqlobject/col.py 2004-12-07 17:58:06 UTC (rev 464) @@ -338,6 +338,28 @@ class StringCol(Col): baseClass = SOStringCol +class UnicodeStringValidator(validators.Validator): + + def __init__(self, db_encoding='UTF-8'): + self.db_encoding = db_encoding + + def fromPython(self, value, state): + return value.encode(self.db_encoding) + + def toPython(self, value, state): + return unicode(value, self.db_encoding) + +class SOUnicodeCol(SOStringCol): + + def __init__(self, **kw): + self.dbEncoding = popKey(kw, 'dbEncoding', 'UTF-8') + SOStringCol.__init__(self, **kw) + self.validator = validators.All.join( + UnicodeStringValidator(self.dbEncoding), self.validator) + +class UnicodeCol(Col): + baseClass = SOUnicodeCol + class SOIntCol(SOCol): # 3-03 @@: support precision, maybe max and min directly Copied: home/phd/SQLObject/inheritance/sqlobject/util (from rev 463, trunk/SQLObject/sqlobject/util) Modified: home/phd/SQLObject/inheritance/tests/SQLObjectTest.py =================================================================== --- home/phd/SQLObject/inheritance/tests/SQLObjectTest.py 2004-12-07 17:53:51 UTC (rev 463) +++ home/phd/SQLObject/inheritance/tests/SQLObjectTest.py 2004-12-07 17:58:06 UTC (rev 464) @@ -28,12 +28,6 @@ supportTransactions=False, supportExpressionIndex=False) -def dbmConnection(): - return 'dbm:///data';, d( - supportAuto=False, - supportRestrictedEnum=False, - supportTransactions=False) - def postgresConnection(): return 'postgres:///test';, d() Modified: home/phd/SQLObject/inheritance/tests/test_sqlobject.py =================================================================== --- home/phd/SQLObject/inheritance/tests/test_sqlobject.py 2004-12-07 17:53:51 UTC (rev 463) +++ home/phd/SQLObject/inheritance/tests/test_sqlobject.py 2004-12-07 17:58:06 UTC (rev 464) @@ -1254,6 +1254,39 @@ {0: 1, 1:1}) ######################################## +## Unicode columns +######################################## + +class Unicode1(SQLObject): + count = IntCol(alternateID=True) + col1 = UnicodeCol() + col2 = UnicodeCol(dbEncoding='latin-1') + +class UnicodeTest(SQLObjectTest): + + classes = [Unicode1] + + data = [u'\u00f0', u'test', 'ascii test'] + + def testCreate(self): + items = [] + for i, n in enumerate(self.data): + items.append(Unicode1(count=i, col1=n, col2=n)) + for n, item in zip(self.data, items): + item.col1 = item.col2 = n + for n, item in zip(self.data, items): + self.assertEqual(item.col1, item.col2, n) + conn = Unicode1._connection + rows = conn.queryAll(""" + SELECT count, col1, col2 + FROM unicode1 + ORDER BY count + """) + for count, col1, col2 in rows: + self.assertEqual(self.data[count].encode('utf-8'), col1) + self.assertEqual(self.data[count].encode('latin1'), col2) + +######################################## ## Run from command-line: ######################################## |
|
From: <subversion@co...> - 2004-12-07 17:53:54
|
Author: phd Date: 2004-12-07 17:53:51 +0000 (Tue, 07 Dec 2004) New Revision: 463 Modified: trunk/SQLObject/README.txt trunk/SQLObject/docs/News.txt trunk/SQLObject/examples/config.py trunk/SQLObject/tests/SQLObjectTest.py Log: Removed deadly broken dbm connection; updated docs. Modified: trunk/SQLObject/README.txt =================================================================== --- trunk/SQLObject/README.txt 2004-12-07 17:28:19 UTC (rev 462) +++ trunk/SQLObject/README.txt 2004-12-07 17:53:51 UTC (rev 463) @@ -10,9 +10,9 @@ mapper, i.e., a library that will wrap your database tables in Python classes, and your rows in Python instances. -It absolutely requires Python 2.2 or higher. It currently supports -MySQL through the `MySQLdb` package, PostgreSQL through the -`psycopg` package, SQLite, Firebird, and a DBM-based backend. +It absolutely requires Python 2.2 or higher. It currently supports +MySQL through the `MySQLdb` package, PostgreSQL through the +`psycopg` package, SQLite, Firebird, MaxDB (SAP DB) and Sybase. For more information please see the documentation in ``docs/SQLObject.html`` Modified: trunk/SQLObject/docs/News.txt =================================================================== --- trunk/SQLObject/docs/News.txt 2004-12-07 17:28:19 UTC (rev 462) +++ trunk/SQLObject/docs/News.txt 2004-12-07 17:53:51 UTC (rev 463) @@ -15,6 +15,8 @@ * The long broken and unused ``DBMConnection`` has been removed. +* Removed DBMConnection. + Features -------- Modified: trunk/SQLObject/examples/config.py =================================================================== --- trunk/SQLObject/examples/config.py 2004-12-07 17:28:19 UTC (rev 462) +++ trunk/SQLObject/examples/config.py 2004-12-07 17:53:51 UTC (rev 463) @@ -13,8 +13,6 @@ conn = 'postgres://test@.../testdb'; conn = SQLiteConnection('database.db') conn = 'sqlite://path/to/database.db'; -conn = DBMConnection('database/') -conn = 'dbm://path/to/database/'; ## end snippet """ #conn = MySQLConnection(user='test', db='test') Modified: trunk/SQLObject/tests/SQLObjectTest.py =================================================================== --- trunk/SQLObject/tests/SQLObjectTest.py 2004-12-07 17:28:19 UTC (rev 462) +++ trunk/SQLObject/tests/SQLObjectTest.py 2004-12-07 17:53:51 UTC (rev 463) @@ -28,12 +28,6 @@ supportTransactions=False, supportExpressionIndex=False) -def dbmConnection(): - return 'dbm:///data';, d( - supportAuto=False, - supportRestrictedEnum=False, - supportTransactions=False) - def postgresConnection(): return 'postgres:///test';, d() |
|
From: <subversion@co...> - 2004-12-07 17:28:23
|
Author: ianb
Date: 2004-12-07 17:28:19 +0000 (Tue, 07 Dec 2004)
New Revision: 462
Modified:
trunk/SQLObject/docs/News.txt
trunk/SQLObject/docs/SQLObject.txt
trunk/SQLObject/sqlobject/col.py
trunk/SQLObject/tests/test_sqlobject.py
Log:
Added a UnicodeCol
Modified: trunk/SQLObject/docs/News.txt
===================================================================
--- trunk/SQLObject/docs/News.txt 2004-12-07 17:27:40 UTC (rev 461)
+++ trunk/SQLObject/docs/News.txt 2004-12-07 17:28:19 UTC (rev 462)
@@ -7,6 +7,20 @@
.. _start:
+SQLObject 0.6.2
+===============
+
+Interface Changes
+-----------------
+
+* The long broken and unused ``DBMConnection`` has been removed.
+
+Features
+--------
+
+* New ``UnicodeCol()`` that converts to and from Unicode
+ in the database.
+
SQLObject 0.6.1
===============
Modified: trunk/SQLObject/docs/SQLObject.txt
===================================================================
--- trunk/SQLObject/docs/SQLObject.txt 2004-12-07 17:27:40 UTC (rev 461)
+++ trunk/SQLObject/docs/SQLObject.txt 2004-12-07 17:28:19 UTC (rev 462)
@@ -612,26 +612,34 @@
Will create a ``BOOLEAN`` column in Postgres, or ``INT`` in other
databses. It will also convert values to ``"t"/"f"`` or ``0/1``
according to the database backend.
+
`CurrencyCol`:
Equivalent to ``DecimalCol(size=10, precision=2)``.
+
`DateTimeCol`:
A date and time (usually returned as an mxDateTime object).
+
`DecimalCol`:
Base-10, precise number. Uses the keyword arguments `size` for
number of digits stored, and `precision` for the number of digits
after the decimal point.
+
`EnumCol`:
One of several string values -- give the possible strings as a
list, with the `enumValues` keyword argument. MySQL has a native
``ENUM`` type, but will work with other databases too (storage
just won't be as efficient).
+
`FloatCol`:
Floats.
+
`ForeignKey`:
A key to another table/class. Use like ``user =
ForeignKey('User')``.
+
`IntCol`:
Integers.
+
`StringCol`:
A string (character) column. Extra keywords:
@@ -643,6 +651,15 @@
``CHAR`` and ``VARCHAR``, default True, i.e., use
``VARCHAR``.
+`UnicodeCol`:
+ A subclass of `StringCol`. Also accepts a dbEncoding keyword
+ argument, which defaults to ``"UTF-8"``. Values coming in and
+ out from the database will be encoded and decoded. **Note**:
+ parameters in queries will not be automatically encoded, so if
+ you do a query matching a UnicodeCol column you must apply the
+ encoding yourself.
+
+
SQLObject Class: Specifying Your Class
--------------------------------------
Modified: trunk/SQLObject/sqlobject/col.py
===================================================================
--- trunk/SQLObject/sqlobject/col.py 2004-12-07 17:27:40 UTC (rev 461)
+++ trunk/SQLObject/sqlobject/col.py 2004-12-07 17:28:19 UTC (rev 462)
@@ -338,6 +338,28 @@
class StringCol(Col):
baseClass = SOStringCol
+class UnicodeStringValidator(validators.Validator):
+
+ def __init__(self, db_encoding='UTF-8'):
+ self.db_encoding = db_encoding
+
+ def fromPython(self, value, state):
+ return value.encode(self.db_encoding)
+
+ def toPython(self, value, state):
+ return unicode(value, self.db_encoding)
+
+class SOUnicodeCol(SOStringCol):
+
+ def __init__(self, **kw):
+ self.dbEncoding = popKey(kw, 'dbEncoding', 'UTF-8')
+ SOStringCol.__init__(self, **kw)
+ self.validator = validators.All.join(
+ UnicodeStringValidator(self.dbEncoding), self.validator)
+
+class UnicodeCol(Col):
+ baseClass = SOUnicodeCol
+
class SOIntCol(SOCol):
# 3-03 @@: support precision, maybe max and min directly
Modified: trunk/SQLObject/tests/test_sqlobject.py
===================================================================
--- trunk/SQLObject/tests/test_sqlobject.py 2004-12-07 17:27:40 UTC (rev 461)
+++ trunk/SQLObject/tests/test_sqlobject.py 2004-12-07 17:28:19 UTC (rev 462)
@@ -1254,6 +1254,39 @@
{0: 1, 1:1})
########################################
+## Unicode columns
+########################################
+
+class Unicode1(SQLObject):
+ count = IntCol(alternateID=True)
+ col1 = UnicodeCol()
+ col2 = UnicodeCol(dbEncoding='latin-1')
+
+class UnicodeTest(SQLObjectTest):
+
+ classes = [Unicode1]
+
+ data = [u'\u00f0', u'test', 'ascii test']
+
+ def testCreate(self):
+ items = []
+ for i, n in enumerate(self.data):
+ items.append(Unicode1(count=i, col1=n, col2=n))
+ for n, item in zip(self.data, items):
+ item.col1 = item.col2 = n
+ for n, item in zip(self.data, items):
+ self.assertEqual(item.col1, item.col2, n)
+ conn = Unicode1._connection
+ rows = conn.queryAll("""
+ SELECT count, col1, col2
+ FROM unicode1
+ ORDER BY count
+ """)
+ for count, col1, col2 in rows:
+ self.assertEqual(self.data[count].encode('utf-8'), col1)
+ self.assertEqual(self.data[count].encode('latin1'), col2)
+
+########################################
## Run from command-line:
########################################
|
|
From: <subversion@co...> - 2004-12-07 17:27:43
|
Author: ianb Date: 2004-12-07 17:27:40 +0000 (Tue, 07 Dec 2004) New Revision: 461 Modified: trunk/SQLObject/docs/Authors.txt Log: Added Oleg. Modified: trunk/SQLObject/docs/Authors.txt =================================================================== --- trunk/SQLObject/docs/Authors.txt 2004-12-07 17:00:58 UTC (rev 460) +++ trunk/SQLObject/docs/Authors.txt 2004-12-07 17:27:40 UTC (rev 461) @@ -13,3 +13,4 @@ * James Ralston <jralston at hotmail.com> * Sidnei da Silva <sidnei at awkly.org> * Brad Bollenbach <brad at bbnet.ca> +* Oleg Broytmann <phd at phd.pp.ru> |
|
From: <subversion@co...> - 2004-12-07 17:01:09
|
Author: ianb Date: 2004-12-07 17:00:58 +0000 (Tue, 07 Dec 2004) New Revision: 460 Modified: trunk/SQLObject/docs/SQLObject.txt Log: * Took out references to DBMConnection * Added references to SybaseConnection and MaxdbConnection * A few other miscellaneous changes Modified: trunk/SQLObject/docs/SQLObject.txt =================================================================== --- trunk/SQLObject/docs/SQLObject.txt 2004-12-07 17:00:15 UTC (rev 459) +++ trunk/SQLObject/docs/SQLObject.txt 2004-12-07 17:00:58 UTC (rev 460) @@ -43,8 +43,7 @@ ============ Currently SQLObject supports MySQL_, PostgreSQL_ (via ``psycopg``), -SQLite_, Firebird_, and a DBM-based store. The DBM backend is -experimental. +SQLite_, Firebird_, Sybase_, and `MAX DB`_ (also known as SAP DB). .. _PostgreSQL: http://postgresql.org .. _SQLite: http://sqlite.org @@ -97,9 +96,7 @@ SQLObject provides a strong database abstraction, allowing cross-database compatibility (so long as you don't sidestep -SQLObject). This compatibility extends not just to several databases, -but also to currently one non-SQL, non-relational backend (based on -the `dbm` module). +SQLObject). SQLObject has joins, one-to-many, and many-to-many, something which many ORMs do not have. The join system is also intended to be @@ -792,8 +789,7 @@ All the connections support creating and droping tables based on the class definition. First you have to prepare your class definition, -which means including type information in your columns (though -DBMConnection_ do not require or use type information). +which means including type information in your columns. Columns Types ~~~~~~~~~~~~~ @@ -942,7 +938,7 @@ While SQLObject tries not to make too many requirements on your schema, some assumptions are made. Some of these may be relaxed in -the future. (Of course, none of this applies to DBMConnection) +the future. All tables that you want to turn into a class need to have an integer primary key. That key should be defined like: @@ -1032,7 +1028,7 @@ The `DBConnection` module currently has four external classes, `MySQLConnection`, `PostgresConnection`, `SQLiteConnection`, -and `DBMConnection`. +`SybaseConnection`, and `MaxdbConnection`. You can pass the keyword argument `debug` to any connector. If set to true, then any SQL sent to the database will also be printed to the @@ -1097,46 +1093,46 @@ .. _this page: http://www.volny.cz/iprenosil/interbase/ip_ib_indexcalculator.htm -DBMConnection -------------- +SybaseConnection +---------------- -`DBMConnection` takes a single string, which is the path to a -directory in which to store the database. +`SybaseConnection` takes the arguments `host`, `db`, `user`, and +`passwd`. It also takes the extra boolean argument `locking` (default +True), which is passed through when performing a connection. You may +use a False value for `locking` if you are not using multiple threads, +for a slight performance boost. -DBMConnection uses flat hash databases to store all the data. These -databases are created by the standard `anydbm` module. This is -something of an experiment, and things like safety under concurrent -access (multithreaded or multiprocess) should not be expected. The -select interface using the magic ``q`` attribute is supported, though -other SQL is not supported. +It uses the Sybase_ module. -DBMConnection allows any kind of objects to be put in columns -- all -values are pickled, and so only normal pickling restrictions apply. +.. _Sybase: http://www.object-craft.com.au/projects/sybase/ -DBMConnection does not support `automatic class generation` or -transactions_. +MAX DB +------ +MAX DB, also known as SAP DB, is available from a partnership of SAP +and MySQL. It takes the typical arguments: `host`, `database`, +`user`, `password`. It also takes the arguments `sqlmode` (default +``"internal"``), `isolation`, and `timeout`, which are passed through +when creating the connection to the database. + +It uses the sapdb_ module. + +.. _sapdb: http://www.sapdb.org/sapdbPython.html + Exported Symbols ================ -You can use ``from SQLObject import *``, though you don't have to. It +You can use ``from sqlobject import *``, though you don't have to. It exports a minimal number of symbols. The symbols exported: -From `SQLObject.SQLObject`: +From `sqlobject.main`: * `NoDefault` * `SQLObject` * `getID` * `getObject` -From `SQLObject.DBConnection`: - -* `MySQLConnection` -* `PostgresConnection` -* `SQLiteConnection` -* `DBMConnection` - -From `SQLObject.Col`: +From `sqlobject.col`: * `Col` * `StringCol` * `IntCol` @@ -1148,17 +1144,17 @@ * `DecimalCol` * `CurrencyCol` -From `SQLObject.Join`: +From `sqlobject.joins`: * `MultipleJoin` * `RelatedJoin` -From `SQLObject.Style`: +From `sqlobject.styles`: * `Style` * `MixedCaseUnderscoreStyle` * `DefaultStyle` * `MixedCaseStyle` -From `SQLObject.SQLBuilder`: +From `sqlobject.sqlbuilder`: * `AND` * `OR` |
|
From: <subversion@co...> - 2004-12-07 17:00:17
|
Author: ianb
Date: 2004-12-07 17:00:15 +0000 (Tue, 07 Dec 2004)
New Revision: 459
Modified:
trunk/SQLObject/setup.py
Log:
Removed dbm package from setup.py
Modified: trunk/SQLObject/setup.py
===================================================================
--- trunk/SQLObject/setup.py 2004-12-07 16:36:05 UTC (rev 458)
+++ trunk/SQLObject/setup.py 2004-12-07 17:00:15 UTC (rev 459)
@@ -2,7 +2,7 @@
import warnings
warnings.filterwarnings("ignore", "Unknown distribution option")
-subpackages = ['dbm', 'firebird', 'include', 'mysql', 'postgres',
+subpackages = ['firebird', 'include', 'mysql', 'postgres',
'sqlite', 'sybase', 'maxdb']
import sys
|
|
From: <subversion@co...> - 2004-12-07 16:36:07
|
Author: ianb
Date: 2004-12-07 16:36:05 +0000 (Tue, 07 Dec 2004)
New Revision: 458
Modified:
trunk/SQLObject/sqlobject/styles.py
Log:
Undid mistaken commit. Stupid editor keeps saving my files when I
intend to abort...
Modified: trunk/SQLObject/sqlobject/styles.py
===================================================================
--- trunk/SQLObject/sqlobject/styles.py 2004-12-07 16:30:00 UTC (rev 457)
+++ trunk/SQLObject/sqlobject/styles.py 2004-12-07 16:36:05 UTC (rev 458)
@@ -87,10 +87,6 @@
DefaultStyle = MixedCaseUnderscoreStyle
-class UnderscoreStyle(MixedCaseUnderscoreStyle):
- def instanceAttrToIDAttr(self, attr):
- return attr + '_id'
-
class MixedCaseStyle(Style):
"""
|
|
From: <subversion@co...> - 2004-12-07 16:30:09
|
Author: ianb
Date: 2004-12-07 16:30:00 +0000 (Tue, 07 Dec 2004)
New Revision: 457
Added:
trunk/SQLObject/sqlobject/util/
Modified:
trunk/SQLObject/sqlobject/__init__.py
trunk/SQLObject/sqlobject/styles.py
Log:
R
Modified: trunk/SQLObject/sqlobject/__init__.py
===================================================================
--- trunk/SQLObject/sqlobject/__init__.py 2004-12-07 16:29:14 UTC (rev 456)
+++ trunk/SQLObject/sqlobject/__init__.py 2004-12-07 16:30:00 UTC (rev 457)
@@ -34,11 +34,6 @@
_warn('SQLiteConnection is deprecated; use connectionForURI("sqlite://...";) or "from sqlobject.sqlite import builder; SQLiteConnection = builder()"')
return _sqlite.builder()(*args, **kw)
-import dbm as _dbm
-def DBMConnection(*args, **kw):
- _warn('DBMConnection is deprecated; use connectionForURI("dbm://...";) or "from sqlobject.dbm import builder; DBMConnection = builder()"')
- return _dbm.builder()(*args, **kw)
-
import sybase as _sybase
def SybaseConnection(*args, **kw):
_warn('SybaseConnection is deprecated; use connectionForURI("sybase://...";) or "from sqlobject.sybase import builder; SybaseConnection = builder()"')
Modified: trunk/SQLObject/sqlobject/styles.py
===================================================================
--- trunk/SQLObject/sqlobject/styles.py 2004-12-07 16:29:14 UTC (rev 456)
+++ trunk/SQLObject/sqlobject/styles.py 2004-12-07 16:30:00 UTC (rev 457)
@@ -87,6 +87,10 @@
DefaultStyle = MixedCaseUnderscoreStyle
+class UnderscoreStyle(MixedCaseUnderscoreStyle):
+ def instanceAttrToIDAttr(self, attr):
+ return attr + '_id'
+
class MixedCaseStyle(Style):
"""
|
|
From: <subversion@co...> - 2004-12-07 16:29:23
|
Author: ianb Date: 2004-12-07 16:29:14 +0000 (Tue, 07 Dec 2004) New Revision: 456 Removed: trunk/SQLObject/sqlobject/dbm/ Log: Removed |
|
From: <subversion@co...> - 2004-12-06 22:53:43
|
Author: phd
Date: 2004-12-06 22:53:38 +0000 (Mon, 06 Dec 2004)
New Revision: 452
Modified:
home/phd/SQLObject/postgres-7.2/sqlobject/postgres/pgconnection.py
Log:
Merged patch from revisions 449:450: fixed tableExists(): use sqlrepr() to quote tableName; removed a comment.
Modified: home/phd/SQLObject/postgres-7.2/sqlobject/postgres/pgconnection.py
===================================================================
--- home/phd/SQLObject/postgres-7.2/sqlobject/postgres/pgconnection.py 2004-12-06 22:50:45 UTC (rev 451)
+++ home/phd/SQLObject/postgres-7.2/sqlobject/postgres/pgconnection.py 2004-12-06 22:53:38 UTC (rev 452)
@@ -111,9 +111,8 @@
return 'INT NOT NULL'
def tableExists(self, tableName):
- # @@: obviously broken
- result = self.queryOne("SELECT COUNT(relname) FROM pg_class WHERE relname = '%s'"
- % tableName)
+ result = self.queryOne("SELECT COUNT(relname) FROM pg_class WHERE relname = %s"
+ % self.sqlrepr(tableName))
return result[0]
def addColumn(self, tableName, column):
|
|
From: <subversion@co...> - 2004-12-06 22:50:48
|
Author: phd
Date: 2004-12-06 22:50:45 +0000 (Mon, 06 Dec 2004)
New Revision: 451
Modified:
home/phd/SQLObject/inheritance/sqlobject/postgres/pgconnection.py
Log:
Merged patch from revisions 449:450: fixed tableExists(): use sqlrepr() to quote tableName; removed a comment.
Modified: home/phd/SQLObject/inheritance/sqlobject/postgres/pgconnection.py
===================================================================
--- home/phd/SQLObject/inheritance/sqlobject/postgres/pgconnection.py 2004-12-06 22:46:33 UTC (rev 450)
+++ home/phd/SQLObject/inheritance/sqlobject/postgres/pgconnection.py 2004-12-06 22:50:45 UTC (rev 451)
@@ -105,9 +105,8 @@
return 'INT NOT NULL'
def tableExists(self, tableName):
- # @@: obviously broken
- result = self.queryOne("SELECT COUNT(relname) FROM pg_class WHERE relname = '%s'"
- % tableName)
+ result = self.queryOne("SELECT COUNT(relname) FROM pg_class WHERE relname = %s"
+ % self.sqlrepr(tableName))
return result[0]
def addColumn(self, tableName, column):
|
|
From: <subversion@co...> - 2004-12-06 22:46:35
|
Author: phd
Date: 2004-12-06 22:46:33 +0000 (Mon, 06 Dec 2004)
New Revision: 450
Modified:
trunk/SQLObject/sqlobject/postgres/pgconnection.py
Log:
Fixed tableExists(): use sqlrepr() to quote tableName; removed a comment.
Modified: trunk/SQLObject/sqlobject/postgres/pgconnection.py
===================================================================
--- trunk/SQLObject/sqlobject/postgres/pgconnection.py 2004-12-06 13:51:10 UTC (rev 449)
+++ trunk/SQLObject/sqlobject/postgres/pgconnection.py 2004-12-06 22:46:33 UTC (rev 450)
@@ -105,9 +105,8 @@
return 'INT NOT NULL'
def tableExists(self, tableName):
- # @@: obviously broken
- result = self.queryOne("SELECT COUNT(relname) FROM pg_class WHERE relname = '%s'"
- % tableName)
+ result = self.queryOne("SELECT COUNT(relname) FROM pg_class WHERE relname = %s"
+ % self.sqlrepr(tableName))
return result[0]
def addColumn(self, tableName, column):
|
|
From: <subversion@co...> - 2004-12-06 13:51:13
|
Author: phd
Date: 2004-12-06 13:51:10 +0000 (Mon, 06 Dec 2004)
New Revision: 449
Modified:
home/phd/SQLObject/inheritance/tests/test_sqlobject.py
Log:
Merged patch from revisions 447: removed .set(driver='james') -
we've decided to not allow non-columns keywords in .set().
Modified: home/phd/SQLObject/inheritance/tests/test_sqlobject.py
===================================================================
--- home/phd/SQLObject/inheritance/tests/test_sqlobject.py 2004-12-06 13:50:48 UTC (rev 448)
+++ home/phd/SQLObject/inheritance/tests/test_sqlobject.py 2004-12-06 13:51:10 UTC (rev 449)
@@ -1156,12 +1156,10 @@
# Also, check that passing a name that is not
# a valid column doesn't break, but instead
# just does a plain setattr.
- obj.set(name='first', other='who',
- third='yes', driver='james')
+ obj.set(name='first', other='who', third='yes')
self.assertEqual(obj.name, 'first')
self.assertEqual(obj.other, 'who')
self.assertEqual(obj.third, 'yes')
- self.assertEqual(obj.driver, 'james')
assert obj.dirty
assert not self.conn.didUpdate
obj.syncUpdate()
|
|
From: <subversion@co...> - 2004-12-06 13:50:51
|
Author: phd
Date: 2004-12-06 13:50:48 +0000 (Mon, 06 Dec 2004)
New Revision: 448
Modified:
home/phd/SQLObject/postgres-7.2/tests/test_sqlobject.py
Log:
Merged patch from revisions 447: removed .set(driver='james') -
we've decided to not allow non-columns keywords in .set().
Modified: home/phd/SQLObject/postgres-7.2/tests/test_sqlobject.py
===================================================================
--- home/phd/SQLObject/postgres-7.2/tests/test_sqlobject.py 2004-12-06 13:46:24 UTC (rev 447)
+++ home/phd/SQLObject/postgres-7.2/tests/test_sqlobject.py 2004-12-06 13:50:48 UTC (rev 448)
@@ -1156,12 +1156,10 @@
# Also, check that passing a name that is not
# a valid column doesn't break, but instead
# just does a plain setattr.
- obj.set(name='first', other='who',
- third='yes', driver='james')
+ obj.set(name='first', other='who', third='yes')
self.assertEqual(obj.name, 'first')
self.assertEqual(obj.other, 'who')
self.assertEqual(obj.third, 'yes')
- self.assertEqual(obj.driver, 'james')
assert obj.dirty
assert not self.conn.didUpdate
obj.syncUpdate()
|
|
From: <subversion@co...> - 2004-12-06 13:46:27
|
Author: phd
Date: 2004-12-06 13:46:24 +0000 (Mon, 06 Dec 2004)
New Revision: 447
Modified:
trunk/SQLObject/tests/test_sqlobject.py
Log:
Removed .set(driver='james') - we've decided to not allow non-columns keywords in .set().
Modified: trunk/SQLObject/tests/test_sqlobject.py
===================================================================
--- trunk/SQLObject/tests/test_sqlobject.py 2004-12-06 13:31:56 UTC (rev 446)
+++ trunk/SQLObject/tests/test_sqlobject.py 2004-12-06 13:46:24 UTC (rev 447)
@@ -1156,12 +1156,10 @@
# Also, check that passing a name that is not
# a valid column doesn't break, but instead
# just does a plain setattr.
- obj.set(name='first', other='who',
- third='yes', driver='james')
+ obj.set(name='first', other='who', third='yes')
self.assertEqual(obj.name, 'first')
self.assertEqual(obj.other, 'who')
self.assertEqual(obj.third, 'yes')
- self.assertEqual(obj.driver, 'james')
assert obj.dirty
assert not self.conn.didUpdate
obj.syncUpdate()
|