#
-# 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
# UNICODEARRAY not exported yet
psycopg2.extensions.register_type(psycopg2._psycopg.UNICODEARRAY)
-import pgdb
+import types
from types import StringTypes, NoneType
import traceback
import commands
from PLC.Debug import profile, log
from PLC.Faults import *
+from datetime import datetime as DateTimeType
class PostgreSQL:
def __init__(self, api):
self.connection.close()
self.connection = None
- # join insists on getting strings
- @classmethod
- def quote_string(self, value):
- return str(PostgreSQL.quote(value))
-
- @classmethod
def quote(self, value):
"""
Returns quoted version of the specified value.
"""
-
# The pgdb._quote function is good enough for general SQL
# quoting, except for array types.
- if isinstance(value, (list, tuple, set)):
- return "ARRAY[%s]" % ", ".join(map (PostgreSQL.quote_string, value))
+ if isinstance (value, (types.ListType, types.TupleType, set)):
+ 'ARRAY[%s]' % ', '.join( [ str(self.quote(x)) for x in value ] )
else:
- return pgdb._quote(value)
+ 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):