From 1fd0e14359a7c7164573e4aa897c07680339e713 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Thu, 26 Nov 2009 12:09:04 -0800 Subject: Convert all DB where() calls to take 3 arguments. Convert all open_paren() calls to and_open() or or_open() as appropriate. --- modules/tag/models/tag.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/tag/models') diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php index be020f5f..f9a453be 100644 --- a/modules/tag/models/tag.php +++ b/modules/tag/models/tag.php @@ -31,9 +31,9 @@ class Tag_Model extends ORM { $model = ORM::factory("item") ->viewable() ->join("items_tags", "items.id", "items_tags.item_id") - ->where("items_tags.tag_id", $this->id); + ->where("items_tags.tag_id", "=", $this->id); if ($type) { - $model->where("items.type", $type); + $model->where("items.type", "=", $type); } return $model->find_all($limit, $offset); } @@ -47,10 +47,10 @@ class Tag_Model extends ORM { $model = ORM::factory("item") ->viewable() ->join("items_tags", "items.id", "items_tags.item_id") - ->where("items_tags.tag_id", $this->id); + ->where("items_tags.tag_id", "=", $this->id); if ($type) { - $model->where("items.type", $type); + $model->where("items.type", "=", $type); } return $model->count_all(); } -- cgit v1.2.3 From 2132c9a96d923d48effc3fe8facedff4a4da3b13 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 6 Dec 2009 20:19:54 -0800 Subject: Fix some database calls. --- modules/tag/controllers/admin_tags.php | 2 +- modules/tag/models/tag.php | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) (limited to 'modules/tag/models') diff --git a/modules/tag/controllers/admin_tags.php b/modules/tag/controllers/admin_tags.php index 6cd2f337..ed4a0366 100644 --- a/modules/tag/controllers/admin_tags.php +++ b/modules/tag/controllers/admin_tags.php @@ -51,7 +51,7 @@ class Admin_Tags_Controller extends Admin_Controller { $form = tag::get_delete_form($tag); if ($form->validate()) { $name = $tag->name; - Database::instance()->delete("items_tags", array("tag_id" => "$tag->id")); + db::build()->delete("items_tags")->where("tag_id", "=", $tag->id)->execute(); $tag->delete(); message::success(t("Deleted tag %tag_name", array("tag_name" => $name))); log::success("tags", t("Deleted tag %tag_name", array("tag_name" => $name))); diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php index f9a453be..b60f8dfc 100644 --- a/modules/tag/models/tag.php +++ b/modules/tag/models/tag.php @@ -63,13 +63,21 @@ class Tag_Model extends ORM { public function save() { $db = Database::instance(); $related_item_ids = array(); - foreach ($db->getwhere("items_tags", array("tag_id" => $this->id)) as $row) { + foreach (db::build() + ->select("item_id") + ->from("items_tags") + ->where("tag_id", "=", $this->id) + ->execute() as $row) { $related_item_ids[$row->item_id] = 1; } $result = parent::save(); - foreach ($db->getwhere("items_tags", array("tag_id" => $this->id)) as $row) { + foreach (db::build() + ->select("item_id") + ->from("items_tags") + ->where("tag_id", "=", $this->id) + ->execute() as $row) { $related_item_ids[$row->item_id] = 1; } @@ -89,7 +97,12 @@ class Tag_Model extends ORM { public function delete() { $related_item_ids = array(); $db = Database::Instance(); - foreach ($db->getwhere("items_tags", array("tag_id" => $this->id)) as $row) { + + foreach (db::build() + ->select("item_id") + ->from("items_tags") + ->where("tag_id", "=", $this->id) + ->execute() as $row) { $related_item_ids[$row->item_id] = 1; } -- cgit v1.2.3 From 3d0a7a33ad0c1bbc16ef6156609110e14b6e0ee6 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 6 Dec 2009 20:38:57 -0800 Subject: Fix a few more database queries --- modules/tag/controllers/tags.php | 2 +- modules/tag/models/tag.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'modules/tag/models') diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php index dfa3a9b3..a44f6aa3 100644 --- a/modules/tag/controllers/tags.php +++ b/modules/tag/controllers/tags.php @@ -83,7 +83,7 @@ class Tags_Controller extends Controller { $limit = $this->input->get("limit"); $tag_part = end($tag_parts); $tag_list = ORM::factory("tag") - ->like("name", "{$tag_part}%", false) + ->where("name", "LIKE", "{$tag_part}%") ->order_by("name", "ASC") ->limit($limit) ->find_all(); diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php index b60f8dfc..f6cc6144 100644 --- a/modules/tag/models/tag.php +++ b/modules/tag/models/tag.php @@ -82,7 +82,9 @@ class Tag_Model extends ORM { } if ($related_item_ids) { - foreach (ORM::factory("item")->in("id", array_keys($related_item_ids))->find_all() as $item) { + foreach (ORM::factory("item") + ->where("id", "IN", array_keys($related_item_ids)) + ->find_all() as $item) { module::event("item_related_update", $item); } } -- cgit v1.2.3 From 046382c3e7f863e291d000eb2bb549474e475d1b Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 18 Dec 2009 11:27:44 -0800 Subject: Remove some unused references to Database::instance() --- modules/tag/models/tag.php | 3 --- 1 file changed, 3 deletions(-) (limited to 'modules/tag/models') diff --git a/modules/tag/models/tag.php b/modules/tag/models/tag.php index f6cc6144..b2ce9eda 100644 --- a/modules/tag/models/tag.php +++ b/modules/tag/models/tag.php @@ -61,7 +61,6 @@ class Tag_Model extends ORM { * event for the union of all related items before and after the save. */ public function save() { - $db = Database::instance(); $related_item_ids = array(); foreach (db::build() ->select("item_id") @@ -98,8 +97,6 @@ class Tag_Model extends ORM { */ public function delete() { $related_item_ids = array(); - $db = Database::Instance(); - foreach (db::build() ->select("item_id") ->from("items_tags") -- cgit v1.2.3