diff options
| -rw-r--r-- | doc/build/dbengine.rst | 3 | ||||
| -rw-r--r-- | doc/build/reference/dialects/postgresql.rst | 5 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/postgresql/pg8000.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/postgresql/psycopg2.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/postgresql/pypostgresql.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/interfaces.py | 2 |
6 files changed, 11 insertions, 5 deletions
diff --git a/doc/build/dbengine.rst b/doc/build/dbengine.rst index bebfb27b9..637b85d48 100644 --- 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 67a6c1e0b..d0a04a704 100644 --- 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 862c915aa..6af2cbd76 100644 --- 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 ce000ae1b..aa5f8d32f 100644 --- 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 2e7ea201c..b8f7991d5 100644 --- 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 536d94658..10dd4d8e1 100644 --- 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)``. |