summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2009-12-26 23:01:43 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2009-12-26 23:01:43 +0000
commitb4977c9ba8f606fb451855832a755b46c105a545 (patch)
tree8cba78cd5807a89f738b27a81d9b6c9b5b40b7cf
parent7685cc19367e77b4a428936eafc767770eaf6163 (diff)
downloadsqlalchemy-b4977c9ba8f606fb451855832a755b46c105a545.tar.gz
- only on oracle for that testrel_0_5_7
- replace that silly ASCII art thing with the jpg from 0.6
-rw-r--r--doc/build/intro.rst17
-rw-r--r--doc/build/sqla_arch_small.jpgbin0 -> 41140 bytes
-rw-r--r--doc/build/static/docs.css5
-rw-r--r--test/dialect/test_oracle.py4
4 files changed, 11 insertions, 15 deletions
diff --git a/doc/build/intro.rst b/doc/build/intro.rst
index e491b6561..6438cb078 100644
--- 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
index 000000000..2976030d7
--- /dev/null
+++ b/doc/build/sqla_arch_small.jpg
Binary files differ
diff --git a/doc/build/static/docs.css b/doc/build/static/docs.css
index 810c51410..ac6a550fe 100644
--- 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 de04beb39..88a211ca1 100644
--- 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(