Mike Bayer 68f1bcc9da Merge branch 'master' into ticket_3100 ...

Conflicts:
	lib/sqlalchemy/orm/persistence.py

2014-11-06 17:43:01 -05:00

..

aaa_profiling

- The :func:~.expression.column and :func:~.expression.table

2014-09-01 20:19:54 -04:00

base

- Exception messages have been spiffed up a bit. The SQL statement

2014-10-17 19:37:45 -04:00

dialect

- this test passes now in more recent mysqlconnector

2014-10-13 12:34:41 -04:00

engine

- control the module name of the exception here for py3k compat

2014-10-19 13:37:48 -04:00

ext

- Fixed "'NoneType' object has no attribute 'concrete'" error

2014-10-06 18:33:05 -04:00

orm

Merge branch 'master' into ticket_3100

2014-11-06 17:43:01 -05:00

perf

- delete the file first here so this is deterministic

2014-09-05 16:28:32 -04:00

sql

- Fixed bug regarding expression mutations which could express

2014-11-05 04:22:30 -05:00

__init__.py

…

binary_data_one.dat

…

binary_data_two.dat

…

conftest.py

- remove some crufty old testing options

2014-09-14 21:41:13 -04:00

profiles.txt

- Mysqlconnector as of version 2.0, probably as a side effect of

2014-10-12 20:14:32 -04:00

requirements.py

- added new backend for pysqlcipher, as we will probably get

2014-10-29 14:55:42 -04:00