# HG changeset patch # User Goffi # Date 1338416660 -7200 # Node ID 70fae534b83abc836c2a9a059ae8696abcb07c38 # Parent 2a948abb77ed97f0e18ec22c25e8cb56de33af21 fixed getItems select in pgsql_storage diff -r 2a948abb77ed -r 70fae534b83a sat_pubsub/pgsql_storage.py --- a/sat_pubsub/pgsql_storage.py Wed May 30 22:36:05 2012 +0200 +++ b/sat_pubsub/pgsql_storage.py Thu May 31 00:24:20 2012 +0200 @@ -599,7 +599,7 @@ def _getItems(self, cursor, maxItems): self._checkNodeExists(cursor) query = """SELECT data FROM nodes - NATURAL JOIN items + INNER JOIN items USING (node_id) WHERE node=%s ORDER BY date DESC""" if maxItems: cursor.execute(query + " LIMIT %s", @@ -622,7 +622,7 @@ items = [] for itemIdentifier in itemIdentifiers: cursor.execute("""SELECT data FROM nodes - NATURAL JOIN items + INNER JOIN items USING (node_id) WHERE node=%s AND item=%s""", (self.nodeIdentifier, itemIdentifier))