[Checkins] SVN: relstorage/trunk/ - Include all test subpackages in setup.py.

[Shane Hathaway]

Log message for revision 108658:
  - Include all test subpackages in setup.py.
  
  - Raise an error if MySQL reverts to MyISAM rather than using the InnoDB
    storage engine.
  
  

Changed:
  U   relstorage/trunk/CHANGES.txt
  U   relstorage/trunk/MANIFEST.in
  U   relstorage/trunk/relstorage/adapters/schema.py
  U   relstorage/trunk/setup.py

-=-
Modified: relstorage/trunk/CHANGES.txt
===================================================================
--- relstorage/trunk/CHANGES.txt	2010-01-30 20:01:21 UTC (rev 108657)
+++ relstorage/trunk/CHANGES.txt	2010-01-30 20:55:26 UTC (rev 108658)
@@ -1,8 +1,10 @@
-Next Release
-------------
+1.4.0b2 (2010-01-30)
+--------------------
 
-- ...
+- Include all test subpackages in setup.py.
 
+- Raise an error if MySQL reverts to MyISAM rather than using the InnoDB
+  storage engine.
 
 1.4.0b1 (2009-11-17)
 --------------------

Modified: relstorage/trunk/MANIFEST.in
===================================================================
--- relstorage/trunk/MANIFEST.in	2010-01-30 20:01:21 UTC (rev 108657)
+++ relstorage/trunk/MANIFEST.in	2010-01-30 20:55:26 UTC (rev 108658)
@@ -1,2 +1,2 @@
 include MANIFEST.in *.txt *.py *.patch
-recursive-include relstorage *.py *.xml
+recursive-include relstorage *.py *.xml *.txt

Modified: relstorage/trunk/relstorage/adapters/schema.py
===================================================================
--- relstorage/trunk/relstorage/adapters/schema.py	2010-01-30 20:01:21 UTC (rev 108657)
+++ relstorage/trunk/relstorage/adapters/schema.py	2010-01-30 20:55:26 UTC (rev 108658)
@@ -763,7 +763,20 @@
     def list_sequences(self, cursor):
         return []
 
+    def check_compatibility(self, cursor, tables):
+        super(MySQLSchemaInstaller, self).check_compatibility(cursor, tables)
+        stmt = "SHOW TABLE STATUS LIKE 'object_state'"
+        cursor.execute(stmt)
+        for row in cursor:
+            for col_index, col in enumerate(cursor.description):
+                if col[0].lower() == 'engine':
+                    engine = row[col_index]
+                    if engine.lower() != 'innodb':
+                        raise StorageError(
+                            "The object_state must use the InnoDB engine, "
+                            "but it is using the %s engine." % engine)
 
+
 class OracleSchemaInstaller(AbstractSchemaInstaller):
     implements(ISchemaInstaller)
 

Modified: relstorage/trunk/setup.py
===================================================================
--- relstorage/trunk/setup.py	2010-01-30 20:01:21 UTC (rev 108657)
+++ relstorage/trunk/setup.py	2010-01-30 20:55:26 UTC (rev 108658)
@@ -13,7 +13,7 @@
 ##############################################################################
 """A backend for ZODB that stores pickles in a relational database."""
 
-VERSION = "1.4.1dev"
+VERSION = "1.4.0b2"
 
 # The choices for the Trove Development Status line:
 # Development Status :: 5 - Production/Stable
@@ -71,7 +71,13 @@
     maintainer="Shane Hathaway",
     maintainer_email="shane at hathawaymix.org",
     url="http://pypi.python.org/pypi/RelStorage",
-    packages=['relstorage', 'relstorage.adapters', 'relstorage.tests'],
+    packages=[
+        'relstorage',
+        'relstorage.adapters',
+        'relstorage.adapters.tests',
+        'relstorage.tests',
+        'relstorage.tests.blob',
+        ],
     package_data={
         'relstorage': ['component.xml'],
     },