Changeset 266

Timestamp:

01/27/09 19:45:47

Author:

fumanchu

Message:

New test and fix for mysql ENUM.

Files:

• trunk/geniusql/providers/mysql.py (modified) (1 diff)
• trunk/geniusql/test/test.py (modified) (3 diffs)
• trunk/geniusql/test/test_mysql_modeling.py (added)
• trunk/geniusql/test/zoo_fixture.py (modified) (5 diffs)

trunk/geniusql/providers/mysql.py

@@ -777 +777 @@
-                    args = [x.strip() for x in args.split(",")]
-                    dbtype.precision, dbtype.scale = map(int, args)
+                elif isinstance(dbtype, VARCHAR):
+                    # This is an ENUM. Strip quotes.
+                    args = [x.strip().strip("'\"") for x in args.split(",")]
+                    dbtype.enum_values = args
+                    dbtype.bytes = 1
+                    if len(args) > 255:
+                        dbtype.bytes = 2
-                else:
-                    dbtype.bytes = int(args)

trunk/geniusql/test/test.py

@@ +1 @@
+import datetime
-import getopt
-import os
@@ -4 +5 @@
-import sys
-import unittest
+
+import geniusql
-
-
@@ -197 +200 @@
-
-
+class Provider(object):
+    
+    db = None
+    schema = None
+    logname = os.path.join(localDir, "geniusqltest.log")
+    
+    def geniusqllog(self, message):
+        """Geniusql logger (writes to error.log)."""
+        if isinstance(message, unicode):
+            message = message.encode('utf8')
+        s = "%s %s" % (datetime.datetime.now().isoformat(), message)
+        f = open(self.logname, 'ab')
+        f.write(s + '\n')
+        f.close()
+    
+    def setup(self, provider, opts):
+        """Set up storage for Zoo classes."""
+        self.db = geniusql.db(provider, **opts)
+        self.db.log = self.geniusqllog
+        print self.db.version()
+        self.db.create()
+        
+        self.schema = self.db.schema()
+        self.schema.create()
+
+    def teardown(self):
+        """Tear down storage for Zoo classes."""
+        try:
+            self.schema.drop()
+        except (AttributeError, NotImplementedError):
+            pass
+        try:
+            self.db.drop()
+        except (AttributeError, NotImplementedError):
+            pass
+        self.db.connections.shutdown()
+
+
-def run():
-    testList = [

trunk/geniusql/test/zoo_fixture.py

@@ -2 +2 @@
-
-import datetime
-import os
-thisdir = os.path.dirname(__file__)
-logname = os.path.join(thisdir, "geniusqltest.log")
-
-
@@ -22 +19 @@
-import geniusql
-from geniusql import errors, typerefs
-
+, test
-
-from geniusql import logic, logicfuncs
@@ -1534 +1531 @@
-##        self.arena.rename_property(Animal, "Species", "Family")
-
-
-db = None
-schema = None
-
-def _geniusqllog(message):
-    """Geniusql logger (writes to error.log)."""
-    if isinstance(message, unicode):
-        message = message.encode('utf8')
-    s = "%s %s" % (datetime.datetime.now().isoformat(), message)
-    f = open(logname, 'ab')
-    f.write(s + '\n')
-    f.close()
-
-def setup(provider, opts):
-    """Set up storage for Zoo classes."""
-    global db, schema
-    db = geniusql.db(provider, **opts)
-    db.log = _geniusqllog
-    print db.version()
-    db.create()
-    
-    schema = db.schema()
-    schema.create()
-
-def teardown():
-    """Tear down storage for Zoo classes."""
-    try:
-        schema.drop()
-    except (AttributeError, NotImplementedError):
-        pass
-    try:
-        db.drop()
-    except (AttributeError, NotImplementedError):
-        pass
-    db.connections.shutdown()
-
-def run(DB_class, opts):
@@ -1575 +1540 @@
-    
-    try:
-
-
+
+
+
+
+
+
-            loader = unittest.TestLoader().loadTestsFromTestCase
-            
@@ -1602 +1571 @@
-            if opts.get('name') != ':memory:' and 'isolation' not in skiptests:
-                tools.TestRunner.run(loader(IsolationTests))
-            
-##            tools.TestRunner.run(loader(DiscoveryTests))
-        except:
-            traceback.print_exc()
-    finally:
-
+provider.