|
From: <sub...@co...> - 2005-02-16 04:31:55
|
Author: ianb
Date: 2005-02-16 04:31:51 +0000 (Wed, 16 Feb 2005)
New Revision: 612
Modified:
trunk/SQLObject/sqlobject/col.py
trunk/SQLObject/sqlobject/dbconnection.py
trunk/SQLObject/sqlobject/firebird/firebirdconnection.py
trunk/SQLObject/sqlobject/index.py
trunk/SQLObject/sqlobject/inheritance/__init__.py
trunk/SQLObject/sqlobject/joins.py
trunk/SQLObject/sqlobject/main.py
trunk/SQLObject/sqlobject/maxdb/maxdbconnection.py
trunk/SQLObject/sqlobject/mysql/mysqlconnection.py
trunk/SQLObject/sqlobject/postgres/pgconnection.py
trunk/SQLObject/sqlobject/sqlbuilder.py
trunk/SQLObject/sqlobject/sqlite/sqliteconnection.py
trunk/SQLObject/sqlobject/sresults.py
trunk/SQLObject/sqlobject/styles.py
trunk/SQLObject/sqlobject/sybase/sybaseconnection.py
Log:
* Replace cls._table with cls.sqlmeta.table
* and cls._idName with cls.sqlmeta.idName
* and cls._style with cls.sqlmeta.style
* and make tests angry if old styles are used. Tests be very angry with
old and deprecated styles, Hulk will smash bad tests!
Modified: trunk/SQLObject/sqlobject/col.py
===================================================================
--- trunk/SQLObject/sqlobject/col.py 2005-02-16 04:30:22 UTC (rev 611)
+++ trunk/SQLObject/sqlobject/col.py 2005-02-16 04:31:51 UTC (rev 612)
@@ -159,7 +159,7 @@
# the column, we separate the mixedCase into mixed_case
# and assume that.
if dbName is None:
- self.dbName = soClass._style.pythonAttrToDBColumn(self.name)
+ self.dbName = soClass.sqlmeta.style.pythonAttrToDBColumn(self.name)
else:
self.dbName = dbName
@@ -607,7 +607,7 @@
def __init__(self, **kw):
foreignKey = kw['foreignKey']
- style = kw['soClass']._style
+ style = kw['soClass'].sqlmeta.style
if not kw.get('name'):
kw['name'] = style.instanceAttrToIDAttr(style.pythonClassToAttr(foreignKey))
else:
@@ -619,8 +619,8 @@
def postgresCreateSQL(self):
sql = SOKeyCol.postgresCreateSQL(self)
other = findClass(self.foreignKey)
- tName = other._table
- idName = other._idName
+ tName = other.sqlmeta.table
+ idName = other.sqlmeta.idName
if self.cascade is not None:
if self.cascade == 'null':
action = 'ON DELETE SET NULL'
@@ -644,8 +644,8 @@
def sybaseCreateSQL(self):
sql = SOKeyCol.sybaseCreateSQL(self)
other = findClass(self.foreignKey)
- tName = other._table
- idName = other._idName
+ tName = other.sqlmeta.table
+ idName = other.sqlmeta.idName
reference = ('REFERENCES %(tName)s(%(idName)s) ' %
{'tName':tName,
'idName':idName})
@@ -657,8 +657,8 @@
fidName = self.dbName
#I assume that foreign key name is identical to the id of the reference table
sql = ' '.join([fidName, self._maxdbType()])
- tName = other._table
- idName = other._idName
+ tName = other.sqlmeta.table
+ idName = other.sqlmeta.idName
sql=sql + ',' + '\n'
sql=sql + 'FOREIGN KEY (%s) REFERENCES %s(%s)'%(fidName,tName,idName)
return sql
Modified: trunk/SQLObject/sqlobject/dbconnection.py
===================================================================
--- trunk/SQLObject/sqlobject/dbconnection.py 2005-02-16 04:30:22 UTC (rev 611)
+++ trunk/SQLObject/sqlobject/dbconnection.py 2005-02-16 04:31:51 UTC (rev 612)
@@ -271,18 +271,18 @@
q = 'SELECT '
if ops.get('lazyColumns', 0):
q += "%s.%s FROM %s WHERE " % \
- (cls._table, cls._idName,
+ (cls.sqlmeta.table, cls.sqlmeta.idName,
", ".join(select.tables))
else:
- columns = ", ".join(["%s.%s" % (cls._table, col.dbName)
+ columns = ", ".join(["%s.%s" % (cls.sqlmeta.table, col.dbName)
for col in cls._SO_columns])
if columns:
q += "%s.%s, %s FROM %s WHERE " % \
- (cls._table, cls._idName, columns,
+ (cls.sqlmeta.table, cls.sqlmeta.idName, columns,
", ".join(select.tables))
else:
q += "%s.%s FROM %s WHERE " % \
- (cls._table, cls._idName,
+ (cls.sqlmeta.table, cls.sqlmeta.idName,
", ".join(select.tables))
return self._addWhereClause(select, q)
@@ -360,7 +360,7 @@
def createTableSQL(self, soClass):
return ('CREATE TABLE %s (\n%s\n)' %
- (soClass._table, self.createColumns(soClass)))
+ (soClass.sqlmeta.table, self.createColumns(soClass)))
def createColumns(self, soClass):
columnDefs = [self.createIDColumn(soClass)] \
@@ -396,36 +396,45 @@
def _SO_update(self, so, values):
self.query("UPDATE %s SET %s WHERE %s = %s" %
- (so._table,
+ (so.sqlmeta.table,
", ".join(["%s = %s" % (dbName, self.sqlrepr(value))
for dbName, value in values]),
- so._idName,
+ so.sqlmeta.idName,
self.sqlrepr(so.id)))
def _SO_selectOne(self, so, columnNames):
- return self.queryOne("SELECT %s FROM %s WHERE %s = %s" %
- (", ".join(columnNames),
- so._table,
- so._idName,
- self.sqlrepr(so.id)))
+ columns = ", ".join(columnNames)
+ if columns:
+ return self.queryOne(
+ "SELECT %s FROM %s WHERE %s = %s" %
+ (columns,
+ so.sqlmeta.table,
+ so.sqlmeta.idName,
+ self.sqlrepr(so.id)))
+ else:
+ return self.queryOne(
+ "SELECT NULL FROM %s WHERE %s = %s" %
+ (so.sqlmeta.table,
+ so.sqlmeta.idName,
+ self.sqlrepr(so.id)))
def _SO_selectOneAlt(self, cls, columnNames, column, value):
return self.queryOne("SELECT %s FROM %s WHERE %s = %s" %
(", ".join(columnNames),
- cls._table,
+ cls.sqlmeta.table,
column,
self.sqlrepr(value)))
def _SO_delete(self, so):
self.query("DELETE FROM %s WHERE %s = %s" %
- (so._table,
- so._idName,
+ (so.sqlmeta.table,
+ so.sqlmeta.idName,
self.sqlrepr(so.id)))
def _SO_selectJoin(self, soClass, column, value):
return self.queryAll("SELECT %s FROM %s WHERE %s = %s" %
- (soClass._idName,
- soClass._table,
+ (soClass.sqlmeta.idName,
+ soClass.sqlmeta.table,
column,
self.sqlrepr(value)))
Modified: trunk/SQLObject/sqlobject/firebird/firebirdconnection.py
===================================================================
--- trunk/SQLObject/sqlobject/firebird/firebirdconnection.py 2005-02-16 04:30:22 UTC (rev 611)
+++ trunk/SQLObject/sqlobject/firebird/firebirdconnection.py 2005-02-16 04:31:51 UTC (rev 612)
@@ -86,8 +86,8 @@
"""Firebird uses 'generators' to create new ids for a table.
The users needs to create a generator named GEN_<tablename>
for each table this method to work."""
- table = soInstance._table
- idName = soInstance._idName
+ table = soInstance.sqlmeta.table
+ idName = soInstance.sqlmeta.idName
sequenceName = getattr(soInstance, '_idSequence',
'GEN_%s' % table)
if id is None:
@@ -122,14 +122,14 @@
def createTable(self, soClass):
self.query('CREATE TABLE %s (\n%s\n)' % \
- (soClass._table, self.createColumns(soClass)))
- self.query("CREATE GENERATOR GEN_%s" % soClass._table)
+ (soClass.sqlmeta.table, self.createColumns(soClass)))
+ self.query("CREATE GENERATOR GEN_%s" % soClass.sqlmeta.table)
def createColumn(self, soClass, col):
return col.firebirdCreateSQL()
def createIDColumn(self, soClass):
- return '%s INT NOT NULL PRIMARY KEY' % soClass._idName
+ return '%s INT NOT NULL PRIMARY KEY' % soClass.sqlmeta.idName
def createIndexSQL(self, soClass, index):
return index.firebirdCreateIndexSQL(soClass)
@@ -188,7 +188,7 @@
if field == 'id':
continue
colClass, kw = self.guessClass(t, flength, fscale)
- kw['name'] = soClass._style.dbColumnToPythonAttr(field)
+ kw['name'] = soClass.sqlmeta.style.dbColumnToPythonAttr(field)
kw['notNone'] = not nullAllowed
kw['default'] = thedefault
results.append(colClass(**kw))
Modified: trunk/SQLObject/sqlobject/index.py
===================================================================
--- trunk/SQLObject/sqlobject/index.py 2005-02-16 04:30:22 UTC (rev 611)
+++ trunk/SQLObject/sqlobject/index.py 2005-02-16 04:31:51 UTC (rev 612)
@@ -71,9 +71,9 @@
spec.append(desc['column'].dbName)
ret = 'CREATE %s %s_%s ON %s (%s)' % \
(uniqueOrIndex,
- self.soClass._table,
+ self.soClass.sqlmeta.table,
self.name,
- self.soClass._table,
+ self.soClass.sqlmeta.table,
', '.join(spec))
return ret
@@ -94,7 +94,7 @@
spec.append(desc['column'].dbName)
return 'ALTER TABLE %s ADD %s %s (%s)' % \
- (soClass._table, uniqueOrIndex,
+ (soClass.sqlmeta.table, uniqueOrIndex,
self.name,
', '.join(spec))
Modified: trunk/SQLObject/sqlobject/inheritance/__init__.py
===================================================================
--- trunk/SQLObject/sqlobject/inheritance/__init__.py 2005-02-16 04:30:22 UTC (rev 611)
+++ trunk/SQLObject/sqlobject/inheritance/__init__.py 2005-02-16 04:31:51 UTC (rev 612)
@@ -19,7 +19,7 @@
if clause is None or isinstance(clause, str) and clause == 'all':
clause = sqlbuilder.SQLTrueClause
tablesDict = sqlbuilder.tablesUsedDict(clause)
- tablesDict[sourceClass._table] = 1
+ tablesDict[sourceClass.sqlmeta.table] = 1
orderBy = ops.get('orderBy')
if orderBy and not isinstance(orderBy, basestring):
tablesDict.update(sqlbuilder.tablesUsedDict(orderBy))
@@ -33,11 +33,11 @@
tableRegistry = {}
allClasses = classregistry.registry(sourceClass._registry).allClasses()
for registryClass in allClasses:
- if registryClass._table in tablesDict:
+ if registryClass.sqlmeta.table in tablesDict:
#DSM: By default, no parents are needed for the clauses
tableRegistry[registryClass] = registryClass
for registryClass in allClasses:
- if registryClass._table in tablesDict:
+ if registryClass.sqlmeta.table in tablesDict:
currentClass = registryClass
while currentClass._parentClass:
currentClass = currentClass._parentClass
@@ -56,7 +56,7 @@
parentClass = currentClass._parentClass
parentClause.append(currentClass.q.id == parentClass.q.id)
currentClass = parentClass
- tablesDict[currentClass._table] = 1
+ tablesDict[currentClass.sqlmeta.table] = 1
clause = reduce(sqlbuilder.AND, parentClause, clause)
super(InheritableSelectResults, self).__init__(sourceClass, clause, clauseTables,
Modified: trunk/SQLObject/sqlobject/joins.py
===================================================================
--- trunk/SQLObject/sqlobject/joins.py 2005-02-16 04:30:22 UTC (rev 611)
+++ trunk/SQLObject/sqlobject/joins.py 2005-02-16 04:31:51 UTC (rev 612)
@@ -63,7 +63,8 @@
# Here we set up the basic join, which is
# one-to-many, where the other class points to
# us.
- self.joinColumn = styles.getStyle(self.soClass).tableReference(self.soClass._table)
+ self.joinColumn = styles.getStyle(
+ self.soClass).tableReference(self.soClass.sqlmeta.table)
def _setOtherClass(self, cls):
self.otherClass = cls
@@ -149,12 +150,13 @@
def _setOtherRelatedClass(self, otherClass):
if not self.intermediateTable:
- names = [self.soClass._table,
- otherClass._table]
+ names = [self.soClass.sqlmeta.table,
+ otherClass.sqlmeta.table]
names.sort()
self.intermediateTable = '%s_%s' % (names[0], names[1])
if not self.otherColumn:
- self.otherColumn = self.soClass._style.tableReference(otherClass._table)
+ self.otherColumn = self.soClass.sqlmeta.style.tableReference(
+ otherClass.sqlmeta.table)
def hasIntermediateTable(self):
Modified: trunk/SQLObject/sqlobject/main.py
===================================================================
--- trunk/SQLObject/sqlobject/main.py 2005-02-16 04:30:22 UTC (rev 611)
+++ trunk/SQLObject/sqlobject/main.py 2005-02-16 04:31:51 UTC (rev 612)
@@ -180,10 +180,15 @@
class _sqlmeta_attr(object):
- def __init__(self, name):
+ def __init__(self, name, deprecation_level):
self.name = name
+ self.deprecation_level = deprecation_level
def __get__(self, obj, type=None):
+ if self.deprecation_level is not None:
+ deprecated(
+ 'Use of this attribute should be replaced with '
+ '.sqlmeta.%s' % self.name, level=self.deprecation_level)
return getattr((type or obj).sqlmeta, self.name)
@@ -479,9 +484,9 @@
classregistry.registry(cls._registry).addClass(cls)
- _style = _sqlmeta_attr('style')
- _table = _sqlmeta_attr('table')
- _idName = _sqlmeta_attr('idName')
+ _style = _sqlmeta_attr('style', 2)
+ _table = _sqlmeta_attr('table', 2)
+ _idName = _sqlmeta_attr('idName', 2)
def get(cls, id, connection=None, selectResults=None):
@@ -624,7 +629,7 @@
if changeSchema:
conn = connection or cls._connection
- conn.addColumn(cls._table, column)
+ conn.addColumn(cls.sqlmeta.table, column)
if cls._SO_finishedClassCreation:
makeProperties(cls)
@@ -633,7 +638,7 @@
def addColumnsFromDatabase(cls, connection=None):
conn = connection or cls._connection
- for columnDef in conn.columnsFromSchema(cls._table, cls):
+ for columnDef in conn.columnsFromSchema(cls.sqlmeta.table, cls):
alreadyExists = False
for c in cls._columns:
if c.name == columnDef.name:
@@ -674,7 +679,7 @@
if changeSchema:
conn = connection or cls._connection
- conn.delColumn(cls._table, column)
+ conn.delColumn(cls.sqlmeta.table, column)
if cls._SO_finishedClassCreation:
unmakeProperties(cls)
@@ -1090,7 +1095,7 @@
def _SO_fetchAlternateID(cls, dbIDName, value, connection=None):
result = (connection or cls._connection)._SO_selectOneAlt(
cls,
- [cls._idName] +
+ [cls.sqlmeta.idName] +
[col.dbName for col in cls._SO_columns],
dbIDName,
value)
@@ -1139,9 +1144,9 @@
def dropTable(cls, ifExists=False, dropJoinTables=True, cascade=False,
connection=None):
conn = connection or cls._connection
- if ifExists and not conn.tableExists(cls._table):
+ if ifExists and not conn.tableExists(cls.sqlmeta.table):
return
- conn.dropTable(cls._table, cascade)
+ conn.dropTable(cls.sqlmeta.table, cascade)
if dropJoinTables:
cls.dropJoinTables(ifExists=ifExists, connection=conn)
dropTable = classmethod(dropTable)
@@ -1150,7 +1155,7 @@
createIndexes=True,
connection=None):
conn = connection or cls._connection
- if ifNotExists and conn.tableExists(cls._table):
+ if ifNotExists and conn.tableExists(cls.sqlmeta.table):
return
conn.createTable(cls)
if createJoinTables:
@@ -1227,7 +1232,7 @@
# 3-03 @@: Maybe this should check the cache... but it's
# kind of crude anyway, so...
conn = connection or cls._connection
- conn.clearTable(cls._table)
+ conn.clearTable(cls.sqlmeta.table)
clearTable = classmethod(clearTable)
def destroySelf(self):
Modified: trunk/SQLObject/sqlobject/maxdb/maxdbconnection.py
===================================================================
--- trunk/SQLObject/sqlobject/maxdb/maxdbconnection.py 2005-02-16 04:30:22 UTC (rev 611)
+++ trunk/SQLObject/sqlobject/maxdb/maxdbconnection.py 2005-02-16 04:31:51 UTC (rev 612)
@@ -119,8 +119,8 @@
return conn
def _queryInsertID(self, conn, soInstance, id, names, values):
- table = soInstance._table
- idName = soInstance._idName
+ table = soInstance.sqlmeta.table
+ idName = soInstance.sqlmeta.idName
c = conn.cursor()
if id is None:
c.execute('SELECT %s.NEXTVAL FROM DUAL' % (self.createSequenceName(table)))
@@ -158,21 +158,21 @@
#i tried to use the transaction class but i get a recursion limit error
#t=self.transaction()
# t.query('CREATE TABLE %s (\n%s\n)' % \
- # (soClass._table, self.createColumns(soClass)))
+ # (soClass.sqlmeta.table, self.createColumns(soClass)))
#
- # t.query("CREATE SEQUENCE %s" % self.createSequenceName(soClass._table))
+ # t.query("CREATE SEQUENCE %s" % self.createSequenceName(soClass.sqlmeta.table))
# t.commit()
#so use transaction when the problem will be solved
self.query('CREATE TABLE %s (\n%s\n)' % \
- (soClass._table, self.createColumns(soClass)))
+ (soClass.sqlmeta.table, self.createColumns(soClass)))
self.query("CREATE SEQUENCE %s"
- % self.createSequenceName(soClass._table))
+ % self.createSequenceName(soClass.sqlmeta.table))
def createColumn(self, soClass, col):
return col.maxdbCreateSQL()
def createIDColumn(self, soClass):
- return '%s INT PRIMARY KEY' % soClass._idName
+ return '%s INT PRIMARY KEY' % soClass.sqlmeta.idName
def createIndexSQL(self, soClass, index):
return index.maxdbCreateIndexSQL(soClass)
Modified: trunk/SQLObject/sqlobject/mysql/mysqlconnection.py
===================================================================
--- trunk/SQLObject/sqlobject/mysql/mysqlconnection.py 2005-02-16 04:30:22 UTC (rev 611)
+++ trunk/SQLObject/sqlobject/mysql/mysqlconnection.py 2005-02-16 04:31:51 UTC (rev 612)
@@ -41,8 +41,8 @@
raise
def _queryInsertID(self, conn, soInstance, id, names, values):
- table = soInstance._table
- idName = soInstance._idName
+ table = soInstance.sqlmeta.table
+ idName = soInstance.sqlmeta.idName
c = conn.cursor()
if id is not None:
names = [idName] + names
@@ -71,7 +71,7 @@
return index.mysqlCreateIndexSQL(soClass)
def createIDColumn(self, soClass):
- return '%s INT PRIMARY KEY AUTO_INCREMENT' % soClass._idName
+ return '%s INT PRIMARY KEY AUTO_INCREMENT' % soClass.sqlmeta.idName
def joinSQLType(self, join):
return 'INT NOT NULL'
@@ -100,7 +100,7 @@
if field == 'id':
continue
colClass, kw = self.guessClass(t)
- kw['name'] = soClass._style.dbColumnToPythonAttr(field)
+ kw['name'] = soClass.sqlmeta.style.dbColumnToPythonAttr(field)
kw['notNone'] = not nullAllowed
kw['default'] = default
# @@ skip key...
Modified: trunk/SQLObject/sqlobject/postgres/pgconnection.py
===================================================================
--- trunk/SQLObject/sqlobject/postgres/pgconnection.py 2005-02-16 04:30:22 UTC (rev 611)
+++ trunk/SQLObject/sqlobject/postgres/pgconnection.py 2005-02-16 04:31:51 UTC (rev 612)
@@ -74,8 +74,8 @@
return conn
def _queryInsertID(self, conn, soInstance, id, names, values):
- table = soInstance._table
- idName = soInstance._idName
+ table = soInstance.sqlmeta.table
+ idName = soInstance.sqlmeta.idName
sequenceName = getattr(soInstance, '_idSequence',
'%s_%s_seq' % (table, idName))
c = conn.cursor()
@@ -106,7 +106,7 @@
return index.postgresCreateIndexSQL(soClass)
def createIDColumn(self, soClass):
- return '%s SERIAL PRIMARY KEY' % soClass._idName
+ return '%s SERIAL PRIMARY KEY' % soClass.sqlmeta.idName
def dropTable(self, tableName, cascade=False):
if self.server_version[:3] <= "7.2":
@@ -189,7 +189,7 @@
if field == primaryKey:
continue
colClass, kw = self.guessClass(t)
- kw['name'] = soClass._style.dbColumnToPythonAttr(field)
+ kw['name'] = soClass.sqlmeta.style.dbColumnToPythonAttr(field)
kw['notNone'] = notnull
if defaultstr is not None:
kw['default'] = getattr(sqlbuilder.const, defaultstr)
Modified: trunk/SQLObject/sqlobject/sqlbuilder.py
===================================================================
--- trunk/SQLObject/sqlobject/sqlbuilder.py 2005-02-16 04:30:22 UTC (rev 611)
+++ trunk/SQLObject/sqlobject/sqlbuilder.py 2005-02-16 04:31:51 UTC (rev 612)
@@ -329,16 +329,16 @@
def __init__(self, soClass):
self.soClass = soClass
- assert soClass._table, (
+ assert soClass.sqlmeta.table, (
"Bad table name in class %r: %r"
- % (soClass, soClass._table))
- Table.__init__(self, soClass._table)
+ % (soClass, soClass.sqlmeta.table))
+ Table.__init__(self, soClass.sqlmeta.table)
def __getattr__(self, attr):
if attr.startswith('__'):
raise AttributeError
if attr == 'id':
- return SQLObjectField(self.tableName, self.soClass._idName, attr)
+ return SQLObjectField(self.tableName, self.soClass.sqlmeta.idName, attr)
else:
return SQLObjectField(self.tableName,
self.soClass._SO_columnDict[attr].dbName,
Modified: trunk/SQLObject/sqlobject/sqlite/sqliteconnection.py
===================================================================
--- trunk/SQLObject/sqlobject/sqlite/sqliteconnection.py 2005-02-16 04:30:22 UTC (rev 611)
+++ trunk/SQLObject/sqlobject/sqlite/sqliteconnection.py 2005-02-16 04:31:51 UTC (rev 612)
@@ -42,8 +42,8 @@
return self._conn
def _queryInsertID(self, conn, soInstance, id, names, values):
- table = soInstance._table
- idName = soInstance._idName
+ table = soInstance.sqlmeta.table
+ idName = soInstance.sqlmeta.idName
c = conn.cursor()
if id is not None:
names = [idName] + names
@@ -59,6 +59,15 @@
self.printDebug(conn, id, 'QueryIns', 'result')
return id
+ def _insertSQL(self, table, names, values):
+ if not names:
+ assert not values
+ # INSERT INTO table () VALUES () isn't allowed in
+ # SQLite (though it is in other databases)
+ return ("INSERT INTO %s VALUES (NULL)" % table)
+ else:
+ return DBAPI._insertSQL(self, table, names, values)
+
def _queryAddLimitOffset(self, query, start, end):
if not start:
return "%s LIMIT %i" % (query, end)
@@ -70,7 +79,7 @@
return col.sqliteCreateSQL()
def createIDColumn(self, soClass):
- return '%s INTEGER PRIMARY KEY' % soClass._idName
+ return '%s INTEGER PRIMARY KEY' % soClass.sqlmeta.idName
def joinSQLType(self, join):
return 'INT NOT NULL'
Modified: trunk/SQLObject/sqlobject/sresults.py
===================================================================
--- trunk/SQLObject/sqlobject/sresults.py 2005-02-16 04:30:22 UTC (rev 611)
+++ trunk/SQLObject/sqlobject/sresults.py 2005-02-16 04:31:51 UTC (rev 612)
@@ -11,7 +11,7 @@
clause = sqlbuilder.SQLTrueClause
self.clause = clause
tablesDict = sqlbuilder.tablesUsedDict(self.clause)
- tablesDict[sourceClass._table] = 1
+ tablesDict[sourceClass.sqlmeta.table] = 1
if clauseTables:
for table in clauseTables:
tablesDict[table] = 1
Modified: trunk/SQLObject/sqlobject/styles.py
===================================================================
--- trunk/SQLObject/sqlobject/styles.py 2005-02-16 04:30:22 UTC (rev 611)
+++ trunk/SQLObject/sqlobject/styles.py 2005-02-16 04:31:51 UTC (rev 612)
@@ -115,8 +115,8 @@
if dbConnection is None:
if hasattr(soClass, '_connection'):
dbConnection = soClass._connection
- if hasattr(soClass, '_style') and soClass._style:
- return soClass._style
+ if hasattr(soClass.sqlmeta, 'style') and soClass.sqlmeta.style:
+ return soClass.sqlmeta.style
elif dbConnection and dbConnection.style:
return dbConnection.style
else:
Modified: trunk/SQLObject/sqlobject/sybase/sybaseconnection.py
===================================================================
--- trunk/SQLObject/sqlobject/sybase/sybaseconnection.py 2005-02-16 04:30:22 UTC (rev 611)
+++ trunk/SQLObject/sqlobject/sybase/sybaseconnection.py 2005-02-16 04:31:51 UTC (rev 612)
@@ -69,8 +69,8 @@
return r is not None
def _queryInsertID(self, conn, soInstance, id, names, values):
- table = soInstance._table
- idName = soInstance._idName
+ table = soInstance.sqlmeta.table
+ idName = soInstance.sqlmeta.idName
c = conn.cursor()
if id is not None:
names = [idName] + names
@@ -103,7 +103,7 @@
return col.sybaseCreateSQL()
def createIDColumn(self, soClass):
- return '%s NUMERIC(18,0) IDENTITY UNIQUE' % soClass._idName
+ return '%s NUMERIC(18,0) IDENTITY UNIQUE' % soClass.sqlmeta.idName
def createIndexSQL(self, soClass, index):
return index.sybaseCreateIndexSQL(soClass)
@@ -138,7 +138,7 @@
if field == 'id':
continue
colClass, kw = self.guessClass(t)
- kw['name'] = soClass._style.dbColumnToPythonAttr(field)
+ kw['name'] = soClass.sqlmeta.style.dbColumnToPythonAttr(field)
kw['notNone'] = not nullAllowed
kw['default'] = default
# @@ skip key...
|
