Author: phd
Date: 2006-01-23 06:32:08 -0700 (Mon, 23 Jan 2006)
New Revision: 1531
Modified:
home/phd/SQLObject/paramstyles/sqlobject/sqlite/sqliteconnection.py
home/phd/SQLObject/paramstyles/sqlobject/tests/dbtest.py
home/phd/SQLObject/paramstyles/sqlobject/tests/test_auto.py
home/phd/SQLObject/paramstyles/sqlobject/tests/test_auto_old.py
Log:
Merged patches from the revisions 1528:1530 from the trunk: implemented addColumn() for SQLite.
Modified: home/phd/SQLObject/paramstyles/sqlobject/sqlite/sqliteconnection.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/sqlite/sqliteconnection.py 2006-01-23 12:56:29 UTC (rev 1530)
+++ home/phd/SQLObject/paramstyles/sqlobject/sqlite/sqliteconnection.py 2006-01-23 13:32:08 UTC (rev 1531)
@@ -202,5 +202,13 @@
def createIndexSQL(self, soClass, index):
return index.sqliteCreateIndexSQL(soClass)
+ def addColumn(self, tableName, column):
+ self.query('ALTER TABLE %s ADD COLUMN %s' %
+ (tableName,
+ column.sqliteCreateSQL()))
+
+ def delColumn(self, tableName, column):
+ pass # Oops! There is no DROP COLUMN in SQLite
+
def stop_pysqlite2_converting_strings_to_unicode(s):
return s
Modified: home/phd/SQLObject/paramstyles/sqlobject/tests/dbtest.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/tests/dbtest.py 2006-01-23 12:56:29 UTC (rev 1530)
+++ home/phd/SQLObject/paramstyles/sqlobject/tests/dbtest.py 2006-01-23 13:32:08 UTC (rev 1531)
@@ -35,7 +35,6 @@
'+restrictedEnum': 'postgres',
'-transactions': 'mysql',
'-dropTableCascade': 'sybase mssql',
- '-dynamicColumn': 'sqlite sybase',
'-fromDatabase': 'sqlite sybase firebird',
'-expressionIndex': 'mysql sqlite firebird mssql',
'-blobData': 'mssql',
Modified: home/phd/SQLObject/paramstyles/sqlobject/tests/test_auto.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/tests/test_auto.py 2006-01-23 12:56:29 UTC (rev 1530)
+++ home/phd/SQLObject/paramstyles/sqlobject/tests/test_auto.py 2006-01-23 13:32:08 UTC (rev 1531)
@@ -39,8 +39,6 @@
list(Person.select('all', orderBy=Person.sqlmeta.defaultOrder)))
def test_dynamicColumn(self):
- if not supports('dynamicColumn'):
- return
nickname = StringCol('nickname', length=10)
Person.sqlmeta.addColumn(nickname, changeSchema=True)
n = Person(name='robert', nickname='bob')
@@ -49,8 +47,6 @@
Person.sqlmeta.delColumn(nickname, changeSchema=True)
def test_dynamicJoin(self):
- if not supports('dynamicColumn'):
- return
col = KeyCol('personID', foreignKey='Person')
Phone.sqlmeta.addColumn(col, changeSchema=True)
join = MultipleJoin('Phone')
Modified: home/phd/SQLObject/paramstyles/sqlobject/tests/test_auto_old.py
===================================================================
--- home/phd/SQLObject/paramstyles/sqlobject/tests/test_auto_old.py 2006-01-23 12:56:29 UTC (rev 1530)
+++ home/phd/SQLObject/paramstyles/sqlobject/tests/test_auto_old.py 2006-01-23 13:32:08 UTC (rev 1531)
@@ -41,8 +41,6 @@
list(OldPerson.select('all', orderBy=OldPerson.sqlmeta.defaultOrder)))
def test_dynamicColumn(self):
- if not supports('dynamicColumn'):
- return
nickname = StringCol('nickname', length=10)
OldPerson.addColumn(nickname, changeSchema=True)
n = OldPerson(name='robert', nickname='bob')
@@ -51,8 +49,6 @@
OldPerson.delColumn(nickname, changeSchema=True)
def test_dynamicJoin(self):
- if not supports('dynamicColumn'):
- return
col = KeyCol('oldPersonID', foreignKey='OldPerson')
OldPhone.addColumn(col, changeSchema=True)
join = MultipleJoin('OldPhone')
|