summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Unicode support for psycopg2 native hstore implementationpr/2Dmitry Mugtasimov2013-05-281-1/+2
|
* Merge branch 'master' into rel_0_8Mike Bayer2013-05-282-1/+8
|\
| * Fixed a small bug in the dogpile example where the generationMike Bayer2013-05-282-1/+8
| | | | | | | | | | of SQL cache keys wasn't applying deduping labels to the statement the same way :class:`.Query` normally does.
* | Merge branch 'master' into rel_0_8Mike Bayer2013-05-265-6/+8
|\ \ | |/
| * fix this testMike Bayer2013-05-262-2/+2
| |
| * Merge pull request #1 from cjw296/small-fixesmike bayer2013-05-264-5/+7
| |\ | | | | | | Small fixes
| | * tweaks to ignorespr/1Chris Withers2013-05-261-2/+3
| | |
| | * Show the conflicting column in the warning!Chris Withers2013-05-261-2/+2
| | |
| | * fix incorrect method nameChris Withers2013-05-261-1/+1
| | |
| | * Add missing import that caused test_notice_logging to fail if this suite was ↵Chris Withers2013-05-261-0/+1
| | | | | | | | | | | | run on its own.
| * | - fixing AbstractConcreteBase import in docstring, [ticket:2717]Diana Clarke2013-05-261-1/+1
| |/
* | - fixing AbstractConcreteBase import in docstring, 0.8diana2013-05-261-1/+1
| | | | | | branch, [ticket:2717]
* | Merge branch 'master' into rel_0_8Mike Bayer2013-05-253-108/+11
|\ \ | |/
| * - move to git dotfilesMike Bayer2013-05-253-108/+11
| |
* | merge defaultMike Bayer2013-05-233-26/+52
|\ \ | |/
| * Fixed a bug where the routine to detect the correct kwargsMike Bayer2013-05-233-26/+52
| | | | | | | | | | | | being sent to :func:`.create_engine` would fail in some cases, such as with the Sybase dialect. [ticket:2732]
* | merge defaultMike Bayer2013-05-154-0/+35
|\ \ | |/
| * Regression from this ticket caused the unsupported keywordMike Bayer2013-05-154-0/+35
| | | | | | | | | | | | "true" to render, added logic to convert this to 1/0 for SQL server. [ticket:2682]
* | merge defaultMike Bayer2013-05-133-1/+72
|\ \ | |/
| * Fixed a regression from 0.7 caused by this ticket, whichMike Bayer2013-05-133-1/+72
| | | | | | | | | | | | | | | | made the check for recursion overflow in self-referential eager joining too loose, missing a particular circumstance where a subclass had lazy="joined" or "subquery" configured and the load was a "with_polymorphic" against the base. [ticket:2481]
* | merge defaultMike Bayer2013-05-101-20/+53
|\ \ | |/
| * - moderinzed the docs for the foreign_keys parameter a bit,Mike Bayer2013-05-101-20/+53
| | | | | | | | [ticket:2725]
* | merge defaultMike Bayer2013-05-051-17/+20
|\ \ | |/
| * - cleanupMike Bayer2013-05-051-17/+20
| | | | | | | | - move the timeout here to 14 seconds as jenkins still chokes occasionally
* | merge defaultMike Bayer2013-05-044-227/+257
|\ \ | |/
| * cleanupMike Bayer2013-05-041-32/+60
| |
| * cleanupMike Bayer2013-05-041-79/+78
| |
| * cleanupMike Bayer2013-05-041-67/+68
| |
| * formatting stuffMike Bayer2013-05-041-49/+51
| |
* | merge defaultMike Bayer2013-05-012-2/+6
|\ \ | |/
| * - disable tests failing with pypy2, [ticket:2719]Mike Bayer2013-05-012-2/+6
| |
* | merge defaultMike Bayer2013-04-304-6/+79
|\ \ | |/
| * - Fixed a regression from 0.7 where the contextmanager featureMike Bayer2013-04-303-4/+77
| | | | | | | | | | | | | | of :meth:`.Session.begin_nested` would fail to correctly roll back the transaction when a flush error occurred, instead raising its own exception while leaving the session still pending a rollback. [ticket:2718]
| * missing commaMike Bayer2013-04-301-2/+2
| |
* | merge defaultMike Bayer2013-04-291-1/+1
|\ \ | |/
| * bumpMike Bayer2013-04-291-1/+1
| |
* | merge defaultMike Bayer2013-04-293-14/+18
|\ \ | |/
| * Updated mysqlconnector dialect to check for disconnect basedMike Bayer2013-04-293-14/+18
| | | | | | | | | | on the apparent string message sent in the exception; tested against mysqlconnector 1.0.9.
* | merge defaultMike Bayer2013-04-291-26/+15
|\ \ | |/
| * - fix long-outdated documentation for sql_mode/ansiquotes,Mike Bayer2013-04-291-26/+15
| | | | | | | | closes [ticket:1552]
| * merge rel_0_8Mike Bayer2013-04-273-2/+4
| |\ | |/ |/|
* | Added tag rel_0_8_1 for changeset 2cf49d898d3a10d1c7a5ac87dd015691d51f9248Mike Bayer2013-04-271-0/+1
| |
* | 0.8.1rel_0_8_1Mike Bayer2013-04-272-2/+3
| |
* | merge defaultMike Bayer2013-04-2715-81/+101
|\ \ | |/
| * modernize some more examplesMike Bayer2013-04-2710-71/+80
| |
| * - add documentation note for [ticket:1841]Mike Bayer2013-04-271-1/+3
| |
| * the callcount went up here, still less than with no C extensions, not preparedMike Bayer2013-04-261-7/+7
| | | | | | | | to worry about it too much
| * oracle doesn't have TRUE/FALSE, put 1/0 here, see how that goesMike Bayer2013-04-261-0/+6
| |
| * need to test for (list, tuple) here and not hasattr("__iter__")Mike Bayer2013-04-261-1/+4
| | | | | | | | since Py3K strings have __iter__
| * fix here, was only failing in the py3k versionMike Bayer2013-04-261-1/+1
| |