Changeset 257

Timestamp:

12/01/08 05:44:57

Author:

fumanchu

Message:

Some slightly-hackish fixes to get MySQL tests almost working (still some unicode issues).

Files:

• trunk/geniusql/providers/mysql.py (modified) (10 diffs)

trunk/geniusql/providers/mysql.py

@@ -67 +67 @@
-        
-        if ignore_case:
-) USING utf8
+ USING utf8)
-                    start + likeexpr.lower() + end + "'")
-        else:
@@ -91 +91 @@
-    pass
-
-
+VAR
-    pass
-
@@ -261 +261 @@
-    default_adapters[str] = MySQL_CHAR_Adapter()
-    default_adapters[unicode] = MySQL_CHAR_Adapter()
+    
+    def ddl(self):
+        """Return the type for use in CREATE or ALTER statements."""
+        return "CHAR(%s)" % self.bytes
+
+class CHAR411(CHAR):
+    synonyms = ['CHAR']
+    default_adapters = CHAR.default_adapters.copy()
+    default_adapters[str] = MySQL_CHAR_Adapter411()
+    default_adapters[unicode] = MySQL_CHAR_Adapter411()
+
-
-class VARCHAR(dbtypes.SQL92VARCHAR):
@@ -269 +280 @@
-    default_adapters[str] = MySQL_VARCHAR_Adapter()
-    default_adapters[unicode] = MySQL_VARCHAR_Adapter()
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    # "The maximum effective length of a VARCHAR in MySQL 5.0.3 and
-    # later is determined by the maximum row size and the character
@@ -277 +298 @@
-    max_bytes = 65535
-    synonyms = ['VARCHAR']
-    
-    def ddl(self):
-        """Return the type for use in CREATE or ALTER statements."""
-        return "VARCHAR(%s)" % self.bytes
-
-
@@ -289 +306 @@
-    default_adapters[str] = MySQL_VARCHAR_Adapter()
-    default_adapters[unicode] = MySQL_VARCHAR_Adapter()
+    
+    def ddl(self):
+        """Return the type for use in CREATE or ALTER statements."""
+        return "BINARY(%s)" % self.bytes
+
+class BINARY411(BINARY):
+    synonyms = ['BINARY']
+    default_adapters = BINARY.default_adapters.copy()
+    default_adapters[str] = MySQL_VARCHAR_Adapter411()
+    default_adapters[unicode] = MySQL_VARCHAR_Adapter411()
+
-
-class VARBINARY(dbtypes.SQL92VARCHAR):
@@ -294 +322 @@
-    bytes = 255
-    max_bytes = 255
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    # "The maximum effective length of a VARCHAR in MySQL 5.0.3 and
-    # later is determined by the maximum row size and the character
@@ -302 +340 @@
-    max_bytes = 65535
-    synonyms = ['VARBINARY']
-
-
-
-
+
-
-class MySQL_TEXT(dbtypes.TEXT):
@@ -312 +347 @@
-    default_adapters[unicode] = MySQL_VARCHAR_Adapter()
-
+class MySQL_TEXT411(MySQL_TEXT):
+    default_adapters = MySQL_TEXT.default_adapters.copy()
+    default_adapters[str] = MySQL_VARCHAR_Adapter411()
+    default_adapters[unicode] = MySQL_VARCHAR_Adapter411()
+
-class TINYBLOB(MySQL_TEXT):
-    bytes = max_bytes = (2 ** 8) - 1
+    
+    def ddl(self):
+        """Return the type for use in CREATE or ALTER statements."""
+        return "TINYBLOB"
+class TINYBLOB411(MySQL_TEXT411):
+    bytes = max_bytes = (2 ** 8) - 1
+    synonyms = ['TINYBLOB']
+    
+    def ddl(self):
+        """Return the type for use in CREATE or ALTER statements."""
+        return "TINYBLOB"
-
-class BLOB(MySQL_TEXT):
-    bytes = max_bytes = (2 ** 16) - 1
+    
+    def ddl(self):
+        """Return the type for use in CREATE or ALTER statements."""
+        return "BLOB"
+class BLOB411(MySQL_TEXT411):
+    bytes = max_bytes = (2 ** 16) - 1
+    synonyms = ['BLOB']
+    
+    def ddl(self):
+        """Return the type for use in CREATE or ALTER statements."""
+        return "BLOB"
-
-class MEDIUMBLOB(MySQL_TEXT):
-    bytes = max_bytes = (2 ** 24) - 1
+    
+    def ddl(self):
+        """Return the type for use in CREATE or ALTER statements."""
+        return "MEDIUMBLOB"
+class MEDIUMBLOB411(MySQL_TEXT411):
+    bytes = max_bytes = (2 ** 24) - 1
+    synonyms = ['MEDIUMBLOB']
+    
+    def ddl(self):
+        """Return the type for use in CREATE or ALTER statements."""
+        return "MEDIUMBLOB"
-
-class LONGBLOB(MySQL_TEXT):
-    bytes = max_bytes = (2 ** 32) - 1
+    
+    def ddl(self):
+        """Return the type for use in CREATE or ALTER statements."""
+        return "LONGBLOB"
+class LONGBLOB411(MySQL_TEXT411):
+    bytes = max_bytes = (2 ** 32) - 1
+    synonyms = ['LONGBLOB']
+    
+    def ddl(self):
+        """Return the type for use in CREATE or ALTER statements."""
+        return "LONGBLOB"
-
-
-class TINYTEXT(MySQL_TEXT):
-    bytes = max_bytes = (2 ** 8) - 1
+    
+    def ddl(self):
+        """Return the type for use in CREATE or ALTER statements."""
+        return "TINYTEXT"
+class TINYTEXT411(MySQL_TEXT411):
+    bytes = max_bytes = (2 ** 8) - 1
+    synonyms = ['TINYTEXT']
+    
+    def ddl(self):
+        """Return the type for use in CREATE or ALTER statements."""
+        return "TINYTEXT"
-
-class TEXT(MySQL_TEXT):
-    bytes = max_bytes = (2 ** 16) - 1
+    
+    def ddl(self):
+        """Return the type for use in CREATE or ALTER statements."""
+        return "TEXT"
+class TEXT411(MySQL_TEXT411):
+    bytes = max_bytes = (2 ** 16) - 1
+    synonyms = ['TEXT']
+    
+    def ddl(self):
+        """Return the type for use in CREATE or ALTER statements."""
+        return "TEXT"
-
-class MEDIUMTEXT(MySQL_TEXT):
-    bytes = max_bytes = (2 ** 24) - 1
+    
+    def ddl(self):
+        """Return the type for use in CREATE or ALTER statements."""
+        return "MEDIUMTEXT"
+class MEDIUMTEXT411(MySQL_TEXT411):
+    bytes = max_bytes = (2 ** 24) - 1
+    synonyms = ['MEDIUMTEXT']
+    
+    def ddl(self):
+        """Return the type for use in CREATE or ALTER statements."""
+        return "MEDIUMTEXT"
-
-class LONGTEXT(MySQL_TEXT):
-    bytes = max_bytes = (2 ** 32) - 1
+    
+    def ddl(self):
+        """Return the type for use in CREATE or ALTER statements."""
+        return "LONGTEXT"
+class LONGTEXT411(MySQL_TEXT411):
+    bytes = max_bytes = (2 ** 32) - 1
+    synonyms = ['LONGTEXT']
+    
+    def ddl(self):
+        """Return the type for use in CREATE or ALTER statements."""
+        return "LONGTEXT"
-
-
@@ -378 +506 @@
-        if self.version >= providers.Version("5.0.3"):
-            self.known_types['numeric'] = [DECIMAL503]
-
-
+
-        if self.version >= providers.Version("5.0.5"):
-            self.known_types['numeric'] = [DECIMAL505]