X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FPostgreSQL.py;h=bf467dd001da5487c95d5cb8561d609377343dc1;hb=d20644a48d03667bb25dc583517de06e94606c64;hp=e04b02be46503f4dc46c4933cc1c963ccdc6c8ed;hpb=fdc1bf78189188df147a882721805e7ed5654459;p=plcapi.git diff --git a/PLC/PostgreSQL.py b/PLC/PostgreSQL.py index e04b02b..bf467dd 100644 --- a/PLC/PostgreSQL.py +++ b/PLC/PostgreSQL.py @@ -1,10 +1,16 @@ # -# PostgreSQL database interface. +# PostgreSQL database interface. # Sort of like DBI(3) (Database independent interface for Perl). # # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # +# pylint: disable=c0103, c0111 + +import subprocess +import re +from pprint import pformat +from datetime import datetime as DateTimeType import psycopg2 import psycopg2.extensions @@ -12,17 +18,9 @@ psycopg2.extensions.register_type(psycopg2.extensions.UNICODE) # UNICODEARRAY not exported yet psycopg2.extensions.register_type(psycopg2._psycopg.UNICODEARRAY) -import types -from types import StringTypes, NoneType -import traceback -import commands -import re -from pprint import pformat - from PLC.Logger import logger -from PLC.Debug import profile +#from PLC.Debug import profile from PLC.Faults import * -from datetime import datetime as DateTimeType class PostgreSQL: def __init__(self, api): @@ -36,16 +34,18 @@ class PostgreSQL: # (Re)initialize database connection try: # Try UNIX socket first - self.connection = psycopg2.connect(user = self.api.config.PLC_DB_USER, - password = self.api.config.PLC_DB_PASSWORD, - database = self.api.config.PLC_DB_NAME) + self.connection = psycopg2.connect( + user=self.api.config.PLC_DB_USER, + password=self.api.config.PLC_DB_PASSWORD, + database=self.api.config.PLC_DB_NAME) except psycopg2.OperationalError: # Fall back on TCP - self.connection = psycopg2.connect(user = self.api.config.PLC_DB_USER, - password = self.api.config.PLC_DB_PASSWORD, - database = self.api.config.PLC_DB_NAME, - host = self.api.config.PLC_DB_HOST, - port = self.api.config.PLC_DB_PORT) + self.connection = psycopg2.connect( + user=self.api.config.PLC_DB_USER, + password=self.api.config.PLC_DB_PASSWORD, + database=self.api.config.PLC_DB_NAME, + host=self.api.config.PLC_DB_HOST, + port=self.api.config.PLC_DB_PORT) self.connection.set_client_encoding("UNICODE") (self.rowcount, self.description, self.lastrowid) = \ @@ -60,24 +60,31 @@ class PostgreSQL: @staticmethod # From pgdb, and simplify code + # this is **very different** from the python2 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)): + elif isinstance(x, bytes): + x = x.decode('utf-8') + + if isinstance(x, str): + # don't double quote backslahes, this causes failure + # with e.g. the SFA code when it tries to spot slices + # created from fed4fire, which to my knowledge is the only + # place where a backslash is useful + # x = x.replace("\\", "\\\\") + x = x.replace("'", "''") + x = f"'{x}'" + elif isinstance(x, (int, float)): 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 isinstance(x, (list, tuple, set)): + x = 'ARRAY[%s]' % ', '.join([str(PostgreSQL._quote(x)) for x in x]) elif hasattr(x, '__pg_repr__'): x = x.__pg_repr__() else: - raise PLCDBError, 'Cannot quote type %s' % type(x) + raise PLCDBError('Cannot quote type %s' % type(x)) return x @@ -85,7 +92,7 @@ class PostgreSQL: """ Returns quoted version of the specified value. """ - return PostgreSQL._quote (value) + return PostgreSQL._quote(value) # following is an unsuccessful attempt to re-use lib code as much as possible # def quote(self, value): @@ -104,16 +111,16 @@ class PostgreSQL: # return adapt (value) @classmethod - def param(self, name, value): + def param(cls, name, value): # None is converted to the unquoted string NULL - if isinstance(value, NoneType): + if isinstance(value, type(None)): conversion = "s" # True and False are also converted to unquoted strings elif isinstance(value, bool): conversion = "s" elif isinstance(value, float): conversion = "f" - elif not isinstance(value, StringTypes): + elif not isinstance(value, str): conversion = "d" else: conversion = "s" @@ -130,25 +137,24 @@ class PostgreSQL: def rollback(self): self.connection.rollback() - def do(self, query, params = None): + def do(self, query, params=None): cursor = self.execute(query, params) cursor.close() return self.rowcount def next_id(self, table_name, primary_key): - sequence = "%(table_name)s_%(primary_key)s_seq" % locals() - sql = "SELECT nextval('%(sequence)s')" % locals() - rows = self.selectall(sql, hashref = False) + sequence = "{}_{}_seq".format(table_name, primary_key) + sql = "SELECT nextval('{}')".format(sequence) + rows = self.selectall(sql, hashref=False) if rows: return rows[0][0] - return None def last_insert_id(self, table_name, primary_key): if isinstance(self.lastrowid, int): sql = "SELECT %s FROM %s WHERE oid = %d" % \ (primary_key, table_name, self.lastrowid) - rows = self.selectall(sql, hashref = False) + rows = self.selectall(sql, hashref=False) if rows: return rows[0][0] @@ -159,7 +165,7 @@ class PostgreSQL: # see http://www.python.org/dev/peps/pep-0249/ # accepts either None, a single dict, a tuple of single dict - in which case it execute's # or a tuple of several dicts, in which case it executemany's - def execute(self, query, params = None): + def execute(self, query, params=None): cursor = self.cursor() try: @@ -172,7 +178,7 @@ class PostgreSQL: if psycopg2: query = re.sub(r'(%\([^)]*\)|%)[df]', r'\1s', query) # rewrite wildcards set by Filter.py as '***' into '%' - query = query.replace ('***','%') + query = query.replace('***', '%') if not params: if self.debug: @@ -183,24 +189,24 @@ class PostgreSQL: logger.debug('execute-dict: params {} query {}' .format(params, query%params)) cursor.execute(query, params) - elif isinstance(params,tuple) and len(params)==1: + elif isinstance(params, tuple) and len(params) == 1: if self.debug: logger.debug('execute-tuple {}'.format(query%params[0])) - cursor.execute(query,params[0]) + cursor.execute(query, params[0]) else: - param_seq=(params,) + param_seq = (params,) if self.debug: for params in param_seq: logger.debug('executemany {}'.format(query%params)) cursor.executemany(query, param_seq) (self.rowcount, self.description, self.lastrowid) = \ (cursor.rowcount, cursor.description, cursor.lastrowid) - except Exception, e: + except Exception as e: try: self.rollback() except: pass - uuid = commands.getoutput("uuidgen") + uuid = subprocess.getoutput("uuidgen") message = "Database error {}: - Query {} - Params {}".format(uuid, query, pformat(params)) logger.exception(message) raise PLCDBError("Please contact " + \ @@ -210,7 +216,7 @@ class PostgreSQL: return cursor - def selectall(self, query, params = None, hashref = True, key_field = None): + def selectall(self, query, params=None, hashref=True, key_field=None): """ Return each row as a dictionary keyed on field name (like DBI selectrow_hashref()). If key_field is specified, return rows @@ -229,22 +235,22 @@ class PostgreSQL: # Return each row as a dictionary keyed on field name # (like DBI selectrow_hashref()). labels = [column[0] for column in self.description] - rows = [dict(zip(labels, row)) for row in rows] + rows = [dict(list(zip(labels, row))) for row in rows] if key_field is not None and key_field in labels: # Return rows as a dictionary keyed on the specified field # (like DBI selectall_hashref()). - return dict([(row[key_field], row) for row in rows]) + return {row[key_field]: row for row in rows} else: return rows - def fields(self, table, notnull = None, hasdef = None): + def fields(self, table, notnull=None, hasdef=None): """ Return the names of the fields of the specified table. """ if hasattr(self, 'fields_cache'): - if self.fields_cache.has_key((table, notnull, hasdef)): + if (table, notnull, hasdef) in self.fields_cache: return self.fields_cache[(table, notnull, hasdef)] else: self.fields_cache = {} @@ -259,7 +265,7 @@ class PostgreSQL: if hasdef is not None: sql += " AND atthasdef is %(hasdef)s" - rows = self.selectall(sql, locals(), hashref = False) + rows = self.selectall(sql, locals(), hashref=False) self.fields_cache[(table, notnull, hasdef)] = [row[0] for row in rows]