0fbe42a095
1.2.5
2014-01-02 14:15:03 -05:00
d34fac6814
Merge pull request #44 from emonty/master
...
Stop using distribute
2014-01-02 10:42:36 -08:00
7dd57dcf5f
Merge https://github.com/farcepest/MySQLdb1 into merge-upstream
2014-01-02 11:31:00 -06:00
b739fb06aa
Remove distribute_setup.py reference in MANIFEST
...
We're not using it anymore, remove the setuptools warning about it not
existing.
2014-01-02 11:29:02 -06:00
5ce7d5f8a6
Merge pull request #29 from msabramo/tox
...
Add tox.ini for tox (http://tox.testrun.org/ )
2013-11-21 13:36:48 -08:00
ed5e9e430d
Update .travis.yml
...
It seems Travis no longer supports Python 2.5.
2013-11-21 15:07:08 -05:00
d236bb7f6b
Merge pull request #26 from chipturner/master
...
Extend read_timeout support to also include write_timeouts
2013-11-21 12:00:56 -08:00
002bbb8cd6
Merge pull request #30 from msabramo/assertEquals
...
Change one assertTrue to assertEquals to get better failure output
2013-11-21 11:59:13 -08:00
95ae115c7d
Merge pull request #32 from methane/autocommit
...
More precise get_autocommit based on server_status.
2013-11-21 11:57:32 -08:00
9b0b59f1bb
Merge pull request #34 from tyzhnenko/test-and-fix-issue-33
...
Fix cut off SQL query when its contained `))`
2013-11-21 11:55:10 -08:00
76037a2703
Merge pull request #35 from methane/static
...
remove -lmysqlclient when static linking.
2013-11-21 11:53:34 -08:00
44f8b4d2b9
Merge pull request #36 from Multiposting/master
...
Fix the conversion of list or tuple args to SQL.
2013-11-21 11:52:42 -08:00
a7c3ce49fc
Merge pull request #38 from olive-oasis/master
...
microsecond-bug-fix for datetime.datetime
2013-11-21 11:46:46 -08:00
fb1c79d85a
microsecond-bug-fix
...
When the MySQL Datetime Fraction is less than 6, microseconds set
incorrectly. For example, you set the field, Datetime(3). Then this
library read the time `2013-11-07 10:27:35.705` as `2013-11-08
10:27:35.000705`.
2013-11-08 12:18:55 +09:00
100485f627
microsecond-bug-fix for datetime.datetime
2013-11-08 11:51:31 +09:00
8096d8c053
Also fix executemany().
2013-11-05 11:34:43 +01:00
8bef3359fb
Syntax fix for python 2.5 support.
2013-11-05 11:01:22 +01:00
87d1145c0d
Fix the conversion of list or tuple args to a SQL.
...
When there is one element on the list, the generated SQL was
(1,) (python notation of a single element tuple, which is not
valid in SQL.
2013-11-04 16:17:57 +01:00
0beb712e4b
remove -lmysqlclient when static linking.
2013-10-25 18:29:15 +09:00
052955e093
Fix cut off SQL query when its contained )), edit insert_values
...
regexp. Fixes issue #33 .
2013-10-07 12:35:13 +03:00
2204283605
Remove unused variable.
2013-10-02 02:17:48 +09:00
3dbf035fa5
More precise get_autocommit based on server_status.
2013-10-02 02:10:02 +09:00
a1dd63614f
tox.ini: Add ipdb as a dep because it's very useful for debugging
2013-09-30 16:24:18 -07:00
53ebb0fced
Change one assertTrue to assertEquals to get better failure output
2013-09-30 13:51:30 -07:00
e20b631d16
Add support for tox
2013-09-30 09:27:48 -07:00
7e73533dd9
Extend read_timeout support to also include write_timeouts
2013-08-23 13:10:07 -07:00
c8b2744ea2
Merge pull request #12 from KLab/autocommit_on
...
Support keyword argument to initially autocommit=on
2013-08-18 14:22:40 -07:00
39406ea3e0
Merge pull request #25 from tyzhnenko/microsecond-bug-fix
...
Fix problem in Datetime with microsecond returns (Issue #24 )
2013-08-18 14:21:12 -07:00
563ed10733
Merge pull request #18 from tseaver/do_not_force_distribute
...
If setuptools is importable, don't force use of 'distribute'.
2013-08-18 14:19:53 -07:00
0226f1a727
Fix problem with return None if Datetime field contained microsecond (Issue #24 )
2013-07-15 18:11:07 +03:00
bd95bd9d9c
Replace raise Error with distutils exception.
...
Distutils has an exceptions heirarchy. Use it.
2013-06-23 18:18:20 -04:00
0d1dd6fa89
Remove distribute dependency.
...
Distribute has been merged with upstream setuptools. The two are
incompatible now, so MySQL-python is uninstallable on systems
with setuptools >= 0.7 installed.
2013-06-23 18:16:17 -04:00
a050932372
If setuptools is importable, don't force use of 'distribute'.
...
Allows use of post-merge setuptools 0.7.
2013-06-14 13:34:07 -04:00
f064692a36
'BEGIN' on __enter__ if autocommit is enabled.
2013-05-22 22:33:20 +09:00
470eb56c4d
Fix typo.
2013-05-21 13:32:23 +09:00
c1b8e8a047
autocommit=None means using server default.
2013-05-21 12:09:55 +09:00
9b83342879
Merge branch 'master' of https://github.com/farcepest/MySQLdb1 into autocommit_on
2013-02-01 02:11:40 +09:00
63ab17980d
Merge pull request #8 from KLab/cleanup
...
Extraneous blank line removal and other small spacing cleanups.
2013-01-31 06:40:15 -08:00
797d9c3029
Support autocommit=True for constructor argument.
2013-01-05 09:34:59 +09:00
52894fd137
remove unused lines.
2013-01-05 09:19:43 +09:00
ad119309fc
Version bump
2013-01-01 17:14:08 -05:00
e31811673b
Version bump
2012-11-02 11:51:32 -04:00
49f8ab9689
Fix some broken types module references.
2012-11-02 11:29:59 -04:00
933e4d599f
Tell Travis to start testing PyPy as well.
2012-10-17 18:37:26 -04:00
369810dff7
PyPy fixes, and probably some reference issues for CPython too.
...
Derived from a patch at https://bitbucket.org/pypy/compatibility/wiki/edit/mysql-python
2012-10-17 18:30:19 -04:00
c9b282f8b5
Version bump.
2012-10-11 10:05:28 -04:00
b144911dfb
Merge branch 'sphinx' into MySQLdb-1.2
2012-10-11 09:57:21 -04:00
fc0c03aaae
Misplaced conditional comma. Fixes issue #6 .
2012-10-11 09:50:33 -04:00
9f36ea2553
Removing the download_url as the source is available on PyPi.
2012-10-08 14:21:43 -04:00
026d20dffc
HISTORY update
2012-10-08 14:07:50 -04:00
