NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit551e0aa

committed

Fix parameter handling.

Fix a bug where cs.execute('select %d + %d', (1, 2)) would get interpretedas cs.executemany('select %d + %d', (1, 2))

1 parent37d67eb commit551e0aaCopy full SHA for 551e0aa

File tree

1 file changed

+36

-2

lines changed

src/interfaces/python
- pgdb.py

1 file changed

+36

-2

lines changed

`‎src/interfaces/python/pgdb.py`

Lines changed: 36 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@`
`60`	`60`	`importtypes`
`61`	`61`	`importDateTime`
`62`	`62`	`importtime`
	`63`	`+importtypes`
`63`	`64`
`64`	`65`	`### module constants`
`65`	`66`
`@@ -175,9 +176,14 @@ def close(self):`
`175`	`176`	`self.rowcount=-1`
`176`	`177`
`177`	`178`	`defexecute(self,operation,params=None):`
`178`		`-iftype(params)==types.TupleTypeortype(params)==types.ListType:`
	`179`	`+# "The parameters may also be specified as list of`
	`180`	`+# tuples to e.g. insert multiple rows in a single`
	`181`	`+# operation, but this kind of usage is depreciated:`
	`182`	`+ifparamsandtype(params)==types.ListTypeand \`
	`183`	`+type(params[0])==types.TupleType:`
`179`	`184`	`self.executemany(operation,params)`
`180`	`185`	`else:`
	`186`	`+# not a list of tuples`
`181`	`187`	`self.executemany(operation, (params,))`
`182`	`188`
`183`	`189`	`defexecutemany(self,operation,param_seq):`
`@@ -190,7 +196,7 @@ def executemany(self, operation, param_seq):`
`190`	`196`	`try:`
`191`	`197`	`forparamsinparam_seq:`
`192`	`198`	`ifparams!=None:`
`193`		`-sql=operation%params`
	`199`	`+sql=_quoteparams(operation,params)`
`194`	`200`	`else:`
`195`	`201`	`sql=operation`
`196`	`202`	`rows=self.__source.execute(sql)`
`@@ -251,6 +257,34 @@ def setinputsizes(self, sizes):`
`251`	`257`	`defsetoutputsize(self,size,col=0):`
`252`	`258`	`pass`
`253`	`259`
	`260`	`+`
	`261`	`+def_quote(x):`
	`262`	`+iftype(x)==types.StringType:`
	`263`	`+x="'"+string.replace(`
	`264`	`+string.replace(str(x),'\\','\\\\'),"'","''")+"'"`
	`265`	`+`
	`266`	`+elif type(x)in (types.IntType,types.LongType,types.FloatType):`
	`267`	`+pass`
	`268`	`+elifxisNone:`
	`269`	`+x='NULL'`
	`270`	`+elifhasattr(x,'__pg_repr__'):`
	`271`	`+x=x.__pg_repr__()`
	`272`	`+else:`
	`273`	`+raiseInterfaceError,'do not know how to handle type %s'%type(x)`
	`274`	`+`
	`275`	`+returnx`
	`276`	`+`
	`277`	`+def_quoteparams(s,params):`
	`278`	`+ifhasattr(params,'has_key'):`
	`279`	`+x= {}`
	`280`	`+fork,vinparams.items():`
	`281`	`+x[k]=_quote(v)`
	`282`	`+params=x`
	`283`	`+else:`
	`284`	`+params=tuple(map(_quote,params))`
	`285`	`+`
	`286`	`+returns%params`
	`287`	`+`
`254`	`288`	`### connection object`
`255`	`289`
`256`	`290`	`classpgdbCnx:`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit551e0aa

File tree

1 file changed

1 file changed

`‎src/interfaces/python/pgdb.py`

0 commit comments