### $URL$
import report
-
+import pgdb
from pg import DB, ProgrammingError
-
+from sfa.util.PostgreSQL import *
from sfa.trust.gid import *
from sfa.util.record import *
from sfa.util.debug import *
+from sfa.util.config import *
+from sfa.util.filter import *
-class GeniTable:
+class GeniTable(list):
- GENI_TABLE_PREFIX = "sfa$"
+ GENI_TABLE_PREFIX = "sfa"
- def __init__(self, create=False, hrn="unspecified.default.registry", cninfo=None):
-
- self.hrn = hrn
+ def __init__(self, record_filter = None):
# pgsql doesn't like table names with "." in them, to replace it with "$"
- self.tablename = GeniTable.GENI_TABLE_PREFIX + self.hrn.replace(".", "$")
-
+ self.tablename = GeniTable.GENI_TABLE_PREFIX
+ self.config = Config()
+ self.db = PostgreSQL(self.config)
# establish a connection to the pgsql server
+ cninfo = self.config.get_plc_dbinfo()
self.cnx = DB(cninfo['dbname'], cninfo['address'], port=cninfo['port'], user=cninfo['user'], passwd=cninfo['password'])
- # if asked to create the table, then create it
- if create:
- self.create()
+ if record_filter:
+ records = self.find(record_filter)
+ for record in reocrds:
+ self.append(record)
def exists(self):
tableList = self.cnx.get_tables()
return True
return False
+ def db_fields(self, obj=None):
+
+ db_fields = self.db.fields(self.GENI_TABLE_PREFIX)
+ return dict( [ (key,value) for (key, value) in obj.items() \
+ if key in db_fields and
+ self.is_writable(key, value, GeniRecord.fields)] )
+
+ @staticmethod
+ def is_writable (key,value,dict):
+ # if not mentioned, assume it's writable (e.g. deleted ...)
+ if key not in dict: return True
+ # if mentioned but not linked to a Parameter object, idem
+ if not isinstance(dict[key], Parameter): return True
+ # if not marked ro, it's writable
+ if not dict[key].ro: return True
+
+ return False
+
+
def create(self):
querystr = "CREATE TABLE " + self.tablename + " ( \
- key text, \
- hrn text, \
+ record_id serial PRIMARY KEY , \
+ hrn text NOT NULL, \
+ authority text NOT NULL, \
+ peer_authority text, \
gid text, \
- type text, \
+ type text NOT NULL, \
pointer integer, \
date_created timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP, \
last_updated timestamp without time zone NOT NULL DEFAULT CURRENT_TIMESTAMP);"
template = "CREATE INDEX %s_%s_idx ON %s (%s);"
indexes = [template % ( self.tablename, field, self.tablename, field) \
- for field in ['key', 'hrn', 'type','pointer']]
+ for field in ['hrn', 'type', 'authority', 'peer_authority', 'pointer']]
# IF EXISTS doenst exist in postgres < 8.2
try:
self.cnx.query('DROP TABLE IF EXISTS ' + self.tablename)
self.cnx.query('DROP TABLE ' + self.tablename)
except ProgrammingError:
pass
-
+
self.cnx.query(querystr)
for index in indexes:
self.cnx.query(index)
def remove(self, record):
- query_str = "DELETE FROM " + self.tablename + " WHERE key = '" + record.get_key() + "'"
+ query_str = "DELETE FROM %s WHERE record_id = %s" % \
+ (self.tablename, record['record_id'])
self.cnx.query(query_str)
+
+ # if this is a site, remove all records where 'authority' == the
+ # site's hrn
+ if record['type'] == 'site':
+ sql = " DELETE FROM %s WHERE authority = %s" % \
+ (self.tablename, record['hrn'])
+ self.cnx.query(sql)
def insert(self, record):
- dont_insert = ['date_created', 'last_updated']
- fields = [field for field in record.fields.keys() if field not in dont_insert]
- fieldnames = ["key"] + fields
- fieldvals = record.get_field_value_strings(fieldnames)
+ db_fields = self.db_fields(record)
+ keys = db_fields.keys()
+ values = [self.db.param(key, value) for (key, value) in db_fields.items()]
query_str = "INSERT INTO " + self.tablename + \
- "(" + ",".join(fieldnames) + ") " + \
- "VALUES(" + ",".join(fieldvals) + ")"
- #print query_str
- self.cnx.query(query_str)
+ "(" + ",".join(keys) + ") " + \
+ "VALUES(" + ",".join(values) + ")"
+ self.db.do(query_str, db_fields)
+ self.db.commit()
+ result = self.find({'hrn': record['hrn'], 'type': record['type'], 'peer_authority': record['peer_authority']})
+ if not result:
+ record_id = None
+ elif isinstance(result, list):
+ record_id = result[0]['record_id']
+ else:
+ record_id = result['record_id']
+
+ return record_id
def update(self, record):
- names = record.get_field_names()
- pairs = []
- for name in names:
- val = record.get_field_value_string(name)
- pairs.append(name + " = " + val)
- update = ", ".join(pairs)
-
- query_str = "UPDATE " + self.tablename+ " SET " + update + " WHERE key = '" + record.get_key() + "'"
- #print query_str
- self.cnx.query(query_str)
-
- def find_dict(self, type, value, searchfield):
- query_str = "SELECT * FROM " + self.tablename + " WHERE " + searchfield + " = '" + str(value) + "'"
- dict_list = self.cnx.query(query_str).dictresult()
- result_dict_list = []
- for dict in dict_list:
- if (type=="*") or (dict['type'] == type):
- result_dict_list.append(dict)
- return result_dict_list
-
- def find(self, type, value, searchfield):
- result_dict_list = self.find_dict(type, value, searchfield)
+ db_fields = self.db_fields(record)
+ keys = db_fields.keys()
+ values = [self.db.param(key, value) for (key, value) in db_fields.items()]
+ columns = ["%s = %s" % (key, value) for (key, value) in zip(keys, values)]
+ query_str = "UPDATE %s SET %s WHERE record_id = %s" % \
+ (self.tablename, ", ".join(columns), record['record_id'])
+ self.db.do(query_str, db_fields)
+ self.db.commit()
+
+ def quote_string(self, value):
+ return str(self.quote(value))
+
+ 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, self.quote_string, value)
+ else:
+ return pgdb._quote(value)
+
+ def find(self, record_filter = None, columns=None):
+ if not columns:
+ columns = "*"
+ else:
+ columns = ",".join(columns)
+ sql = "SELECT %s FROM %s WHERE True " % (columns, self.tablename)
+
+ if isinstance(record_filter, (list, tuple, set)):
+ ints = filter(lambda x: isinstance(x, (int, long)), record_filter)
+ strs = filter(lambda x: isinstance(x, StringTypes), record_filter)
+ record_filter = Filter(GeniRecord.all_fields, {'record_id': ints, 'hrn': strs})
+ sql += "AND (%s) %s " % record_filter.sql("OR")
+ elif isinstance(record_filter, dict):
+ record_filter = Filter(GeniRecord.all_fields, record_filter)
+ sql += " AND (%s) %s" % record_filter.sql("AND")
+ elif isinstance(record_filter, StringTypes):
+ record_filter = Filter(GeniRecord.all_fields, {'hrn':[record_filter]})
+ sql += " AND (%s) %s" % record_filter.sql("AND")
+ elif isinstance(record_filter, int):
+ record_filter = Filter(GeniRecord.all_fields, {'record_id':[record_filter]})
+ sql += " AND (%s) %s" % record_filter.sql("AND")
+
+ results = self.cnx.query(sql).dictresult()
+ if isinstance(results, dict):
+ results = [results]
+ return results
+
+ def findObjects(self, record_filter = None, columns=None):
+
+ results = self.find(record_filter, columns)
result_rec_list = []
- for result in result_dict_list:
+ for result in results:
if result['type'] in ['authority']:
result_rec_list.append(AuthorityRecord(dict=result))
elif result['type'] in ['node']:
result_rec_list.append(GeniRecord(dict=result))
return result_rec_list
- def resolve_dict(self, type, hrn):
- return self.find_dict(type, hrn, "hrn")
-
- def resolve(self, type, hrn):
- return self.find(type, hrn, "hrn")
-
- def list_dict(self):
- query_str = "SELECT * FROM " + self.tablename
- result_dict_list = self.cnx.query(query_str).dictresult()
- return result_dict_list
-
- def list(self):
- result_dict_list = self.list_dict()
- result_rec_list = []
- for dict in result_dict_list:
- result_rec_list.append(GeniRecord(dict=dict).as_dict())
- return result_rec_list
+ def drop(self):
+ try:
+ self.cnx.query('DROP TABLE IF EXISTS ' + self.tablename)
+ except ProgrammingError:
+ try:
+ self.cnx.query('DROP TABLE ' + self.tablename)
+ except ProgrammingError:
+ pass
+
@staticmethod
def geni_records_purge(cninfo):
git://git.onelab.eu / sfa.git / blobdiff