[Modeling-cvs] ProjectModeling/Modeling/DatabaseAdaptors/SQLiteAdaptorLayer SQLiteSQLExpression.py,1.2,1.3 SQLiteSchemaGeneration.py,1.3,1.4

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling/DatabaseAdaptors/SQLiteAdaptorLayer
In directory sc8-pr-cvs1:/tmp/cvs-serv8021/Modeling/DatabaseAdaptors/SQLiteAdaptorLayer

Modified Files:
	SQLiteSQLExpression.py SQLiteSchemaGeneration.py 
Log Message:
Fix for bug #785432 included in the previous release was misplaced and
inactive. Fixed.


Index: SQLiteSQLExpression.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/DatabaseAdaptors/SQLiteAdaptorLayer/SQLiteSQLExpression.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SQLiteSQLExpression.py	10 Aug 2003 14:43:16 -0000	1.2
--- SQLiteSQLExpression.py	24 Aug 2003 14:13:08 -0000	1.3
***************
*** 259,260 ****
--- 259,281 ----
      else:
        return SQLExpression.sqlStringForSelector(self, selector, value)
+ 
+   def valueTypeForExternalTypeMapping(self):
+     """
+     Extends the inherited method's result set and adds the SQL types:
+     DATETIME, TEXT, NUMBER, DECIMAL, SMALLINT, REAL.
+ 
+     See also: SQLExpression.valueTypeForExternalTypeMapping()
+     """
+     # Note: SQLite does not care about SQL types, since all types are treated
+     # as strings in this db-server. Any valid (or invalid) sql types can be
+     # added here, neither the framework nor SQLite cares.
+     values=SQLExpression.valueTypeForExternalTypeMapping.im_func(self)
+     values.update({ 'datetime': DateType,
+                     'text': CharacterType,
+                     'number': NumericType,
+                     'decimal': NumericType,
+                     'smallint': NumericType,
+                     'real': NumericType,
+                     }
+                   )
+     return values

Index: SQLiteSchemaGeneration.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/DatabaseAdaptors/SQLiteAdaptorLayer/SQLiteSchemaGeneration.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SQLiteSchemaGeneration.py	9 Aug 2003 11:17:45 -0000	1.3
--- SQLiteSchemaGeneration.py	24 Aug 2003 14:13:09 -0000	1.4
***************
*** 268,290 ****
      sqlExprs.append(sqlExpr)
      return sqlExprs
- 
-   def valueTypeForExternalTypeMapping(self):
-     """
-     Extends the inherited method's result set and adds the SQL types:
-     DATETIME, TEXT, NUMBER, DECIMAL, SMALLINT, REAL.
- 
-     See also: SQLExpression.valueTypeForExternalTypeMapping()
-     """
-     # Note: SQLite does not care about SQL types, since all types are treated
-     # as strings in this db-server. Any valid (or invalid) sql types can be
-     # added here, neither the framework nor SQLite cares.
-     values=SQLExpression.valueTypeForExternalTypeMapping.im_func(self)
-     values.update({ 'datetime': DateType,
-                     'text': CharacterType,
-                     'number': NumericType,
-                     'decimal': NumericType,
-                     'smallint': NumericType,
-                     'real': NumericType,
-                     }
-                   )
-     return values
--- 268,269 ----