Commit Graph

10240 Commits

Author SHA1 Message Date
Mike Bayer abc4331293 a few more oracle fixes 2013-05-26 17:39:53 -04:00
Mike Bayer 46b0b14fde cleanup for oracle 2013-05-26 17:37:03 -04:00
Mike Bayer 2ddcd20267 Merge branch 'master' into rel_0_9 2013-05-26 17:18:27 -04:00
Mike Bayer e2b8c893ca fix this test 2013-05-26 17:18:04 -04:00
Mike Bayer 4e930a7f78 - add a test specific to sqlite testing cursor.description encoding (should
probably be one in test_query or test_unicode...)
- fix up test_unitofwork
2013-05-26 16:58:37 -04:00
Mike Bayer b3654ee37a postgresql tests 2013-05-26 16:39:50 -04:00
Mike Bayer f939abe830 mysql tests 2013-05-26 16:32:55 -04:00
Mike Bayer eb06c142fc Merge branch 'master' into rel_0_9 2013-05-26 13:11:21 -04:00
Mike Bayer 740223d205 Merge branch 'rel_0_9' of bitbucket.org:zzzeek/sqlalchemy into rel_0_9 2013-05-26 13:10:31 -04:00
Mike Bayer 62c7e0dbe6 sqlite tests 2013-05-26 13:10:00 -04:00
Mike Bayer 3d75ff22d3 repair py3kisms in key ORM modules 2013-05-26 13:09:38 -04:00
Mike Bayer 00f2b19a55 extension tests 2013-05-26 13:09:05 -04:00
Mike Bayer 956c144c7f fix serializer tests. something is wrong with non-C pickle but for some reason py3k's pickle seems to be OK? not sure why that is, as this
is all related to http://bugs.python.org/issue998998
2013-05-26 13:08:24 -04:00
mike bayer bfc948e44b Merge pull request #1 from cjw296/small-fixes
Small fixes
2013-05-26 07:46:16 -07:00
diana cee8418899 - fixing AbstractConcreteBase import in docstring, 0.9
branch, [ticket:2717]
2013-05-26 10:19:26 -04:00
Diana Clarke 07d200166a - fixing AbstractConcreteBase import in docstring, [ticket:2717] 2013-05-26 10:10:22 -04:00
Chris Withers 3406deac19 tweaks to ignores 2013-05-26 14:49:42 +01:00
Chris Withers e8b4f0bc4a Show the conflicting column in the warning! 2013-05-26 13:05:59 +01:00
Chris Withers f5956fae6a fix incorrect method name 2013-05-26 13:05:56 +01:00
Chris Withers d630a2e6ef Add missing import that caused test_notice_logging to fail if this suite was run on its own. 2013-05-26 13:05:53 +01:00
Mike Bayer e9b29802ba Merge branch 'master' into rel_0_9 2013-05-25 17:04:35 -04:00
Mike Bayer 0a34160bf7 - move to git dotfiles 2013-05-25 16:20:59 -04:00
Mike Bayer 6e99c0b04e merge default 2013-05-23 13:02:33 -04:00
Mike Bayer 2eaae08f48 Fixed a bug where the routine to detect the correct kwargs
being sent to :func:`.create_engine` would fail in some cases,
such as with the Sybase dialect.
[ticket:2732]
2013-05-23 12:59:53 -04:00
Mike Bayer 2e75f668f3 merge default 2013-05-15 15:47:11 -04:00
Mike Bayer cfb0f9ca14 Regression from this ticket caused the unsupported keyword
"true" to render, added logic to convert this to 1/0
for SQL server.
[ticket:2682]
2013-05-15 15:46:29 -04:00
Mike Bayer 26657f92ec merge default 2013-05-13 16:13:51 -04:00
Mike Bayer f574bcf98d Fixed a regression from 0.7 caused by this ticket, which
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]
2013-05-13 16:13:15 -04:00
Mike Bayer b414d82df7 merge default 2013-05-10 01:06:30 -04:00
Mike Bayer f35be1d578 - moderinzed the docs for the foreign_keys parameter a bit,
[ticket:2725]
2013-05-10 01:06:10 -04:00
Mike Bayer cca97433c1 merge default 2013-05-05 01:42:26 -04:00
Mike Bayer 31792e86ae - cleanup
- move the timeout here to 14 seconds as jenkins still chokes occasionally
2013-05-05 01:39:35 -04:00
Mike Bayer 87ee86514e py3k specific syntax moved into an exec 2013-05-04 16:35:47 -04:00
Mike Bayer 04ccdcacda cleanup 2013-05-04 16:26:10 -04:00
Mike Bayer 4afe258556 cleanup 2013-05-04 16:25:35 -04:00
Mike Bayer 220fa91337 most of ORM passing... 2013-05-04 16:23:27 -04:00
Mike Bayer 8be6831f8b base 2013-05-04 16:00:05 -04:00
Mike Bayer 021b5143e6 that's all of engine 2013-05-04 15:57:03 -04:00
Mike Bayer 6c8b8da877 cleanup 2013-05-04 15:35:47 -04:00
Mike Bayer ef629e7b3d cleanup 2013-05-04 15:35:47 -04:00
Mike Bayer 920e134d53 test_execute up for sqlite, pg, oursql, mysql 2.7 + 3.3 2013-05-04 15:29:04 -04:00
Mike Bayer c7ce62cf65 - OK we have -w sql passing for: sqlite, postgresql, oursql 2.7 + 3.3, mysqldb 2.7 2013-05-04 15:26:28 -04:00
Mike Bayer afcbd7419c and int types here... 2013-05-04 15:10:41 -04:00
Mike Bayer 2a8fcfaa42 update test 2013-05-04 15:09:04 -04:00
Mike Bayer ee9723d7d7 cleanup 2013-05-04 15:08:08 -04:00
Mike Bayer 9db36c36aa cleanup and formatting 2013-05-04 15:06:47 -04:00
Mike Bayer 2a99b770dd - unicode literals need to just be handled differently if they have utf-8
encoded in them vs. unicode escaping.  not worth figuring out how to combine
these right now
2013-05-04 14:59:26 -04:00
Mike Bayer 6f82c320b8 use logging to output exc_info here 2013-05-04 14:24:20 -04:00
Mike Bayer e9ea5acc51 formatting stuff 2013-05-04 14:23:29 -04:00
Mike Bayer 8f9b7ad31f formatting stuff 2013-05-04 14:23:29 -04:00