summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2006-07-01 19:26:30 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2006-07-01 19:26:30 +0000
commitcce1f073e3ed924b83bfe15ae86ccf0d772b15c1 (patch)
tree8435dd3ea4ae7cf39c6a283156461a714a88373d /lib/sqlalchemy/sql.py
parent6133dbee0914b9e2a80af1c323430493054ef45a (diff)
downloadsqlalchemy-cce1f073e3ed924b83bfe15ae86ccf0d772b15c1.tar.gz
got MS-SQL support largely working, including reflection, basic types, fair amount of ORM stuff, etc.
'rowcount' label is reseved in MS-SQL and had to change in sql.py count() as well as orm.query
Diffstat (limited to 'lib/sqlalchemy/sql.py')
-rw-r--r--lib/sqlalchemy/sql.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index d978ee208..7b17927f0 100644
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -687,7 +687,7 @@ class FromClause(Selectable):
col = self.primary_key[0]
else:
col = list(self.columns)[0]
- return select([func.count(col).label('rowcount')], whereclause, from_obj=[self], **params)
+ return select([func.count(col).label('tbl_row_count')], whereclause, from_obj=[self], **params)
def join(self, right, *args, **kwargs):
return Join(self, right, *args, **kwargs)
def outerjoin(self, right, *args, **kwargs):
@@ -1283,7 +1283,7 @@ class TableClause(FromClause):
col = self.primary_key[0]
else:
col = list(self.columns)[0]
- return select([func.count(col).label('rowcount')], whereclause, from_obj=[self], **params)
+ return select([func.count(col).label('tbl_row_count')], whereclause, from_obj=[self], **params)
def join(self, right, *args, **kwargs):
return Join(self, right, *args, **kwargs)
def outerjoin(self, right, *args, **kwargs):