diff --git a/classes/db/queryparts/condition/Condition.class.php b/classes/db/queryparts/condition/Condition.class.php index addab276c..b81802f67 100644 --- a/classes/db/queryparts/condition/Condition.class.php +++ b/classes/db/queryparts/condition/Condition.class.php @@ -104,10 +104,10 @@ return $name.' like '.$value; break; case 'in' : - return $name.' in ('.$value.')'; + return $name.' in '.$value; break; case 'notin' : - return $name.' not in ('.$value.')'; + return $name.' not in '.$value; break; case 'notequal' : return $name.' <> '.$value; diff --git a/classes/xml/xmlquery/argument/Argument.class.php b/classes/xml/xmlquery/argument/Argument.class.php index 4111508b3..db37822ee 100644 --- a/classes/xml/xmlquery/argument/Argument.class.php +++ b/classes/xml/xmlquery/argument/Argument.class.php @@ -38,7 +38,7 @@ } function toString($value){ - if(is_array($value)) return implode(',', $value); + if(is_array($value)) return '('.implode(',', $value).')'; return $value; } diff --git a/test-phpUnit/classes/xml/xmlquery/argument/ArgumentTest.php b/test-phpUnit/classes/xml/xmlquery/argument/ArgumentTest.php index 0a8180777..84293883e 100644 --- a/test-phpUnit/classes/xml/xmlquery/argument/ArgumentTest.php +++ b/test-phpUnit/classes/xml/xmlquery/argument/ArgumentTest.php @@ -213,6 +213,7 @@ class ArgumentTest extends CubridTest { public function testCreateConditionValue_In_StringValues() { $member_srl_argument = new ConditionArgument('"mid"', array('forum', 'board'), 'in'); $member_srl_argument->createConditionValue(); + $member_srl_argument->setColumnType('varchar'); $this->assertEquals('(\'forum\',\'board\')', $member_srl_argument->getValue()); } diff --git a/test-phpUnit/classes/xml/xmlquery/queryargument/QueryArgumentTest.php b/test-phpUnit/classes/xml/xmlquery/queryargument/QueryArgumentTest.php index ec40ce9d9..d8911682f 100644 --- a/test-phpUnit/classes/xml/xmlquery/queryargument/QueryArgumentTest.php +++ b/test-phpUnit/classes/xml/xmlquery/queryargument/QueryArgumentTest.php @@ -20,11 +20,11 @@ class QueryArgumentTest extends CubridTest { $this->assertEquals("member_srl", $tag->getColumnName()); $this->assertEquals(true, $tag->isConditionArgument()); - $actual = $tag->toString(); - $expected = ' $member_srl_argument = new ConditionArgument(\'member_srl\', $args->member_srl, \'equal\'); + $actual = Helper::cleanString($tag->toString()); + $expected = Helper::cleanString('$member_srl_argument = new ConditionArgument(\'member_srl\', $args->member_srl, \'equal\'); $member_srl_argument->checkNotNull(); $member_srl_argument->createConditionValue(); - if(!$member_srl_argument->isValid()) return $member_srl_argument->getErrorMessage();'; + if(!$member_srl_argument->isValid()) return $member_srl_argument->getErrorMessage();'); $this->assertEquals($expected, $actual); }