|
From: <sub...@co...> - 2007-03-28 16:20:45
|
Author: phd
Date: 2007-03-28 10:20:42 -0600 (Wed, 28 Mar 2007)
New Revision: 2465
Modified:
SQLObject/branches/sqlbuilder-sresults/sqlobject/inheritance/__init__.py
SQLObject/branches/sqlbuilder-sresults/sqlobject/joins.py
SQLObject/branches/sqlbuilder-sresults/sqlobject/sqlbuilder.py
SQLObject/branches/sqlbuilder-sresults/sqlobject/sresults.py
Log:
Removed trailing spaces.
Modified: SQLObject/branches/sqlbuilder-sresults/sqlobject/inheritance/__init__.py
===================================================================
--- SQLObject/branches/sqlbuilder-sresults/sqlobject/inheritance/__init__.py 2007-03-28 14:22:33 UTC (rev 2464)
+++ SQLObject/branches/sqlbuilder-sresults/sqlobject/inheritance/__init__.py 2007-03-28 16:20:42 UTC (rev 2465)
@@ -32,9 +32,9 @@
inheritedTables=None, **ops):
if clause is None or isinstance(clause, str) and clause == 'all':
clause = sqlbuilder.SQLTrueClause
-
+
dbName = (ops.get('connection',None) or sourceClass._connection).dbName
-
+
tablesDict = tablesUsedDict(clause, dbName)
tablesDict[str(sourceClass.sqlmeta.table)] = 1
orderBy = ops.get('orderBy')
Modified: SQLObject/branches/sqlbuilder-sresults/sqlobject/joins.py
===================================================================
--- SQLObject/branches/sqlbuilder-sresults/sqlobject/joins.py 2007-03-28 14:22:33 UTC (rev 2464)
+++ SQLObject/branches/sqlbuilder-sresults/sqlobject/joins.py 2007-03-28 16:20:42 UTC (rev 2465)
@@ -252,7 +252,7 @@
def tablesUsedImmediate(self):
return [self.table, self.interTable]
-
+
def __sqlrepr__(self, db):
return '%s.%s = %s.%s' % (self.interTable, self.joinColumn, self.table, self.idName)
@@ -272,7 +272,7 @@
def performJoin(self, inst):
results = self.otherClass.select(sqlbuilder.AND(
OtherTableToJoin(
- self.otherClass.sqlmeta.table, self.otherClass.sqlmeta.idName,
+ self.otherClass.sqlmeta.table, self.otherClass.sqlmeta.idName,
self.intermediateTable, self.otherColumn
),
JoinToTable(
@@ -382,7 +382,7 @@
& (sqlbuilder.Field(self.intermediateTable, self.joinColumn)
== obj.id))
select = self.otherClass.select(query)
- return _ManyToManySelectWrapper(obj, self, select)
+ return _ManyToManySelectWrapper(obj, self, select)
def event_CreateTableSignal(self, soClass, connection, extra_sql,
post_funcs):
@@ -406,14 +406,14 @@
joinColumn = None
otherColumn = None
createJoinTable = True
-
+
class _ManyToManySelectWrapper(object):
def __init__(self, forObject, join, select):
self.forObject = forObject
self.join = join
self.select = select
-
+
def __getattr__(self, attr):
# @@: This passes through private variable access too... should it?
# Also magic methods, like __str__
@@ -451,7 +451,7 @@
obj = self.join.otherClass(**kw)
self.add(obj)
return obj
-
+
class SOOneToMany(object):
def __init__(self, soClass, name, join, joinColumn, **attrs):
@@ -497,7 +497,7 @@
self.forObject = forObject
self.join = join
self.select = select
-
+
def __getattr__(self, attr):
# @@: This passes through private variable access too... should it?
# Also magic methods, like __str__
@@ -518,4 +518,3 @@
def create(self, **kw):
kw[self.join.joinColumn] = self.forObject.id
return self.join.otherClass(**kw)
-
Modified: SQLObject/branches/sqlbuilder-sresults/sqlobject/sqlbuilder.py
===================================================================
--- SQLObject/branches/sqlbuilder-sresults/sqlobject/sqlbuilder.py 2007-03-28 14:22:33 UTC (rev 2464)
+++ SQLObject/branches/sqlbuilder-sresults/sqlobject/sqlbuilder.py 2007-03-28 16:20:42 UTC (rev 2465)
@@ -79,7 +79,7 @@
safeSQLRE = re.compile(r'^[a-zA-Z_][a-zA-Z0-9_\.]*$')
def sqlIdentifier(obj):
- # some db drivers return unicode column names
+ # some db drivers return unicode column names
return isinstance(obj, types.StringTypes) and bool(safeSQLRE.search(obj.strip()))
@@ -422,7 +422,7 @@
if isinstance(fieldName, SQLExpression):
fieldName = sqlrepr(fieldName, db)
return self.alias + "." + fieldName
-
+
def tablesUsedImmediate(self):
return [self.aliasTable]
@@ -460,7 +460,7 @@
if self.table:
attr = getattr(self.table.q, attr).fieldName
return self.FieldClass(self.tableName, attr, self.alias, self)
-
+
def __sqlrepr__(self, db):
return "%s %s %s" % (sqlrepr(self.tableName, db), self.as_string, self.alias)
@@ -489,7 +489,7 @@
t = SQLConstant(t.sqlmeta.table)
tabs.append(t)
self.tables = tabs
-
+
def __sqlrepr__(self, db):
return " UNION ".join([str(sqlrepr(t, db)) for t in self.tables])
@@ -525,7 +525,7 @@
self.ops['reversed'] = reversed
self.ops['forUpdate'] = forUpdate
self.ops['staticTables'] = staticTables
-
+
def clone(self, **newOps):
ops = self.ops.copy()
ops.update(newOps)
@@ -562,7 +562,7 @@
clause = self.ops['clause']
if isinstance(clause, (str, unicode)):
clause = SQLConstant('(%s)' % clause)
-
+
if clause == SQLTrueClause:
newClause = filter_clause
else:
@@ -570,7 +570,7 @@
return self.newClause(newClause)
def __sqlrepr__(self, db):
-
+
select = "SELECT"
if self.ops['distinct']:
select += " DISTINCT"
@@ -1188,7 +1188,7 @@
def __init__(self, proxy, attr):
self.attr = attr
self.proxy = proxy
-
+
def __sqlrepr__(self, db):
if self.proxy.soClass is None:
return '_DELAYED_' + self.attr
@@ -1199,13 +1199,13 @@
def tablesUsedImmediate(self):
return getattr(self._resolve(), 'tablesUsedImmediate', lambda: [])()
-
+
def components(self):
return getattr(self._resolve(), 'components', lambda: [])()
def _resolve(self):
return getattr(self.proxy, self.attr)
-
+
# For AliasTable etc
def fieldName(self):
class _aliasFieldName(SQLExpression):
@@ -1218,7 +1218,7 @@
class _DelayClass(_Delay):
def _resolve(self):
- return self.proxy.soClass.sqlmeta.table
+ return self.proxy.soClass.sqlmeta.table
class _Delay_proxy(object):
def __init__(self, **kw):
Modified: SQLObject/branches/sqlbuilder-sresults/sqlobject/sresults.py
===================================================================
--- SQLObject/branches/sqlbuilder-sresults/sqlobject/sresults.py 2007-03-28 14:22:33 UTC (rev 2464)
+++ SQLObject/branches/sqlbuilder-sresults/sqlobject/sresults.py 2007-03-28 16:20:42 UTC (rev 2465)
@@ -27,7 +27,7 @@
self.ops['dbOrderBy'] = orderBy
if ops.has_key('connection') and ops['connection'] is None:
del ops['connection']
-
+
tablesDict = sqlbuilder.tablesUsedDict(self.clause, self._getConnection().dbName)
if clauseTables:
for table in clauseTables:
@@ -292,7 +292,7 @@
def _throughTo(self, attr):
otherClass = None
orderBy = sqlbuilder.NoDefault
-
+
ref = self.sourceClass.sqlmeta.columns.get(attr.endswith('ID') and attr or attr+'ID', None)
if ref and ref.foreignKey:
otherClass, clause = self._throughToFK(ref)
@@ -305,27 +305,27 @@
otherClass, clause = self._throughToRelatedJoin(join)
else:
otherClass, clause = self._throughToMultipleJoin(join)
-
+
if not otherClass:
raise AttributeError("throughTo argument (got %s) should be name of foreignKey or SQL*Join in %s" % (attr, self.sourceClass))
-
+
return otherClass.select(clause,
distinct=True,
orderBy=orderBy,
connection=self._getConnection())
-
+
def _throughToFK(self, col):
otherClass = getattr(self.sourceClass, "_SO_class_"+col.foreignKey)
query = sqlbuilder.Alias(self.queryForSelect(), "%s_%s" % (self.sourceClass.__name__, col.name))
return otherClass, otherClass.q.id==getattr(query.q, getattr(self.sourceClass.q, col.name).fieldName)
-
+
def _throughToMultipleJoin(self, join):
otherClass = join.otherClass
query = self.queryForSelect()
query = sqlbuilder.Alias(query, "%s_%s" % (self.sourceClass.__name__, join.joinMethodName))
joinColumn = getattr(otherClass.q, join.soClass.sqlmeta.style.dbColumnToPythonAttr(join.joinColumn))
return otherClass, joinColumn==getattr(query.q, self.sourceClass.q.id.fieldName)
-
+
def _throughToRelatedJoin(self, join):
otherClass = join.otherClass
intTable = sqlbuilder.Table(join.intermediateTable)
@@ -335,5 +335,4 @@
getattr(intTable, join.joinColumn) == getattr(query.q, join.joinColumn))
return otherClass, clause
-
__all__ = ['SelectResults']
|
