diff options
| author | Sławek Ehlert <slafs@op.pl> | 2015-01-27 22:04:38 +0100 |
|---|---|---|
| committer | Sławek Ehlert <slafs@op.pl> | 2015-01-27 22:04:38 +0100 |
| commit | 57b2bd5dcba6140b511c898c0f682234f13d5c51 (patch) | |
| tree | a0899b2a35d27e177001b163054c3c9a8f7f1c06 /doc/build/dialects | |
| parent | 6a1f16d09958e549502a0991890d64964c71b357 (diff) | |
| parent | 8aaa8dd6bdfb85fa481efa3115b9080d935d344c (diff) | |
| download | sqlalchemy-pr/152.tar.gz | |
Merge branch 'master' into oracle-servicename-optionpr/152
Diffstat (limited to 'doc/build/dialects')
| -rw-r--r-- | doc/build/dialects/postgresql.rst | 15 | ||||
| -rw-r--r-- | doc/build/dialects/sqlite.rst | 2 |
2 files changed, 12 insertions, 5 deletions
diff --git a/doc/build/dialects/postgresql.rst b/doc/build/dialects/postgresql.rst index e1a96493e..e5d8d51bc 100644 --- a/doc/build/dialects/postgresql.rst +++ b/doc/build/dialects/postgresql.rst @@ -188,17 +188,24 @@ psycopg2 .. automodule:: sqlalchemy.dialects.postgresql.psycopg2 +pg8000 +-------------- + +.. automodule:: sqlalchemy.dialects.postgresql.pg8000 + +psycopg2cffi +-------------- + +.. automodule:: sqlalchemy.dialects.postgresql.psycopg2cffi + py-postgresql -------------------- .. automodule:: sqlalchemy.dialects.postgresql.pypostgresql -pg8000 --------------- - -.. automodule:: sqlalchemy.dialects.postgresql.pg8000 zxjdbc -------------- .. automodule:: sqlalchemy.dialects.postgresql.zxjdbc + diff --git a/doc/build/dialects/sqlite.rst b/doc/build/dialects/sqlite.rst index a18b0ba7b..93a54ee8d 100644 --- a/doc/build/dialects/sqlite.rst +++ b/doc/build/dialects/sqlite.rst @@ -33,4 +33,4 @@ Pysqlite Pysqlcipher ----------- -.. automodule:: sqlalchemy.dialects.sqlite.pysqlcipher
\ No newline at end of file +.. automodule:: sqlalchemy.dialects.sqlite.pysqlcipher |