-###########################################################################
-# Copyright (C) 2011 by
-# <savakian@sfa2.grenoble.senslab.info>
-#
-# Copyright: See COPYING file that comes with this distribution
-#
-###########################################################################
-import psycopg2
-import psycopg2.extensions
-psycopg2.extensions.register_type(psycopg2.extensions.UNICODE)
-# UNICODEARRAY not exported yet
-psycopg2.extensions.register_type(psycopg2._psycopg.UNICODEARRAY)
-from sfa.util.config import Config
-from sfa.util.table import SfaTable
-# allow to run sfa2wsdl if this is missing (for mac)
import sys
-try: import pgdb
-except: print >> sys.stderr, "WARNING, could not import pgdb"
-slice_table = {'oar_job_id':'integer DEFAULT -1', 'record_id_user':'integer PRIMARY KEY references sfa ON DELETE CASCADE ON UPDATE CASCADE', 'record_id_slice':'integer', 'slice_hrn':'text NOT NULL'}
-tablenames_dict = {'slice': slice_table}
+from sqlalchemy import create_engine
+from sqlalchemy.orm import sessionmaker
+
+from sfa.util.config import Config
+from sfa.util.sfalogging import logger
+
+from sqlalchemy import Column, Integer, String, DateTime
+from sqlalchemy import Table, Column, MetaData, join, ForeignKey
+import sfa.storage.model as model
+
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import relationship, backref
+
+
+from sqlalchemy import MetaData, Table
+from sqlalchemy.exc import NoSuchTableError
+
+#Dict holding the columns names of the table as keys
+#and their type, used for creation of the table
+slice_table = {'record_id_user':'integer PRIMARY KEY references X ON DELETE CASCADE ON UPDATE CASCADE','oar_job_id':'integer DEFAULT -1', 'record_id_slice':'integer', 'slice_hrn':'text NOT NULL'}
+
+#Dict with all the specific senslab tables
+tablenames_dict = {'slice_senslab': slice_table}
+
+##############################
+
+
+
+SlabBase = declarative_base()
+
+
+
+class SlabSliceDB (SlabBase):
+ __tablename__ = 'slice_senslab'
+ record_id_user = Column(Integer, primary_key=True)
+ oar_job_id = Column( Integer,default = -1)
+ record_id_slice = Column(Integer)
+ slice_hrn = Column(String,nullable = False)
+
+ def __init__ (self, slice_hrn =None, oar_job_id=None, record_id_slice=None, record_id_user= None):
+ if record_id_slice:
+ self.record_id_slice = record_id_slice
+ if slice_hrn:
+ self.slice_hrn = slice_hrn
+ if oar_job_id:
+ self.oar_job_id = oar_job_id
+ if slice_hrn:
+ self.slice_hrn = slice_hrn
+ if record_id_user:
+ self.record_id_user= record_id_user
+
+ def __repr__(self):
+ result="<Record id user =%s, slice hrn=%s, oar_job id=%s,Record id slice =%s" % \
+ (self.record_id_user, self.slice_hrn, self.oar_job_id, self.record_id_slice)
+ result += ">"
+ return result
+
+
+
+
class SlabDB:
- def __init__(self):
- self.config = Config()
- self.debug = False
-
- self.connection = None
-
- #@handle_exception
- def cursor(self):
- if self.connection is None:
- # (Re)initialize database connection
- if psycopg2:
- try:
- # Try UNIX socket first
- self.connection = psycopg2.connect(user = 'sfa',
- password = 'sfa',
- database = 'sfa')
- #self.connection = psycopg2.connect(user = self.config.SFA_PLC_DB_USER,
- #password = self.config.SFA_PLC_DB_PASSWORD,
- #database = self.config.SFA_PLC_DB_NAME)
- except psycopg2.OperationalError:
- # Fall back on TCP
- self.connection = psycopg2.connect(user = self.config.SFA_PLC_DB_USER,
- password = self.config.SFA_PLC_DB_PASSWORD,
- database = self.config.SFA_PLC_DB_NAME,
- host = self.config.SFA_PLC_DB_HOST,
- port = self.config.SFA_PLC_DB_PORT)
- self.connection.set_client_encoding("UNICODE")
- else:
- self.connection = pgdb.connect(user = self.config.SFA_PLC_DB_USER,
- password = self.config.SFA_PLC_DB_PASSWORD,
- host = "%s:%d" % (self.config.SFA_PLC_DB_HOST, self.config.SFA_PLC_DB_PORT),
- database = self.config.SFA_PLC_DB_NAME)
-
- (self.rowcount, self.description, self.lastrowid) = \
- (None, None, None)
-
- return self.connection.cursor()
+ def __init__(self,config):
+ self.sl_base = SlabBase
+
+ dbname="slab_sfa"
+ # will be created lazily on-demand
+ self.slab_session = None
+ # the former PostgreSQL.py used the psycopg2 directly and was doing
+ #self.connection.set_client_encoding("UNICODE")
+ # it's unclear how to achieve this in sqlalchemy, nor if it's needed at all
+ # http://www.sqlalchemy.org/docs/dialects/postgresql.html#unicode
+ # we indeed have /var/lib/pgsql/data/postgresql.conf where
+ # this setting is unset, it might be an angle to tweak that if need be
+ # try a unix socket first - omitting the hostname does the trick
+ unix_url = "postgresql+psycopg2://%s:%s@:%s/%s"%\
+ (config.SFA_DB_USER,config.SFA_DB_PASSWORD,config.SFA_DB_PORT,dbname)
+ print >>sys.stderr, " \r\n \r\n SLAPOSTGRES INIT unix_url %s" %(unix_url)
+ # the TCP fallback method
+ tcp_url = "postgresql+psycopg2://%s:%s@%s:%s/%s"%\
+ (config.SFA_DB_USER,config.SFA_DB_PASSWORD,config.SFA_DB_HOST,config.SFA_DB_PORT,dbname)
+ for url in [ unix_url, tcp_url ] :
+ try:
+ self.slab_engine = create_engine (url,echo_pool=True,echo=True)
+ self.check()
+ self.url=url
+ return
+ except:
+ pass
+ self.slab_engine=None
+ raise Exception,"Could not connect to database"
+
+ def check (self):
+ self.slab_engine.execute ("select 1").scalar()
+
+
+ def session (self):
+ if self.slab_session is None:
+ Session=sessionmaker ()
+ self.slab_session=Session(bind=self.slab_engine)
+ return self.slab_session
+
+
+
+ #Close connection to database
def close(self):
if self.connection is not None:
self.connection.close()
self.connection = None
+
+
+
def exists(self, tablename):
- mark = self.cursor()
- sql = "SELECT * from pg_tables"
- mark.execute(sql)
- rows = mark.fetchall()
- mark.close()
- labels = [column[0] for column in mark.description]
- rows = [dict(zip(labels, row)) for row in rows]
-
- rows = filter(lambda row: row['tablename'].startswith(tablename), rows)
- if rows:
- return True
- return False
+ """
+ Checks if the table specified as tablename exists.
- def createtable(self, tablename ):
- mark = self.cursor()
- tablelist =[]
- T = tablenames_dict[tablename]
- for k in T.keys():
- tmp = str(k) +' ' + T[k]
- tablelist.append(tmp)
- end = ",".join(tablelist)
-
- statement = "CREATE TABLE " + tablename + " ("+ end +");"
-
- #template = "CREATE INDEX %s_%s_idx ON %s (%s);"
- #indexes = [template % ( self.tablename, field, self.tablename, field) \
- #for field in ['hrn', 'type', 'authority', 'peer_authority', 'pointer']]
- # IF EXISTS doenst exist in postgres < 8.2
+ """
+
try:
- mark.execute('DROP TABLE IF EXISTS ' + tablename +';')
- except:
- try:
- mark.execute('DROP TABLE' + tablename +';')
- except:
- pass
-
- mark.execute(statement)
- #for index in indexes:
- #self.db.do(index)
- self.connection.commit()
- mark.close()
- #self.connection.close()
- self.close()
- return
-
-
- def findRecords(self,table, column, operator, string):
- mark = self.cursor()
+ metadata = MetaData (bind=self.slab_engine)
+ table=Table (tablename, metadata, autoload=True)
+
+ return True
+ except NoSuchTableError:
+ print>>sys.stderr, " \r\n \r\n \t SLABPOSTGRES EXISTS NOPE! tablename %s " %(tablename)
+ return False
+
- statement = 'SELECT * FROM ' + table + ' WHERE ' + column + ' ' + operator + ' ' + ' \'' + string +'\''
- mark.execute(statement)
- record = mark.fetchall()
- mark.close()
- self.connection.close()
- return record
-
-
- def insert(self, table, columns,values):
- mark = self.cursor()
- statement = "INSERT INTO " + table + \
- "(" + ",".join(columns) + ") " + \
- "VALUES(" + ", ".join(values) + ");"
-
- #statement = 'INSERT INTO ' + table + ' (' + columns + ') VALUES (' + values + ')'
- print>>sys.stderr, " \r\n insert statement", statement
- mark.execute(statement)
- self.connection.commit()
- mark.close()
- #self.connection.close()
- self.close()
- return
+ def createtable(self, tablename ):
+ """
+ Creates the specifed table. Uses the global dictionnary holding the tablenames and
+ the table schema.
- def insert_slice(self, person_rec):
- sfatable = SfaTable()
- keys = slice_table.keys()
-
- #returns a list of records (dicts)
- #the filters specified will return only one matching record, into a list of dicts
-
- userrecord = sfatable.find({'hrn': person_rec['hrn'], 'type':'user'})
-
- slicerec = sfatable.find({'hrn': person_rec['hrn']+'_slice', 'type':'slice'})
- if (isinstance (userrecord, list)):
- userrecord = userrecord[0]
- if (isinstance (slicerec, list)):
- slicerec = slicerec[0]
-
- values = [ '-1', ' \''+ str(slicerec['hrn']) + '\'', str(userrecord['record_id']), str( slicerec['record_id'])]
+ """
- self.insert('slice', keys, values)
- return
-
- def update(self, table, column_names, values, whereclause, valueclause):
-
- #Creates the values string for the update SQL command
- if len(column_names) is not len(values):
- return
- else:
- valueslist = []
- valuesdict = dict(zip(column_names,values))
- for k in valuesdict.keys():
- valuesdict[k] = str(valuesdict[k])
- v = ' \''+ str(k) + '\''+ '='+' \''+ valuesdict[k]+'\''
- valueslist.append(v)
-
- statement = "UPDATE %s SET %s WHERE %s = %s" % \
- (table, ", ".join(valueslist), whereclause, valueclause)
- print >>sys.stderr, "\r\n \r\n \t SLABPOSTGRES.PY UPDATE statement ", statement
- mark = self.cursor()
- mark.execute(statement)
- self.connection.commit()
- mark.close()
- self.close()
- #self.connection.close()
+ print>>sys.stderr, " \r\n \r\n \t SLABPOSTGRES createtable SlabBase.metadata.sorted_tables %s \r\n engine %s" %(SlabBase.metadata.sorted_tables , slab_engine)
+ SlabBase.metadata.create_all(slab_engine)
return
+
- def update_slice(self, slice_rec):
- sfatable = SfaTable()
- userhrn = slice_rec['hrn'].strip('_slice')
- userrecords = sfatable.find({'hrn': userhrn, 'type':'user'})
- columns = [ 'record_user_id', 'oar_job_id']
- values = [slice_rec['record_user_id'],slice_rec['oar_job_id']]
- self.update('slice',columns, values,'record_slice_id', slice_rec['record_slice_id'])
- return
+ def find (self, name = None, filter_dict = None):
+ if filter_dict:
+ filter_statement = "and_(SlabSliceDB."
+ for k in filter_dict:
+ filter_statement += str(k)+ "==" + str(filter_dict[l])
+ filter_statement +=')'
+ print>>sys.stderr, " \r\n \r\n \t SLABPOSTGRES find filter_statement %s"%(filter_statement)
+ slab_dbsession.query(SlabSliceDB).filter(filter_statement)
-
\ No newline at end of file
+
+
+from sfa.util.config import Config
+
+slab_alchemy= SlabDB(Config())
+slab_engine=slab_alchemy.slab_engine
+slab_dbsession=slab_alchemy.session()
\ No newline at end of file
git://git.onelab.eu / sfa.git / blobdiff