X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FPostgreSQL.py;h=e04b02be46503f4dc46c4933cc1c963ccdc6c8ed;hb=19d4a01ccf66af9e00914351b3eacd5fc880f988;hp=c9ea950e5628e308d25edd985608224d614ba093;hpb=bd0cbf4f7f2e4cf7ceda500bfa6f98c0a700018b;p=plcapi.git diff --git a/PLC/PostgreSQL.py b/PLC/PostgreSQL.py index c9ea950..e04b02b 100644 --- a/PLC/PostgreSQL.py +++ b/PLC/PostgreSQL.py @@ -12,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 @@ -20,7 +19,8 @@ import commands import re from pprint import pformat -from PLC.Debug import profile, log +from PLC.Logger import logger +from PLC.Debug import profile from PLC.Faults import * from datetime import datetime as DateTimeType @@ -58,21 +58,50 @@ class PostgreSQL: self.connection.close() self.connection = None + @staticmethod + # From pgdb, and simplify code + 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 PLCDBError, 'Cannot quote type %s' % type(x) + return x + + 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, (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 - return pgdb._quote(value) - except: - # from PyGreSQL-4.0, it's a cursor method - return self.cursor()._quote(value) + return PostgreSQL._quote (value) + +# following is an unsuccessful attempt to re-use lib code as much as possible +# def quote(self, 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): @@ -147,21 +176,22 @@ class PostgreSQL: if not params: if self.debug: - print >> log,'execute0',query + logger.debug('execute0: {}'.format(query)) cursor.execute(query) - elif isinstance(params,dict): + elif isinstance(params, dict): if self.debug: - print >> log,'execute-dict: params',params,'query',query%params - cursor.execute(query,params) + logger.debug('execute-dict: params {} query {}' + .format(params, query%params)) + cursor.execute(query, params) elif isinstance(params,tuple) and len(params)==1: if self.debug: - print >> log,'execute-tuple',query%params[0] + logger.debug('execute-tuple {}'.format(query%params[0])) cursor.execute(query,params[0]) else: param_seq=(params,) if self.debug: for params in param_seq: - print >> log,'executemany',query%params + logger.debug('executemany {}'.format(query%params)) cursor.executemany(query, param_seq) (self.rowcount, self.description, self.lastrowid) = \ (cursor.rowcount, cursor.description, cursor.lastrowid) @@ -171,12 +201,8 @@ class PostgreSQL: except: pass uuid = commands.getoutput("uuidgen") - print >> log, "Database error %s:" % uuid - print >> log, e - print >> log, "Query:" - print >> log, query - print >> log, "Params:" - print >> log, pformat(params) + message = "Database error {}: - Query {} - Params {}".format(uuid, query, pformat(params)) + logger.exception(message) raise PLCDBError("Please contact " + \ self.api.config.PLC_NAME + " Support " + \ "<" + self.api.config.PLC_MAIL_SUPPORT_ADDRESS + ">" + \