summaryrefslogtreecommitdiff
path: root/databases/zope-mysql
diff options
context:
space:
mode:
authortsarna <tsarna@pkgsrc.org>2000-03-11 19:59:56 +0000
committertsarna <tsarna@pkgsrc.org>2000-03-11 19:59:56 +0000
commita0fc766f8da78a3a01010a251f19251c97865ad6 (patch)
tree0424c7910ae121ec1f43820f953362e2df590ac5 /databases/zope-mysql
parentb3fb9e9d182761cfe4e26f7a936cd7b39bad4800 (diff)
downloadpkgsrc-a0fc766f8da78a3a01010a251f19251c97865ad6.tar.gz
Update to use py-mysqldb 0.1.3
Changes: - better SQL quoting Changes for py-mysqldb 0.1.3 that I forgot to note: - Fixes a coredump at exit under some conditions - Improved backwards compatability with MySQLmodule.
Diffstat (limited to 'databases/zope-mysql')
-rw-r--r--databases/zope-mysql/Makefile6
-rw-r--r--databases/zope-mysql/patches/patch-aa10
2 files changed, 9 insertions, 7 deletions
diff --git a/databases/zope-mysql/Makefile b/databases/zope-mysql/Makefile
index e6969793914..e1614e9187f 100644
--- a/databases/zope-mysql/Makefile
+++ b/databases/zope-mysql/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2000/02/27 18:21:44 tsarna Exp $
+# $NetBSD: Makefile,v 1.9 2000/03/11 19:59:56 tsarna Exp $
#
DISTNAME= ZMySQLDA-1.1.3-nonbin
-PKGNAME= zope-mysql-1.1.3nb1
+PKGNAME= zope-mysql-1.1.3nb2
CATEGORIES= databases www
MASTER_SITES= http://www.zope.org/Members/MikeP/ZMySQLDA/
@@ -10,7 +10,7 @@ MAINTAINER= tsarna@netbsd.org
HOMEPAGE= http://www.zope.org/Members/MikeP/ZMySQLDA
DEPENDS+= zope-2.*:../../www/zope
-DEPENDS+= py-mysqldb-0.1.2:../../databases/py-mysqldb
+DEPENDS+= py-mysqldb-0.1.3:../../databases/py-mysqldb
WRKSRC= ${WRKDIR}/lib
diff --git a/databases/zope-mysql/patches/patch-aa b/databases/zope-mysql/patches/patch-aa
index ad3df72ecb1..731aa3ca532 100644
--- a/databases/zope-mysql/patches/patch-aa
+++ b/databases/zope-mysql/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2000/02/27 18:21:44 tsarna Exp $
+$NetBSD: patch-aa,v 1.4 2000/03/11 19:59:57 tsarna Exp $
Patch from MySQLdb distribution to let the ZMySQL DA work with it
instead of with MySQLmodule, with patch paths modified for pkg use.
@@ -31,7 +31,8 @@ it where Python can find it. Finally, you will need to restart Zope.
Andy Dustman <adustman@comstar.net>
1999-10-11
---- python/Products/ZMySQLDA/DA.py.orig Mon Jan 25 10:42:45 1999
+diff -ur python/Products/ZMySQLDA/DA.py python/Products/ZMySQLDA/DA.py
+--- python/Products/ZMySQLDA/DA.py Mon Jan 25 10:42:45 1999
+++ python/Products/ZMySQLDA/DA.py Wed Sep 15 20:16:32 1999
@@ -133,18 +133,6 @@
@@ -55,11 +56,12 @@ Andy Dustman <adustman@comstar.net>
+ def sql_quote__(self, v, escapes={}):
+ from _mysql import escape_string
+ return "'%s'" % escape_string(v)
---- python/Products/ZMySQLDA/db.py.orig Mon Jan 25 10:42:45 1999
+diff -ur python/Products/ZMySQLDA/db.py python/Products/ZMySQLDA/db.py
+--- python/Products/ZMySQLDA/db.py Mon Jan 25 10:42:45 1999
+++ python/Products/ZMySQLDA/db.py Mon Oct 11 21:29:07 1999
@@ -103,7 +103,8 @@
"""Db connection implementation"""
- __version__='$Revision: 1.3 $'[11:-2]
+ __version__='$Revision: 1.4 $'[11:-2]
-import MySQL, regex, sys
+import _mysql, regex, sys