Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9487ad8

Browse files
committed
Bring python up to date ...From: D'Arcy J.M. Cain <darcy@druid.net>
1 parent77ebed0 commit9487ad8

File tree

5 files changed

+489
-243
lines changed

5 files changed

+489
-243
lines changed

‎src/interfaces/python/Announce‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

2-
Announce: Release of PyGreSQL version 2.3
2+
Announce: Release of PyGreSQL version 2.4
33
===============================================
44

5-
PyGreSQL v2.3 has been released.
5+
PyGreSQL v2.4 has been released.
66
It is available at: ftp://ftp.druid.net/pub/distrib/PyGreSQL.tgz. If
77
you are on NetBSD, look in the packages directory under databases. If
88
it isn't there yet, it should be there shortly. You can also pick up the
@@ -31,6 +31,9 @@ PostgreSQL features from a Python script.
3131
I wanted to have DB-SIG API support in the next release but there are
3232
enough fixes and improvements to make one more release before starting
3333
on that. The next version will be 3.0 and have the DB-SIG API support.
34+
Note that I said this for 2.4 but some required changes from others have
35+
been slow in coming (I'm not complaining, people do have lives) and
36+
there were enough fixes that I didn't want to keep them from a release.
3437

3538
PyGreSQL 2.3 was developed and tested on a NetBSD 1.3_BETA system. It
3639
is based on the PyGres95 code written by Pascal Andre,
@@ -39,6 +42,17 @@ code for Python 1.5 and PostgreSQL 6.2.1. While I was at it I upgraded
3942
the code to use full ANSI style prototypes and changed the order of
4043
arguments to connect. Later versions are fixes and enhancements to that.
4144

45+
Important changes from PyGreSQL 2.3 to PyGreSQL 2.4:
46+
- Insert returns None if the user doesn't have select permissions
47+
on the table. It can (and does) happen that one has insert but
48+
not select permissions on a table.
49+
- Added ntuples() method to query object (brit@druid.net)
50+
- Corrected a bug related to getresult() and the money type
51+
- Corrected a but related to negative money amounts
52+
- Allow update based on primary key if munged oid not available and
53+
table has a primary key
54+
- Add many __doc__ strings. (andre@via.ecp.fr)
55+
4256
Important changes from PyGreSQL 2.2 to PyGreSQL 2.3:
4357
- connect.host returns "localhost" when connected to Unix socket
4458
(torppa@tuhnu.cutery.fi)

‎src/interfaces/python/ChangeLog‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@ This software is copyright (c) 1995, Pascal Andre (andre@via.ecp.fr)
55
Further copyright 1997, 1998 and 1999 by D'Arcy J.M. Cain (darcy@druid.net)
66
See file README for copyright information.
77

8+
Version 2.4
9+
- Insert returns None if the user doesn't have select permissions
10+
on the table. It can (and does) happen that one has insert but
11+
not select permissions on a table.
12+
- Added ntuples() method to query object (brit@druid.net)
13+
- Corrected a bug related to getresult() and the money type
14+
- Corrected a but related to negative money amounts
15+
- Allow update based on primary key if munged oid not available and
16+
table has a primary key
17+
- Add many __doc__ strings. (andre@via.ecp.fr)
18+
819
Version 2.3
920
- connect.host returns "localhost" when connected to Unix socket
1021
(torppa@tuhnu.cutery.fi)

‎src/interfaces/python/README‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

2-
PyGreSQL - v2.3: PostgreSQL module for Python
2+
PyGreSQL - v2.4: PostgreSQL module for Python
33
==============================================
44

55
0. Copyright notice
66
===================
77

8-
PyGreSQL, version 2.3
8+
PyGreSQL, version 2.4
99
A Python interface for PostgreSQL database.
1010
Written by D'Arcy J.M. Cain, darcy@druid.net<BR>
1111
Based heavily on code written by Pascal Andre, andre@chimay.via.ecp.fr.
@@ -129,12 +129,13 @@ style prototypes and changed the order of arguments to connect.
129129

130130
The home sites of the different packages are:
131131

132-
- Python:ftp://ftp.python.org:/pub/python
133-
- PosgreSQL:ftp://ftp.PostgreSQL.org/pub/postgresql-6.4.tar.gz
134-
- PyGreSQL:ftp://ftp.druid.net/pub/distrib/pygresql-2.2.tgz
132+
- Python:http://www.python.org/
133+
- PosgreSQL:http://www.PostgreSQL.org/
134+
- PyGreSQL:http://www.druid.net/pygresql/
135135

136136
A Linux RPM can be picked up from ftp://www.eevolute.com/pub/python/.
137-
137+
A NetBSD package thould be in the distribution soon and is available
138+
at ftp://ftp.druid.net/pub/distrib/pygresql.pkg.tgz.
138139

139140
1.5. Information and support
140141
----------------------------
@@ -164,6 +165,10 @@ and all the requests to the database, the pglargeobject that handles
164165
all the accesses to Postgres large objects and pgqueryobject that handles
165166
query results.
166167

168+
If you want to see a simple example of the use of some of these functions,
169+
see http://www.druid.net/rides/ where I have a link at the bottom to the
170+
actual Python code for the page.
171+
167172
2.1. pg module description
168173
----------------------------
169174

@@ -471,6 +476,16 @@ methods are specified by the tag [LO].
471476
type, using a hardcoded table definition. The number returned is the
472477
field rank in the result values list.
473478

479+
2.2.1.5 ntuples - return number of tuples in query object
480+
---------------------------------------------------------
481+
482+
Syntax: ntuples()
483+
Parameters: None
484+
Return type: integer
485+
Description:
486+
This method returns the number of tuples found in a query.
487+
488+
474489
2.2.2. reset - resets the connection
475490
------------------------------------
476491

@@ -847,25 +862,7 @@ The following describes the methods and variables of this class.
847862
Name of field which is the primary key of the table.
848863
Description:
849864
This method returns the primary key of a table. Note that this raises
850-
an exception if the table doesn't have a primary key. Further, in the
851-
currently released implementation of PostgreSQL the 'PRIMARY KEY' syntax
852-
doesn't actually fill in the necessary tables to determine primary keys.
853-
You can do this yourself with the following query.
854-
855-
# Set up table and primary_field variables...
856-
857-
"""UPDATE pg_index SET indisprimary = 't'
858-
WHERE pg_index.oid in (SELECT pg_index.oid
859-
FROM pg_class, pg_attribute, pg_index
860-
WHERE pg_class.oid = pg_attribute.attrelid AND
861-
pg_class.oid = pg_index.indrelid AND
862-
pg_index.indkey[0] = pg_attribute.attnum AND
863-
pg_class.relname = '%(table)s' AND
864-
pg_attribute.attname = '%(primary_field)');""" % locals()
865-
866-
This will be fixed in the upcoming 6.5 release of PostgreSQL or
867-
you can download the current sources now. Downloading current
868-
is, as usual, at your own risk.
865+
an exception if the table doesn't have a primary key.
869866

870867
3.3. get_databases - get list of databases in the system
871868
--------------------------------------------------------

‎src/interfaces/python/pg.py‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def _quote(d, t):
2525
return"'f'"
2626

2727
ifd=="":return"null"
28-
return"'%s'"%string.strip(re.sub('\'','\'\'',"%s"%d))
28+
return"'%s'"%string.strip(re.sub("'","''","%s"%d))
2929

3030
classDB:
3131
"""This class wraps the pg connection type"""
@@ -175,16 +175,30 @@ def insert(self, cl, a):
175175

176176
# reload the dictionary to catch things modified by engine
177177
# note that get() changes 'oid' below to oid_table
178-
returnself.get(cl,a,'oid')
178+
# if no read perms (it can and does happen) return None
179+
try:returnself.get(cl,a,'oid')
180+
except:returnNone
179181

180-
# update always works on the oid which get returns
182+
# Update always works on the oid which get returns if available
183+
# otherwise use the primary key. Fail if neither.
181184
defupdate(self,cl,a):
182-
q="SELECT oid FROM %s WHERE oid = %s"% (cl,a['oid_%s'%cl])
185+
foid='oid_%s'%cl
186+
pk=self.pkeys[cl]
187+
ifa.has_key(foid):
188+
where="oid = %s"%a[foid]
189+
elifa.has_key(pk):
190+
where="%s = '%s'"% (pk,a[pk])
191+
else:
192+
raiseerror,"Update needs key (%s) or oid as %s"% (pk,foid)
193+
194+
q="SELECT oid FROM %s WHERE %s"% (cl,where)
183195
ifself.debug!=None:printself.debug%q
184196
res=self.db.query(q).getresult()
197+
185198
iflen(res)<1:
186-
raiseerror,"No record in %s where oid = %s (%s)"% \
187-
(cl,a['oid_%s'%cl],sys.exc_value)
199+
raiseerror,"No record in %s where %s (%s)"% \
200+
(cl,where,sys.exc_value)
201+
else:a[foid]=res[0][0]
188202

189203
v= []
190204
k=0
@@ -199,7 +213,7 @@ def update(self, cl, a):
199213

200214
try:
201215
q="UPDATE %s SET %s WHERE oid = %s"% \
202-
(cl,string.join(v,','),a['oid_%s'%cl])
216+
(cl,string.join(v,','),a[foid])
203217
ifself.debug!=None:printself.debug%q
204218
self.db.query(q)
205219
except:

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp