Merge pull request #53 from dovg/dialect-fix

* use mb string function

Author: dovg

core/DB/PostgresDialect.class.php

@@ -54,14 +54,12 @@ public static function toCasted($field, $type)
 			return "{$field}::{$type}";
 		}
 
-		public static function prepareFullText($words, $logic)
+		public static function prepareFullText(array $words, $logic)
 		{
-			Assert::isArray($words);
-			
 			$glue = ($logic == DB::FULL_TEXT_AND) ? ' & ' : ' | ';
 
 			return
-				strtolower(
+				mb_strtolower(
 					implode(
 						$glue,
 						array_map(

doc/ChangeLog

@@ -1,3 +1,8 @@
+2011-11-21	Evgeny V. Kokovikhin
+
+	* core/DB/PostgresDialect.class.php, test/main/PostgresDialectTest.class.php:
+	use mb_* string function for utf-8 strings.
+
 2011-11-18	Sergey S. Sergeev
 
 	* main/Utils/AMQP/AMQPConsumer.class.php,

test/main/PostgresDialectTest.class.php

@@ -0,0 +1,15 @@
+<?php
+
+	final class PostgresDialectTest extends TestCase
+	{
+		public function testPrepareFullText()
+		{
+			$this->assertEquals(
+				PostgresDialect::prepareFullText(
+					array('Новый год', 'Снегурочка', 'ПрАзДнИк'),
+					DB::FULL_TEXT_AND),
+				"'новый год' & 'снегурочка' & 'праздник'"
+			);
+		}
+	}
+?>