Author: phd
Date: 2005-02-21 12:43:02 +0000 (Mon, 21 Feb 2005)
New Revision: 629
Modified:
trunk/SQLObject/sqlobject/sybase/sybaseconnection.py
Log:
Applied the patch from https://sourceforge.net/tracker/index.php?func=detail&aid=1104058&group_id=74338&atid=540674
Modified: trunk/SQLObject/sqlobject/sybase/sybaseconnection.py
===================================================================
--- trunk/SQLObject/sqlobject/sybase/sybaseconnection.py 2005-02-21 12:32:50 UTC (rev 628)
+++ trunk/SQLObject/sqlobject/sybase/sybaseconnection.py 2005-02-21 12:43:02 UTC (rev 629)
@@ -1,4 +1,5 @@
from sqlobject.dbconnection import DBAPI
+from sqlobject import col
Sybase = None
class SybaseConnection(DBAPI):
@@ -128,13 +129,13 @@
(tableName,
column.dbName))
- SHOW_COLUMNS=("select 'column' = COL_NAME(id, colid) "
- "from syscolumns where id = OBJECT_ID(%s)")
+ SHOW_COLUMNS=('SELECT COLUMN_NAME, DATA_TYPE, IS_NULLABLE, COLUMN_DEFAULT FROM INFORMATION_SCHEMA.COLUMNS '
+ 'WHERE TABLE_NAME = \'%s\'')
def columnsFromSchema(self, tableName, soClass):
colData = self.queryAll(self.SHOW_COLUMNS
% tableName)
results = []
- for field, t, nullAllowed, key, default, extra in colData:
+ for field, t, nullAllowed, default in colData:
if field == 'id':
continue
colClass, kw = self.guessClass(t)
@@ -143,6 +144,7 @@
kw['default'] = default
# @@ skip key...
# @@ skip extra...
+ kw['forceDBName'] = True
results.append(colClass(**kw))
return results
|