Commit Graph

523 Commits

Author SHA1 Message Date
Dima Tyzhnenko
052955e093 Fix cut off SQL query when its contained )), edit insert_values
regexp. Fixes issue #33.
2013-10-07 12:35:13 +03:00
Andy Dustman
c8b2744ea2 Merge pull request #12 from KLab/autocommit_on
Support keyword argument to initially autocommit=on
2013-08-18 14:22:40 -07:00
Andy Dustman
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
Andy Dustman
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
Dima Tyzhnenko
0226f1a727 Fix problem with return None if Datetime field contained microsecond (Issue #24) 2013-07-15 18:11:07 +03:00
Tres Seaver
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
INADA Naoki
f064692a36 'BEGIN' on __enter__ if autocommit is enabled. 2013-05-22 22:33:20 +09:00
INADA Naoki
470eb56c4d Fix typo. 2013-05-21 13:32:23 +09:00
INADA Naoki
c1b8e8a047 autocommit=None means using server default. 2013-05-21 12:09:55 +09:00
INADA Naoki
9b83342879 Merge branch 'master' of https://github.com/farcepest/MySQLdb1 into autocommit_on 2013-02-01 02:11:40 +09:00
Andy Dustman
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
INADA Naoki
797d9c3029 Support autocommit=True for constructor argument. 2013-01-05 09:34:59 +09:00
INADA Naoki
52894fd137 remove unused lines. 2013-01-05 09:19:43 +09:00
farcepest
ad119309fc Version bump MySQLdb-1.2.4 2013-01-01 17:14:08 -05:00
farcepest
e31811673b Version bump MySQLdb-1.2.4c1 2012-11-02 11:51:32 -04:00
farcepest
49f8ab9689 Fix some broken types module references. 2012-11-02 11:29:59 -04:00
farcepest
933e4d599f Tell Travis to start testing PyPy as well. 2012-10-17 18:37:26 -04:00
farcepest
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
farcepest
c9b282f8b5 Version bump. MySQLdb-1.2.4b5 2012-10-11 10:05:28 -04:00
farcepest
b144911dfb Merge branch 'sphinx' into MySQLdb-1.2 2012-10-11 09:57:21 -04:00
farcepest
fc0c03aaae Misplaced conditional comma. Fixes issue #6. 2012-10-11 09:50:33 -04:00
farcepest
9f36ea2553 Removing the download_url as the source is available on PyPi. 2012-10-08 14:21:43 -04:00
farcepest
026d20dffc HISTORY update 2012-10-08 14:07:50 -04:00
farcepest
a34cd2a9a0 Merge remote-tracking branch 'remotes/evax/utf8mb4' into MySQLdb-1.2 2012-10-08 14:02:42 -04:00
Evax Software
030d175754 Use db.unicode_literal.charset in cursors.py 2012-10-08 19:16:01 +02:00
farcepest
0f8d86cc87 Prep for 1.2.4b4 release MySQLdb-1.2.4b4 2012-10-08 11:47:09 -04:00
farcepest
2325200a7d Revert to using utf8 for default testing setup as utf8mb4 is not ubiquitous. 2012-10-08 11:37:35 -04:00
farcepest
c53d95fdd6 Update HISTORY 2012-10-08 11:34:48 -04:00
farcepest
451f88ef82 Doc overhaul with sphinx 2012-10-08 11:32:11 -04:00
Evax Software
9eb906e8a7 Map utf8mb4 to utf8 in python 2012-10-08 17:25:14 +02:00
farcepest
7d4993a53c Workaround for recommended MySQL 5.5 utf8mb4 character set, which is not recognized by Python yet. 2012-10-05 14:01:51 -04:00
farcepest
f982ab42f5 Merge remote-tracking branch 'origin/MySQLdb-1.2' into MySQLdb-1.2 2012-10-04 14:32:33 -04:00
Jean Schurger
119b6b2c97 Merge with jeansch/master 2012-10-04 14:32:06 -04:00
farcepest
4f9d95bc5a Merge branch 'jensch-master' into MySQLdb-1.2 2012-10-04 14:20:06 -04:00
farcepest
4e6c7c0e08 Remove obsolete setuptools bootstrap 2012-10-04 13:48:09 -04:00
Jean Schurger
417088a3aa Exposed 'read_timeout' option. 2012-10-04 13:45:26 -04:00
farcepest
36b8d1d4e8 Restore README.md, rename the old README as INSTALL 2012-10-04 13:43:11 -04:00
Evax Software
7a846cf5e3 Allow pip install from git
Merged with modifications from a815269010
2012-10-04 13:34:39 -04:00
farcepest
0164ffeb25 Let's not forget history... 2012-10-03 14:11:05 -04:00
farcepest
973660bdc6 Version 1.2.4b3 MySQLdb-1.2.4b3 2012-10-03 13:34:33 -04:00
André Malo
cd44524fef Patch 4/4: Fix TEXT vs. BLOB conversion.
This patch assumes an applied patch 3 (https://sourceforge.net/p/mysql-python/patches/79/). Looks a bit like a hack, but the infrastructure doesn't seem to allow anything else. And it works here very well. I'm not sure, how it works with very old mysql versions (<= 4.0).

https://sourceforge.net/p/mysql-python/patches/80/
2012-10-03 13:20:19 -04:00
André Malo
c05a2c6a50 Patch 3/4: _mysql.c reference counting and exception issues
This patch fixes a reference leak and improves the error handling in the converter mapping code. Rather accidentially it also drops the cleanup: label and the gotos ;)

https://sourceforge.net/p/mysql-python/patches/79/
2012-10-03 13:17:35 -04:00
André Malo
1c33baf352 Patch 2/4: executemany-regex improvement. It should match better and faster now. It also may be more readable.
https://sourceforge.net/p/mysql-python/patches/78/
2012-10-03 13:15:38 -04:00
André Malo
a7f55a5d6a Patch 1/4: Minor exception handling improvements (don't swallow program exits)
https://sourceforge.net/p/mysql-python/patches/77/
2012-10-03 13:10:25 -04:00
farcepest
fa248cf608 Merge branch 'master' into MySQLdb-1.2 2012-10-02 14:56:05 -04:00
farcepest
8685efce82 I don't know how this got lost. Git makes me feel like a git. 2012-10-02 14:53:29 -04:00
farcepest
080902e21e Merge remote-tracking branch 'origin/master'
Conflicts:
	.travis.yml
	MySQLdb/tests/test_MySQLdb_capabilities.py
	MySQLdb/tests/test_MySQLdb_dbapi20.py
	MySQLdb/tests/test_MySQLdb_nonstandard.py
2012-10-02 14:39:15 -04:00
farcepest
e2c396c245 README rewrite 2012-10-02 14:15:59 -04:00
farcepest
a6dcb3b683 Travis testing fixes
Squashed commit of the following:

commit 17fb6798cd
Author: farcepest <farcepest@gmail.com>
Date:   Tue Oct 2 14:03:57 2012 -0400

    Add a build status widget for Travis

commit 1cd83ef78e
Author: farcepest <farcepest@gmail.com>
Date:   Tue Oct 2 13:59:48 2012 -0400

    Rewrite the repository root README

commit 72848c84bc
Author: farcepest <farcepest@gmail.com>
Date:   Tue Oct 2 13:50:00 2012 -0400

    Somehow I missed this connection setup

commit 413c3b6623
Author: farcepest <farcepest@gmail.com>
Date:   Tue Oct 2 13:19:09 2012 -0400

    Giving Travis it's own database with utf8 charset in hopes this will fix the callproc test (which works everywhere else)

commit 400112e0c3
Author: farcepest <farcepest@gmail.com>
Date:   Tue Oct 2 13:06:00 2012 -0400

    Update the Travis config so that the tests use the correct database configuration file

commit ae94e44ed1
Author: farcepest <farcepest@gmail.com>
Date:   Tue Oct 2 12:59:29 2012 -0400

    Add Travis-specific configuration file

commit 3581603f45
Merge: f42c369 d0e96c7
Author: farcepest <farcepest@gmail.com>
Date:   Tue Oct 2 12:58:00 2012 -0400

    Merge branch 'master' into MySQLdb-1.2

    Conflicts:
    	MySQLdb/tests/test_MySQLdb_capabilities.py
    	MySQLdb/tests/test_MySQLdb_dbapi20.py

commit f42c369300
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:43:00 2012 -0400

    Maybe a subshell will do the trick?

commit fb346e1d40
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:35:50 2012 -0400

    Travis can't build for Python 2.4 it seems, and the test still weren't all running

commit 2f661f0991
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:31:40 2012 -0400

    OK, this should hopefully fix the build process for Travis

commit 899c3342b2
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:28:14 2012 -0400

    More Travis fixes

commit 8f593def7b
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:19:39 2012 -0400

    Fix test script due to source being down one level.

commit 1936b93cf0
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:14:38 2012 -0400

    Test connection tweaks for Travis

commit 9bf8bcf894
Merge: 7ae4f55 d551f8a
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:10:58 2012 -0400

    Merge branch 'travis' into MySQLdb-1.2

commit d551f8a8d9
Author: Andy Dustman <farcepest@gmail.com>
Date:   Mon Oct 1 13:05:25 2012 -0400

    Initial Travis setup

commit 7ae4f5549b
Merge: 235d846 c16bc33
Author: farcepest <farcepest@gmail.com>
Date:   Thu Sep 27 12:49:07 2012 -0400

    Merge remote-tracking branch 'origin/MySQLdb-1.2' into MySQLdb-1.2

commit 235d8466dd
Author: farcepest <farcepest@gmail.com>
Date:   Thu Sep 27 12:18:07 2012 -0400

    History updates for 1.2.4b2

commit 5fda4c2579
Author: farcepest <farcepest@gmail.com>
Date:   Thu Sep 27 12:06:58 2012 -0400

    Revert raise exc as value statements to raise exc, value since it breaks Python < 2.6.

commit 048b70d901
Author: farcepest <farcepest@gmail.com>
Date:   Wed Sep 26 16:02:05 2012 -0400

    Fix MySQLdb1-1 Exception format incompatible with previous versions

    Unfortunately, when I broke this, I broke the test at the same time. That should have been a red flag.

commit 162e9e4d84
Author: Andy Dustman <farcepest@gmail.com>
Date:   Tue Sep 25 19:56:49 2012 -0400

    General cleanups
2012-10-02 14:15:12 -04:00
farcepest
17fb6798cd Add a build status widget for Travis 2012-10-02 14:03:57 -04:00