- only on oracle for that test

- replace that silly ASCII art thing with the jpg from 0.6

diff --git a/doc/build/intro.rst b/doc/build/intro.rst
index e491b6561d0519440eb4939add64b1e83c08bba2..6438cb078d0de41e1909229251e695e9558c0afd 100644 (file)
--- a/doc/build/intro.rst
+++ b/doc/build/intro.rst
@@ -8,20 +8,9 @@ Overview
 ========
 
 
-The SQLAlchemy SQL Toolkit and Object Relational Mapper is a comprehensive set of tools for working with databases and Python.  It has several distinct areas of functionality which can be used individually or combined together.  Its major API components, all public-facing, are illustrated below::
-
-               +-----------------------------------------------------------+
-               |             Object Relational Mapper (ORM)                |
-               +-----------------------------------------------------------+
-               +---------+ +------------------------------------+ +--------+
-               |         | |       SQL Expression Language      | |        |
-               |         | +------------------------------------+ |        |
-               |         +-----------------------+ +--------------+        |
-               |        Dialect/Execution        | |    Schema Management  |
-               +---------------------------------+ +-----------------------+
-               +----------------------+ +----------------------------------+
-               |  Connection Pooling  | |              Types               |
-               +----------------------+ +----------------------------------+
+The SQLAlchemy SQL Toolkit and Object Relational Mapper is a comprehensive set of tools for working with databases and Python.  It has several distinct areas of functionality which can be used individually or combined together.  Its major components are illustrated below.  The arrows represent the general dependencies of components:
+
+.. image:: sqla_arch_small.jpg
 
 Above, the two most significant front-facing portions of SQLAlchemy are the **Object Relational Mapper** and the **SQL Expression Language**.  These are two separate toolkits, one building off the other.  SQL Expressions can be used independently of the ORM.  When using the ORM, the SQL Expression language is used to establish object-relational configurations as well as in querying.
 

diff --git a/doc/build/sqla_arch_small.jpg b/doc/build/sqla_arch_small.jpg
new file mode 100644 (file)
index 0000000..2976030
Binary files /dev/null and b/doc/build/sqla_arch_small.jpg differ

diff --git a/doc/build/static/docs.css b/doc/build/static/docs.css
index 810c51410fdfc95454509a9aaa548fdf035536e6..ac6a550fe76c74e04c58659d0c0b9bf215fed93b 100644 (file)
--- a/doc/build/static/docs.css
+++ b/doc/build/static/docs.css
@@ -68,6 +68,11 @@ h1, h2, h3, h4, h5 {
     font-size: 1.4em;
 }
 
+.document img {
+    display:block;
+    margin: 0 auto;
+}
+
 .document h1 {
     display:none;
 }

diff --git a/test/dialect/test_oracle.py b/test/dialect/test_oracle.py
index de04beb394f29105bbdcb71c516a66985db63a03..88a211ca1471c27bca90dd0145d702113d5ebf6e 100644 (file)
--- a/test/dialect/test_oracle.py
+++ b/test/dialect/test_oracle.py
@@ -399,7 +399,9 @@ class TypesTest(TestBase, AssertsCompiledSQL):
             
 class DontReflectIOTTest(TestBase):
     """test that index overflow tables aren't included in table_names."""
-    
+   
+    __only_on__ = 'oracle'
+ 
     def setup(self):
         testing.db.execute("""
         CREATE TABLE admin_docindex(