OpenPNE 3

原因¶

test/unit/util/opActivityQueryBuilderTest.php のテストを動かしたときに下記のようなクエリが MySQL で受け取られている．ここで WHERE NOT IN の部分を見ると 'Array' という値が入っていることがわかる．

SELECT a.id AS a__id, a.member_id AS a__member_id, a.in_reply_to_activity_id AS a__in_reply_to_activity_id, a
.body AS a__body, a.uri AS a__uri, a.public_flag AS a__public_flag, a.is_pc AS a__is_pc, a.is_mobile AS a__is_mobile, a.source AS a__source, 
a.source_uri AS a__source_uri, a.foreign_table AS a__foreign_table, a.foreign_id AS a__foreign_id, a.template AS a__template, a.template_para
m AS a__template_param, a.created_at AS a__created_at, a.updated_at AS a__updated_at, m.id AS m__id, m.name AS m__name, m.invite_member_id AS
 m__invite_member_id, m.is_login_rejected AS m__is_login_rejected, m.created_at AS m__created_at, m.updated_at AS m__updated_at, m.is_active 
AS m__is_active FROM activity_data a LEFT JOIN member m ON a.member_id = m.id WHERE (a.member_id IN (SELECT m2.member_id_to AS m2__member_id_
to FROM member_relationship m2 WHERE (m2.member_id_from = '1' AND m2.is_friend = 1 AND m2.member_id_to NOT IN ('Array'))) AND a.public_flag $
= '2') AND (a.foreign_table IS NULL OR a.foreign_table <> "community") AND (m.is_active = '1' OR m.is_active IS NULL) ORDER BY a.id DESC

該当箇所をみてみると，配列かどうかについては特に確認していない．

178   public function andWhereIn($expr, $params = array(), $not = false)
179   {
180     if (isset($params) && (count($params) == 0))
181     {
182       if (!$not)
183       {
184         return $this->andWhere('0 = 1');
185       }
186       else
187       {
188         return parent::andWhereIn($expr, $params, $not);
189       }
190     } 
192     $this->addWhereInCount(count($params));
193 
194     if ($not)
195     {
196       $this->andWhere($expr.' NOT IN ?', array($params));
197     }
198     else
199     {
200       $this->andWhere($expr.' IN ?', array($params));
201     } 
202 
203     return $this;
204   }

原因としては，おそらく Doctrine_Query の andWhereIn() に渡される際にネストされない配列であるべきものがネストされて渡されていたためとおもわれる．
実際に下記のような修正を適用し， f9eaaaf97258be8b38d4b6e9e36d79195481d5fc の修正のみを revert したコードでテストを実行した場合にすべてのテストケースをパスした．

diff --git a/lib/util/opDoctrineQuery.class.php b/lib/util/opDoctrineQuery.class.php
index 7e5db73..fc9757e 100644
--- a/lib/util/opDoctrineQuery.class.php
+++ b/lib/util/opDoctrineQuery.class.php
@@ -191,13 +191,18 @@ class opDoctrineQuery extends Doctrine_Query

     $this->addWhereInCount(count($params));

+    if (!is_array($params))
+    {
+      $params = array($params);
+    }
+
     if ($not)
     {
-      $this->andWhere($expr.' NOT IN ?', array($params));
+      $this->andWhere($expr.' NOT IN ?', $params);
     }
     else
     {
-      $this->andWhere($expr.' IN ?', array($params));
+      $this->andWhere($expr.' IN ?', $params);
     }

     return $this;

追記）

これでもいいらしい

diff --git a/lib/util/opDoctrineQuery.class.php b/lib/util/opDoctrineQuery.class.php
index 7e5db73..106c051 100644
--- a/lib/util/opDoctrineQuery.class.php
+++ b/lib/util/opDoctrineQuery.class.php
@@ -193,11 +193,11 @@ class opDoctrineQuery extends Doctrine_Query

     if ($not)
     {
-      $this->andWhere($expr.' NOT IN ?', array($params));
+      $this->andWhere($expr.' NOT IN ?', (array)$params);
     }
     else
     {
-      $this->andWhere($expr.' IN ?', array($params));
+      $this->andWhere($expr.' IN ?', (array)$params);
     }

     return $this;

Doctrineに対して下記の修正を施すことで、概要に書かれているコードは動作するようになりました。他のSNS機能に影響がないかどうかは未確認です。
https://github.com/upsilon/doctrine1/compare/op3135_subquery-where-in-bug