r6347 - trunk/gnue-common/src/datasources/drivers/interbase/Schema/Creation

[kilo]

Author: kilo
Date: 2004-09-21 06:26:51 -0500 (Tue, 21 Sep 2004)
New Revision: 6347

Modified:
   
trunk/gnue-common/src/datasources/drivers/interbase/Schema/Creation/Creation.py
Log:
Create Interbase databases using UNICODE for server-encoding

Modified: 
trunk/gnue-common/src/datasources/drivers/interbase/Schema/Creation/Creation.py
===================================================================
--- 
trunk/gnue-common/src/datasources/drivers/interbase/Schema/Creation/Creation.py 
    2004-09-21 09:59:33 UTC (rev 6346)
+++ 
trunk/gnue-common/src/datasources/drivers/interbase/Schema/Creation/Creation.py 
    2004-09-21 11:26:51 UTC (rev 6347)
@@ -34,6 +34,7 @@
 
   MAX_NAME_LENGTH = 31
   ALTER_MULTIPLE  = False
+  MAX_VARCHAR_LEN = 10900
 
   # ---------------------------------------------------------------------------
   # Create a new database
@@ -76,7 +77,7 @@
       raise gException, ("Cannot create user")
 
     self.connection._driver.create_database (\
-       u"create database '%s' user '%s' password '%s'"
+       u"create database '%s' user '%s' password '%s' default character set 
UNICODE_FSS"
         % (dburl, username, password))
 
     self.connection.manager.loginToConnection (self.connection)
@@ -106,9 +107,9 @@
 
     elif fieldDef ['defaultwith'] == 'timestamp':
       fieldDef ['default'] = "'NOW'"
-    
 
 
+
   # ---------------------------------------------------------------------------
   # A key is an integer
   # ---------------------------------------------------------------------------
@@ -130,19 +131,19 @@
   def string (self, fieldDefinition):
     """
     This function returns an apropriate type for strings according to their
-    lenght. 
+    lenght.
 
     @param fieldDefinition: dictionary describing the field
     @return: string with the native datatype
     """
 
     if fieldDefinition.has_key ('length') and \
-       fieldDefinition ['length'] <= 32000:
+       fieldDefinition ['length'] <= self.MAX_VARCHAR_LEN:
       return "varchar (%s)" % fieldDefinition ['length']
 
     elif not fieldDefinition.has_key ('length'):
 
-      return "varchar (32000)"
+      return "varchar (%s)" % self.MAX_VARCHAR_LEN
     else:
       return "blob"