libervia-pubsub: idavoll/pgsql

annotate idavoll/pgsql_storage.py @ 163:1701c0e2c707

Add --dbpass option for passing a password to the PostgreSQL backend. Author: edwinm Reviewer: ralphm Fixes #1

author	Ralph Meijer <ralphm@ik.nu>
date	Thu, 07 Sep 2006 11:13:46 +0000
parents	5191ba7c4df8
children	ef22e4150caa

rev	line source
155 5191ba7c4df8 Work towards first release 0.5.0. Ralph Meijer <ralphm@ik.nu> parents: 148 diff changeset	1 # Copyright (c) 2003-2006 Ralph Meijer
5191ba7c4df8 Work towards first release 0.5.0. Ralph Meijer <ralphm@ik.nu> parents: 148 diff changeset	2 # See LICENSE for details.
5191ba7c4df8 Work towards first release 0.5.0. Ralph Meijer <ralphm@ik.nu> parents: 148 diff changeset	3
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	4 import copy
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	5 import storage
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	6 from twisted.enterprise import adbapi
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	7 from twisted.internet import defer
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	8 from twisted.words.protocols.jabber import jid
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	9 from zope.interface import implements
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	10
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	11 class Storage:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	12
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	13 implements(storage.IStorage)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	14
163 1701c0e2c707 Add --dbpass option for passing a password to the PostgreSQL backend. Ralph Meijer <ralphm@ik.nu> parents: 155 diff changeset	15 def __init__(self, user, database, password = None):
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	16 self._dbpool = adbapi.ConnectionPool('pyPgSQL.PgSQL',
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	17 user=user,
163 1701c0e2c707 Add --dbpass option for passing a password to the PostgreSQL backend. Ralph Meijer <ralphm@ik.nu> parents: 155 diff changeset	18 password=password,
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	19 database=database,
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	20 client_encoding='utf-8'
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	21 )
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	22
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	23 def get_node(self, node_id):
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	24 return self._dbpool.runInteraction(self._get_node, node_id)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	25
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	26 def _get_node(self, cursor, node_id):
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	27 configuration = {}
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	28 cursor.execute("""SELECT persistent, deliver_payload FROM nodes
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	29 WHERE node=%s""",
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	30 (node_id,))
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	31 try:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	32 (configuration["pubsub#persist_items"],
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	33 configuration["pubsub#deliver_payloads"]) = cursor.fetchone()
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	34 except TypeError:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	35 raise storage.NodeNotFound
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	36 else:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	37 node = LeafNode(node_id, configuration)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	38 node._dbpool = self._dbpool
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	39 return node
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	40
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	41 def get_node_ids(self):
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	42 d = self._dbpool.runQuery("""SELECT node from nodes""")
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	43 d.addCallback(lambda results: [r[0] for r in results])
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	44 return d
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	45
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	46 def create_node(self, node_id, owner, type='leaf'):
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	47 return self._dbpool.runInteraction(self._create_node, node_id, owner)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	48
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	49 def _create_node(self, cursor, node_id, owner):
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	50 node_id = node_id
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	51 owner = owner.userhost()
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	52 try:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	53 cursor.execute("""INSERT INTO nodes (node) VALUES (%s)""",
113 dfef919aaf1b Fix interpretations of JIDs. Ralph Meijer <ralphm@ik.nu> parents: 107 diff changeset	54 (node_id))
dfef919aaf1b Fix interpretations of JIDs. Ralph Meijer <ralphm@ik.nu> parents: 107 diff changeset	55 except cursor._pool.dbapi.OperationalError:
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	56 raise storage.NodeExists
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	57
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	58 cursor.execute("""SELECT 1 from entities where jid=%s""",
113 dfef919aaf1b Fix interpretations of JIDs. Ralph Meijer <ralphm@ik.nu> parents: 107 diff changeset	59 (owner))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	60
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	61 if not cursor.fetchone():
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	62 cursor.execute("""INSERT INTO entities (jid) VALUES (%s)""",
113 dfef919aaf1b Fix interpretations of JIDs. Ralph Meijer <ralphm@ik.nu> parents: 107 diff changeset	63 (owner))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	64
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	65 cursor.execute("""INSERT INTO affiliations
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	66 (node_id, entity_id, affiliation)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	67 SELECT n.id, e.id, 'owner' FROM
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	68 (SELECT id FROM nodes WHERE node=%s) AS n
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	69 CROSS JOIN
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	70 (SELECT id FROM entities WHERE jid=%s) AS e""",
113 dfef919aaf1b Fix interpretations of JIDs. Ralph Meijer <ralphm@ik.nu> parents: 107 diff changeset	71 (node_id, owner))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	72
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	73 def delete_node(self, node_id):
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	74 return self._dbpool.runInteraction(self._delete_node, node_id)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	75
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	76 def _delete_node(self, cursor, node_id):
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	77 cursor.execute("""DELETE FROM nodes WHERE node=%s""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	78 (node_id,))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	79
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	80 if cursor.rowcount != 1:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	81 raise storage.NodeNotFound
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	82
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	83 def get_affiliations(self, entity):
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	84 d = self._dbpool.runQuery("""SELECT node, affiliation FROM entities
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	85 JOIN affiliations ON
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	86 (affiliations.entity_id=entities.id)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	87 JOIN nodes ON
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	88 (nodes.id=affiliations.node_id)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	89 WHERE jid=%s""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	90 (entity.userhost(),))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	91 d.addCallback(lambda results: [tuple(r) for r in results])
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	92 return d
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	93
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	94 def get_subscriptions(self, entity):
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	95 d = self._dbpool.runQuery("""SELECT node, jid, resource, subscription
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	96 FROM entities JOIN subscriptions ON
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	97 (subscriptions.entity_id=entities.id)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	98 JOIN nodes ON
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	99 (nodes.id=subscriptions.node_id)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	100 WHERE jid=%s""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	101 (entity.userhost(),))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	102 d.addCallback(self._convert_subscription_jids)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	103 return d
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	104
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	105 def _convert_subscription_jids(self, subscriptions):
148 b03e5ad81173 Change all calls to jid.JID to jid.internJID to avoid redoing stringprep. Ralph Meijer <ralphm@ik.nu> parents: 146 diff changeset	106 return [(node,
b03e5ad81173 Change all calls to jid.JID to jid.internJID to avoid redoing stringprep. Ralph Meijer <ralphm@ik.nu> parents: 146 diff changeset	107 jid.internJID('%s/%s' % (subscriber, resource)),
b03e5ad81173 Change all calls to jid.JID to jid.internJID to avoid redoing stringprep. Ralph Meijer <ralphm@ik.nu> parents: 146 diff changeset	108 subscription)
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	109 for node, subscriber, resource, subscription in subscriptions]
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	110
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	111 class Node:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	112
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	113 implements(storage.INode)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	114
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	115 def __init__(self, node_id, config):
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	116 self.id = node_id
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	117 self._config = config
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	118
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	119 def _check_node_exists(self, cursor):
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	120 cursor.execute("""SELECT id FROM nodes WHERE node=%s""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	121 (self.id))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	122 if not cursor.fetchone():
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	123 raise backend.NodeNotFound
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	124
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	125 def get_type(self):
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	126 return self.type
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	127
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	128 def get_configuration(self):
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	129 return self._config
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	130
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	131 def set_configuration(self, options):
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	132 config = copy.copy(self._config)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	133
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	134 for option in options:
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	135 if option in config:
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	136 config[option] = options[option]
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	137
124 c4ee16bc48e5 Change Node.set_configuration() to set cached configuration in a callback. Ralph Meijer <ralphm@ik.nu> parents: 121 diff changeset	138 d = self._dbpool.runInteraction(self._set_configuration, config)
c4ee16bc48e5 Change Node.set_configuration() to set cached configuration in a callback. Ralph Meijer <ralphm@ik.nu> parents: 121 diff changeset	139 d.addCallback(self._set_cached_configuration, config)
c4ee16bc48e5 Change Node.set_configuration() to set cached configuration in a callback. Ralph Meijer <ralphm@ik.nu> parents: 121 diff changeset	140 return d
c4ee16bc48e5 Change Node.set_configuration() to set cached configuration in a callback. Ralph Meijer <ralphm@ik.nu> parents: 121 diff changeset	141
c4ee16bc48e5 Change Node.set_configuration() to set cached configuration in a callback. Ralph Meijer <ralphm@ik.nu> parents: 121 diff changeset	142 def _set_configuration(self, cursor, config):
c4ee16bc48e5 Change Node.set_configuration() to set cached configuration in a callback. Ralph Meijer <ralphm@ik.nu> parents: 121 diff changeset	143 self._check_node_exists(cursor)
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	144 cursor.execute("""UPDATE nodes SET persistent=%s, deliver_payload=%s
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	145 WHERE node=%s""",
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	146 (config["pubsub#persist_items"],
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	147 config["pubsub#deliver_payloads"],
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	148 self.id))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	149
124 c4ee16bc48e5 Change Node.set_configuration() to set cached configuration in a callback. Ralph Meijer <ralphm@ik.nu> parents: 121 diff changeset	150 def _set_cached_configuration(self, void, config):
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	151 self._config = config
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	152
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	153 def get_meta_data(self):
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	154 config = copy.copy(self._config)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	155 config["pubsub#node_type"] = self.type
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	156 return config
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	157
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	158 def get_affiliation(self, entity):
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	159 return self._dbpool.runInteraction(self._get_affiliation, entity)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	160
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	161 def _get_affiliation(self, cursor, entity):
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	162 self._check_node_exists(cursor)
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	163 cursor.execute("""SELECT affiliation FROM affiliations
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	164 JOIN nodes ON (node_id=nodes.id)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	165 JOIN entities ON (entity_id=entities.id)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	166 WHERE node=%s AND jid=%s""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	167 (self.id,
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	168 entity.userhost()))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	169
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	170 try:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	171 return cursor.fetchone()[0]
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	172 except TypeError:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	173 return None
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	174
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	175 def get_subscription(self, subscriber):
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	176 return self._dbpool.runInteraction(self._get_subscription, subscriber)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	177
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	178 def _get_subscription(self, cursor, subscriber):
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	179 self._check_node_exists(cursor)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	180
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	181 userhost = subscriber.userhost()
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	182 resource = subscriber.resource or ''
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	183
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	184 cursor.execute("""SELECT subscription FROM subscriptions
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	185 JOIN nodes ON (nodes.id=subscriptions.node_id)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	186 JOIN entities ON
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	187 (entities.id=subscriptions.entity_id)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	188 WHERE node=%s AND jid=%s AND resource=%s""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	189 (self.id,
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	190 userhost,
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	191 resource))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	192 try:
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	193 return cursor.fetchone()[0]
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	194 except TypeError:
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	195 return None
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	196
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	197 def add_subscription(self, subscriber, state):
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	198 return self._dbpool.runInteraction(self._add_subscription, subscriber,
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	199 state)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	200
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	201 def _add_subscription(self, cursor, subscriber, state):
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	202 self._check_node_exists(cursor)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	203
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	204 userhost = subscriber.userhost()
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	205 resource = subscriber.resource or ''
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	206
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	207 try:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	208 cursor.execute("""INSERT INTO entities (jid) VALUES (%s)""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	209 (userhost))
113 dfef919aaf1b Fix interpretations of JIDs. Ralph Meijer <ralphm@ik.nu> parents: 107 diff changeset	210 except cursor._pool.dbapi.OperationalError:
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	211 pass
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	212
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	213 try:
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	214 cursor.execute("""INSERT INTO subscriptions
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	215 (node_id, entity_id, resource, subscription)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	216 SELECT n.id, e.id, %s, %s FROM
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	217 (SELECT id FROM nodes WHERE node=%s) AS n
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	218 CROSS JOIN
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	219 (SELECT id FROM entities WHERE jid=%s) AS e""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	220 (resource,
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	221 state,
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	222 self.id,
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	223 userhost))
113 dfef919aaf1b Fix interpretations of JIDs. Ralph Meijer <ralphm@ik.nu> parents: 107 diff changeset	224 except cursor._pool.dbapi.OperationalError:
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	225 raise storage.SubscriptionExists
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	226
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	227 def remove_subscription(self, subscriber):
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	228 return self._dbpool.runInteraction(self._remove_subscription,
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	229 subscriber)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	230
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	231 def _remove_subscription(self, cursor, subscriber):
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	232 self._check_node_exists(cursor)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	233
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	234 userhost = subscriber.userhost()
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	235 resource = subscriber.resource or ''
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	236
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	237 cursor.execute("""DELETE FROM subscriptions WHERE
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	238 node_id=(SELECT id FROM nodes WHERE node=%s) AND
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	239 entity_id=(SELECT id FROM entities WHERE jid=%s)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	240 AND resource=%s""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	241 (self.id,
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	242 userhost,
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	243 resource))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	244 if cursor.rowcount != 1:
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	245 raise storage.SubscriptionNotFound
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	246
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	247 return None
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	248
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	249 def get_subscribers(self):
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	250 d = self._dbpool.runInteraction(self._get_subscribers)
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	251 d.addCallback(self._convert_to_jids)
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	252 return d
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	253
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	254 def _get_subscribers(self, cursor):
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	255 self._check_node_exists(cursor)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	256 cursor.execute("""SELECT jid, resource FROM subscriptions
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	257 JOIN nodes ON (node_id=nodes.id)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	258 JOIN entities ON (entity_id=entities.id)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	259 WHERE node=%s AND
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	260 subscription='subscribed'""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	261 (self.id,))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	262 return cursor.fetchall()
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	263
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	264 def _convert_to_jids(self, list):
148 b03e5ad81173 Change all calls to jid.JID to jid.internJID to avoid redoing stringprep. Ralph Meijer <ralphm@ik.nu> parents: 146 diff changeset	265 return [jid.internJID("%s/%s" % (l[0], l[1])) for l in list]
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	266
146 b4490bdc77e5 Change semantics of Node.is_subscribed() to match all subscriptions for an Ralph Meijer <ralphm@ik.nu> parents: 145 diff changeset	267 def is_subscribed(self, entity):
b4490bdc77e5 Change semantics of Node.is_subscribed() to match all subscriptions for an Ralph Meijer <ralphm@ik.nu> parents: 145 diff changeset	268 return self._dbpool.runInteraction(self._is_subscribed, entity)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	269
146 b4490bdc77e5 Change semantics of Node.is_subscribed() to match all subscriptions for an Ralph Meijer <ralphm@ik.nu> parents: 145 diff changeset	270 def _is_subscribed(self, cursor, entity):
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	271 self._check_node_exists(cursor)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	272
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	273 cursor.execute("""SELECT 1 FROM entities
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	274 JOIN subscriptions ON
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	275 (entities.id=subscriptions.entity_id)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	276 JOIN nodes ON
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	277 (nodes.id=subscriptions.node_id)
146 b4490bdc77e5 Change semantics of Node.is_subscribed() to match all subscriptions for an Ralph Meijer <ralphm@ik.nu> parents: 145 diff changeset	278 WHERE entities.jid=%s
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	279 AND node=%s AND subscription='subscribed'""",
146 b4490bdc77e5 Change semantics of Node.is_subscribed() to match all subscriptions for an Ralph Meijer <ralphm@ik.nu> parents: 145 diff changeset	280 (entity.userhost(),
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	281 self.id))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	282
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	283 return cursor.fetchone() is not None
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	284
145 f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	285 def get_affiliations(self):
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	286 return self._dbpool.runInteraction(self._get_affiliations)
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	287
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	288 def _get_affiliations(self, cursor):
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	289 self._check_node_exists(cursor)
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	290
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	291 cursor.execute("""SELECT jid, affiliation FROM nodes
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	292 JOIN affiliations ON
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	293 (nodes.id = affiliations.node_id)
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	294 JOIN entities ON
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	295 (affiliations.entity_id = entities.id)
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	296 WHERE node=%s""",
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	297 self.id)
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	298 result = cursor.fetchall()
f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	299
148 b03e5ad81173 Change all calls to jid.JID to jid.internJID to avoid redoing stringprep. Ralph Meijer <ralphm@ik.nu> parents: 146 diff changeset	300 return [(jid.internJID(r[0]), r[1]) for r in result]
145 f393bccec4bc Add get_affiliations to Node class in storage facilities in preparation of Ralph Meijer <ralphm@ik.nu> parents: 142 diff changeset	301
146 b4490bdc77e5 Change semantics of Node.is_subscribed() to match all subscriptions for an Ralph Meijer <ralphm@ik.nu> parents: 145 diff changeset	302 class LeafNodeMixin:
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	303
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	304 type = 'leaf'
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	305
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	306 def store_items(self, items, publisher):
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	307 return self._dbpool.runInteraction(self._store_items, items, publisher)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	308
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	309 def _store_items(self, cursor, items, publisher):
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	310 self._check_node_exists(cursor)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	311 for item in items:
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	312 self._store_item(cursor, item, publisher)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	313
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	314 def _store_item(self, cursor, item, publisher):
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	315 data = item.toXml()
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	316 cursor.execute("""UPDATE items SET date=now(), publisher=%s, data=%s
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	317 FROM nodes
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	318 WHERE nodes.id = items.node_id AND
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	319 nodes.node = %s and items.item=%s""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	320 (publisher.full(),
127 d3689da18ed2 Don't use encode('utf-8') on serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 124 diff changeset	321 data,
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	322 self.id,
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	323 item["id"]))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	324 if cursor.rowcount == 1:
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	325 return
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	326
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	327 cursor.execute("""INSERT INTO items (node_id, item, publisher, data)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	328 SELECT id, %s, %s, %s FROM nodes WHERE node=%s""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	329 (item["id"],
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	330 publisher.full(),
127 d3689da18ed2 Don't use encode('utf-8') on serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 124 diff changeset	331 data,
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	332 self.id))
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	333
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	334 def remove_items(self, item_ids):
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	335 return self._dbpool.runInteraction(self._remove_items, item_ids)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	336
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	337 def _remove_items(self, cursor, item_ids):
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	338 self._check_node_exists(cursor)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	339
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	340 deleted = []
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	341
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	342 for item_id in item_ids:
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	343 cursor.execute("""DELETE FROM items WHERE
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	344 node_id=(SELECT id FROM nodes WHERE node=%s) AND
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	345 item=%s""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	346 (self.id,
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	347 item_id))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	348
142 812300cdbc22 Changed behaviour of retraction of items so that only the actually deleted Ralph Meijer <ralphm@ik.nu> parents: 136 diff changeset	349 if cursor.rowcount:
812300cdbc22 Changed behaviour of retraction of items so that only the actually deleted Ralph Meijer <ralphm@ik.nu> parents: 136 diff changeset	350 deleted.append(item_id)
812300cdbc22 Changed behaviour of retraction of items so that only the actually deleted Ralph Meijer <ralphm@ik.nu> parents: 136 diff changeset	351
812300cdbc22 Changed behaviour of retraction of items so that only the actually deleted Ralph Meijer <ralphm@ik.nu> parents: 136 diff changeset	352 return deleted
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	353
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	354 def get_items(self, max_items=None):
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	355 return self._dbpool.runInteraction(self._get_items, max_items)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	356
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	357 def _get_items(self, cursor, max_items):
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	358 self._check_node_exists(cursor)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	359 query = """SELECT data FROM nodes JOIN items ON
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	360 (nodes.id=items.node_id)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	361 WHERE node=%s ORDER BY date DESC"""
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	362 if max_items:
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	363 cursor.execute(query + " LIMIT %s",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	364 (self.id,
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	365 max_items))
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	366 else:
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	367 cursor.execute(query, (self.id))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	368
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	369 result = cursor.fetchall()
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	370 return [unicode(r[0], 'utf-8') for r in result]
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	371
127 d3689da18ed2 Don't use encode('utf-8') on serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 124 diff changeset	372 def get_items_by_id(self, item_ids):
d3689da18ed2 Don't use encode('utf-8') on serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 124 diff changeset	373 return self._dbpool.runInteraction(self._get_items_by_id, item_ids)
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	374
127 d3689da18ed2 Don't use encode('utf-8') on serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 124 diff changeset	375 def _get_items_by_id(self, cursor, item_ids):
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	376 self._check_node_exists(cursor)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	377 items = []
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	378 for item_id in item_ids:
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	379 cursor.execute("""SELECT data FROM nodes JOIN items ON
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	380 (nodes.id=items.node_id)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	381 WHERE node=%s AND item=%s""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	382 (self.id,
327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	383 item_id))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	384 result = cursor.fetchone()
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	385 if result:
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	386 items.append(unicode(result[0], 'utf-8'))
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	387 return items
107 d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	388
d252d793f0ed Initial revision. Ralph Meijer <ralphm@ik.nu> parents: diff changeset	389 def purge(self):
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	390 return self._dbpool.runInteraction(self._purge)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	391
127 d3689da18ed2 Don't use encode('utf-8') on serialized XML. Ralph Meijer <ralphm@ik.nu> parents: 124 diff changeset	392 def _purge(self, cursor):
121 4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	393 self._check_node_exists(cursor)
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	394
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	395 cursor.execute("""DELETE FROM items WHERE
4f0113adb7ed Add Node._check_node_exists() calls to all Node methods, because nodes could Ralph Meijer <ralphm@ik.nu> parents: 113 diff changeset	396 node_id=(SELECT id FROM nodes WHERE node=%s)""",
136 327de183f48d Discover client_encoding parameter to pyPgSQL, removing all encode() calls. Ralph Meijer <ralphm@ik.nu> parents: 127 diff changeset	397 (self.id,))
146 b4490bdc77e5 Change semantics of Node.is_subscribed() to match all subscriptions for an Ralph Meijer <ralphm@ik.nu> parents: 145 diff changeset	398
b4490bdc77e5 Change semantics of Node.is_subscribed() to match all subscriptions for an Ralph Meijer <ralphm@ik.nu> parents: 145 diff changeset	399 class LeafNode(Node, LeafNodeMixin):
b4490bdc77e5 Change semantics of Node.is_subscribed() to match all subscriptions for an Ralph Meijer <ralphm@ik.nu> parents: 145 diff changeset	400
b4490bdc77e5 Change semantics of Node.is_subscribed() to match all subscriptions for an Ralph Meijer <ralphm@ik.nu> parents: 145 diff changeset	401 implements(storage.ILeafNode)

Mercurial > libervia-pubsub

annotate idavoll/pgsql_storage.py @ 163:1701c0e2c707