- PG doc updates

- pypostgresql has 15 errors, 3 failures, this probably
puts it in the "yes" as opposed to the "partial" support
category.  [ticket:1850]

diff --git a/doc/build/dbengine.rst b/doc/build/dbengine.rst
index bebfb27b927f555e47b56ae3b76e588c3ccfe8c6..637b85d48ff19a558807b986582f0e1e064831d4 100644 (file)
--- a/doc/build/dbengine.rst
+++ b/doc/build/dbengine.rst
@@ -103,7 +103,7 @@ cx_oracle_                 ``oracle+cx_oracle``\*       yes          development
 pg8000_                    ``postgresql+pg8000``        yes          yes           no           yes                yes
 `PostgreSQL JDBC Driver`_  ``postgresql+zxjdbc``        no           no            yes          yes                yes
 psycopg2_                  ``postgresql+psycopg2``\*    yes          development   no           yes                yes
-pypostgresql_              ``postgresql+pypostgresql``  no           partial       no           yes                yes
+pypostgresql_              ``postgresql+pypostgresql``  no           yes           no           yes                yes
 **SQLite**
 pysqlite_                  ``sqlite+pysqlite``\*        yes          yes           no           yes                yes
 sqlite3_                   ``sqlite+pysqlite``\*        yes          yes           no           yes                yes
@@ -154,6 +154,7 @@ Dialect names include the identifying name of the SQLAlchemy dialect which inclu
     pg_db = create_engine('postgresql://scott:tiger@localhost/mydatabase')
     pg_db = create_engine('postgresql+psycopg2://scott:tiger@localhost/mydatabase')
     pg_db = create_engine('postgresql+pg8000://scott:tiger@localhost/mydatabase')
+    pg_db = create_engine('postgresql+pypostgresql://scott:tiger@localhost/mydatabase')
 
     # postgresql on Jython
     pg_db = create_engine('postgresql+zxjdbc://scott:tiger@localhost/mydatabase')

diff --git a/doc/build/reference/dialects/postgresql.rst b/doc/build/reference/dialects/postgresql.rst
index 67a6c1e0bb8cb5d2054ede3a471b9d54a04e2a34..d0a04a7041fd53c5840dc60a91c2ac4d4b112e15 100644 (file)
--- a/doc/build/reference/dialects/postgresql.rst
+++ b/doc/build/reference/dialects/postgresql.rst
@@ -57,6 +57,11 @@ psycopg2 Notes
 .. automodule:: sqlalchemy.dialects.postgresql.psycopg2
 
 
+py-postgresql Notes
+--------------------
+
+.. automodule:: sqlalchemy.dialects.postgresql.pypostgresql
+
 pg8000 Notes
 --------------
 

diff --git a/lib/sqlalchemy/dialects/postgresql/pg8000.py b/lib/sqlalchemy/dialects/postgresql/pg8000.py
index 862c915aa21a781abe0bd15d61b414205d9ac751..6af2cbd76d3ffbb01e113cbbaf7cc6443d85769d 100644 (file)
--- a/lib/sqlalchemy/dialects/postgresql/pg8000.py
+++ b/lib/sqlalchemy/dialects/postgresql/pg8000.py
@@ -4,7 +4,7 @@ Connecting
 ----------
 
 URLs are of the form
-`postgresql+pg8000://user:password@host:port/dbname[?key=value&key=value...]`.
+``postgresql+pg8000://user:password@host:port/dbname[?key=value&key=value...]``.
 
 Unicode
 -------

diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg2.py b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
index ce000ae1b154f491b069739900990c655ae66313..aa5f8d32fc3535b689315ea419e2a6b7683212ba 100644 (file)
--- a/lib/sqlalchemy/dialects/postgresql/psycopg2.py
+++ b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
@@ -17,7 +17,7 @@ By default, the Psycopg2 driver uses the ``psycopg2.extensions.UNICODE`` extensi
 Connecting
 ----------
 
-URLs are of the form `postgresql+psycopg2://user:password@host:port/dbname[?key=value&key=value...]`.
+URLs are of the form ``postgresql+psycopg2://user:password@host:port/dbname[?key=value&key=value...]``.
 
 psycopg2-specific keyword arguments which are accepted by :func:`~sqlalchemy.create_engine()` are:
 

diff --git a/lib/sqlalchemy/dialects/postgresql/pypostgresql.py b/lib/sqlalchemy/dialects/postgresql/pypostgresql.py
index 2e7ea201c614eeeac00841595db30d3cf1859b98..b8f7991d5f99b8f80a6351b681fb3adb65446b8e 100644 (file)
--- a/lib/sqlalchemy/dialects/postgresql/pypostgresql.py
+++ b/lib/sqlalchemy/dialects/postgresql/pypostgresql.py
@@ -3,7 +3,7 @@
 Connecting
 ----------
 
-URLs are of the form `postgresql+pypostgresql://user@password@host:port/dbname[?key=value&key=value...]`.
+URLs are of the form ``postgresql+pypostgresql://user@password@host:port/dbname[?key=value&key=value...]``.
 
 
 """

diff --git a/lib/sqlalchemy/orm/interfaces.py b/lib/sqlalchemy/orm/interfaces.py
index 536d9465883105161c5ac215e8b00e078de80526..10dd4d8e100affd3f6bf1b067a42e8e157dfc54d 100644 (file)
--- a/lib/sqlalchemy/orm/interfaces.py
+++ b/lib/sqlalchemy/orm/interfaces.py
@@ -278,7 +278,7 @@ class MapperExtension(object):
         guarantee that an UPDATE statement will be issued (although you can
         affect the outcome here).
         
-         To detect if the column-based attributes on the object have net
+        To detect if the column-based attributes on the object have net
         changes, and will therefore generate an UPDATE statement, use
         ``object_session(instance).is_modified(instance,
         include_collections=False)``.