fix quoting - was totally wrong on f16

[plcapi.git] / PLC / PostgreSQL.py

diff --git a/PLC/PostgreSQL.py b/PLC/PostgreSQL.py
index c08dd71..eced84e 100644 (file)
--- a/PLC/PostgreSQL.py
+++ b/PLC/PostgreSQL.py
@@ -1,13 +1,10 @@
 #
-# PostgreSQL database interface. Sort of like DBI(3) (Database
-# independent interface for Perl).
+# PostgreSQL database interface. 
+# Sort of like DBI(3) (Database independent interface for Perl).
 #
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
-# $URL$
-#
 
 import psycopg2
 import psycopg2.extensions
@@ -15,7 +12,6 @@ psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
 # UNICODEARRAY not exported yet
 psycopg2.extensions.register_type(psycopg2._psycopg.UNICODEARRAY)
 
-import pgdb
 import types
 from types import StringTypes, NoneType
 import traceback
@@ -27,27 +23,6 @@ from PLC.Debug import profile, log
 from PLC.Faults import *
 from datetime import datetime as DateTimeType
 
-# From pgdb
-def _quote(x):
-    if isinstance(x, DateTimeType):
-        x = str(x)
-    elif isinstance(x, unicode):
-        x = x.encode( 'utf-8' )
-
-    if isinstance(x, types.StringType):
-        x = "'%s'" % str(x).replace("\\", "\\\\").replace("'", "''")
-    elif isinstance(x, (types.IntType, types.LongType, types.FloatType)):
-        pass
-    elif x is None:
-        x = 'NULL'
-    elif isinstance(x, (types.ListType, types.TupleType, set)):
-        x = 'ARRAY[%s]' % ', '.join(map(lambda x: str(_quote(x)), x))
-    elif hasattr(x, '__pg_repr__'):
-        x = x.__pg_repr__()
-    else:
-        raise pgdb.InterfaceError, 'do not know how to handle type %s' % type(x)
-    return x
-
 class PostgreSQL:
     def __init__(self, api):
         self.api = api
@@ -82,12 +57,23 @@ class PostgreSQL:
             self.connection.close()
             self.connection = None
 
-    @classmethod
     def quote(self, value):
         """
         Returns quoted version of the specified value.
         """
-        return _quote(value)
+        # The pgdb._quote function is good enough for general SQL
+        # quoting, except for array types.
+        if isinstance (value, (types.ListType, types.TupleType, set)):
+            'ARRAY[%s]' % ', '.join( [ str(self.quote(x)) for x in value ] )
+        else:
+            try:
+                # up to PyGreSQL-3.x, function was pgdb._quote
+                import pgdb
+                return pgdb._quote(value)
+            except:
+                # with PyGreSQL-4.x, use psycopg2's adapt
+                from psycopg2.extensions import adapt
+                return adapt (value)
 
     @classmethod
     def param(self, name, value):