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 *
# pgsql doesn't like table names with "." in them, to replace it with "$"
self.tablename = GeniTable.GENI_TABLE_PREFIX
-
+ self.config = Config()
+ self.db = PostgreSQL(self.config)
# establish a connection to the pgsql server
- cninfo = Config().get_plc_dbinfo()
+ cninfo = self.config.get_plc_dbinfo()
self.cnx = DB(cninfo['dbname'], cninfo['address'], port=cninfo['port'], user=cninfo['user'], passwd=cninfo['password'])
if record_filter:
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 + " ( \
record_id serial PRIMARY KEY , \
hrn text NOT NULL, \
authority text NOT NULL, \
+ peer_authority text, \
gid text, \
type text NOT NULL, \
pointer integer, \
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 ['hrn', 'type', 'authority', '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(index)
def remove(self, record):
- query_str = "DELETE FROM %s WHERE record_id = %s" % (self.tablename, record['record_id'])
+ 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 = ["pointer"] + 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']
- def update(self, record):
- dont_update = ['date_created', 'last_updated']
- fields = [field for field in record.fields.keys() if field not in dont_update]
- fieldvals = record.get_field_value_strings(fields)
- pairs = []
- for field in fields:
- val = record.get_field_value_string(field)
- pairs.append(field + " = " + val)
- update = ", ".join(pairs)
+ return record_id
+ def update(self, record):
+ 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, update, record['record_id'])
- #print query_str
- self.cnx.query(query_str)
+ (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):
"""
# 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, value)
+ return "ARRAY[%s]" % ", ".join(map, self.quote_string, value)
else:
return pgdb._quote(value)
- def find(self, record_filter = None):
- sql = "SELECT * FROM %s WHERE True " % self.tablename
+ 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)
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):
+ def findObjects(self, record_filter = None, columns=None):
- results = self.find(record_filter)
+ results = self.find(record_filter, columns)
result_rec_list = []
for result in results:
if result['type'] in ['authority']:
git://git.onelab.eu / sfa.git / blobdiff