@@ -245,7 +245,7 @@ class DBSiteStore(common.SiteStore): f(table, thing_id, pid, value, ordering) def action_delete(table, thing_id, key_id, value, ordering): - self.db.delete(table, where='thing_id=$thing_id AND key_id=$key_id AND value=$value AND ordering=$ordering', vars=locals()) + self.db.delete(table, where='thing_id=$thing_id AND key_id=$key_id', vars=locals()) def action_insert(table, thing_id, key_id, value, ordering): self.db.insert(table, seqname=False, thing_id=thing_id, key_id=key_id, value=value, ordering=ordering) infogami/infobase/dbstore.py @@ -1,5 +1,8 @@ -from infogami.utils.delegate import app import web +import simplejson +import urllib + +from infogami.utils.delegate import app b = app.browser() @@ -44,3 +47,26 @@ def test_notfound(): def test_recent_changes(): b.open('/recentchanges') + +def save(key, **data): + b.open(key + '?m=edit') + b.select_form(name="edit") + + if "type" in data: + data['type.key'] = [data.pop('type')] + + for k, v in data.items(): + b[k] = v + b.submit() + +def query(**kw): + url = '/query.json?' + urllib.urlencode(kw) + return [d['key'] for d in simplejson.loads(b.open(url).read())] + +def test_query(): + save('/test_query_1', title="title 1", body="body 1", type="/type/page") + assert query(type='/type/page', title='title 1') == ['/test_query_1'] + + save('/test_query_1', title="title 2", body="body 1", type="/type/page") + assert query(type='/type/page', title='title 1') == [] + \ No newline at end of file tests/test_infogami/test_pages.py 9d87d51533abfb3d7c71bfc2812d88ce526ca7aa Anand Chitipothu anandology@gmail.com http://github.com/infogami/infogami/commit/287c13d1d97c46f035a97ce975ce1f1ee90179a1 287c13d1d97c46f035a97ce975ce1f1ee90179a1 2009-04-08T02:33:12-07:00 2009-04-08T02:33:12-07:00 fix a bug in save. Deleting old rows from db was not happening correct because of order=NULL instead of order is NULL in the sql query. 01571904172518f4ae593288e76f805903369bfe Anand Chitipothu anandology@gmail.com