Merge branch 'onphp-master' into dialect-fix

Conflicts:
	doc/ChangeLog

Author: dovg

doc/ChangeLog

@@ -1,22 +1,34 @@
 2011-11-21	Evgeny V. Kokovikhin
 
 	* core/DB/PostgresDialect.class.php, test/main/PostgresDialectTest.class.php:
-	use mb_* string function for utf-8 strings
+	use mb_* string function for utf-8 strings.
+
+2011-11-18	Sergey S. Sergeev
+
+	* main/Utils/AMQP/AMQPConsumer.class.php,
+	main/Utils/AMQP/AMQPDefaultConsumer.class.php,
+	main/Utils/AMQP/Pecl/AMQPPeclChannel.class.php:
+	handle the change of СonsumerTag implemented.
 
 2011-11-18	Evgeny V. Kokovikhin
-	
-	* main/Messages/TextMessage.class.php, main/Messages/TextFileReceiver.class.php :
-	a bit optimize: don't needed to make Timestamp twice
 
-2011-11-14      Dmitry V. Snezhinskiy
-	
+	* main/Messages/TextMessage.class.php, main/Messages/TextFileReceiver.class.php:
+	a bit optimize: don't needed to make Timestamp twice.
+
+2011-11-17	Sergey S. Sergeev
+
+	* main/Base/LightMetaProperty.class.php: speed up insert or update operations,
+	removes loading objects if property is lazy. Thanks to Alexander V. Solomatin.
+
+2011-11-14	Dmitry V. Snezhinskiy
+
 	* main/Utils/AMQP/Pecl/AMQPPeclChannel.class.php :
-	customize AMQPPeclChannel Exception. Author Evgenia T. Tekalin
+	customize AMQPPeclChannel Exception. Author Evgenia T. Tekalin.
 
 2011-11-14	Evgeny V. Kokovikhin
-	
+
 	* core/Cache/PeclMemcached.class.php, test/core/MemcachedTest.class.php :
-	fix PeclMemcached working with wrong keys. Thanks to Nikita V. Konstantinov
+	fix PeclMemcached working with wrong keys. Thanks to Nikita V. Konstantinov.
 
 2011-10-31	Vasily M. Stashko
 

main/Base/LightMetaProperty.class.php

@@ -358,8 +358,17 @@ public function fillQuery(
 					&& !$this->generic
 				)
 					return $query;
-				
-				$value = $object->{$this->getter}();
+
+				$getter = $this->getter;
+
+				if (
+					$this->relationId
+					&& $this->strategyId == FetchStrategy::LAZY
+				) {
+					$getter = $getter.'Id';
+				}
+
+				$value = $object->{$getter}();
 
 				if ($this->type == 'binary') {
 					$query->set($this->columnName, new DBBinary($value));

main/Utils/AMQP/AMQPConsumer.class.php

@@ -41,6 +41,15 @@ public function handleConsumeOk($consumerTag);
 		**/
 		public function handleCancelOk($consumerTag);
 
+		/**
+		 * Called when the consumer is changed tag
+		 *
+		 * @param string $fromTag
+		 * @param string $toTag
+		 * @return void
+		**/
+		public function handleChangeConsumerTag($fromTag, $toTag);
+
 		/**
 		 * @return AMQPConsumer
 		**/

main/Utils/AMQP/AMQPDefaultConsumer.class.php

@@ -72,6 +72,14 @@ public function handleDelivery(AMQPIncomingMessage $delivery)
 			// no work to do
 		}
 
+		/**
+		 * @return void
+		**/
+		public function handleChangeConsumerTag($fromTag, $toTag)
+		{
+			// no work to do
+		}
+
 		/**
 		 * @return AMQPDefaultConsumer
 		**/

main/Utils/AMQP/Pecl/AMQPPeclChannel.class.php

@@ -485,11 +485,12 @@ public function getNextDelivery()
 			}
 
 			$this->checkCommandResult(
-				is_array($messages),
+				is_array($messages) && !empty($messages),
 				"Could not consume from queue"
 			);
 
 			$message = array_shift($messages);
+
 			$incoming = AMQPIncomingMessage::spawn($message);
 
 			if ($this->consumer->getConsumerTag() === null) {
@@ -499,11 +500,9 @@ public function getNextDelivery()
 				$this->consumer->getConsumerTag()
 				!= $incoming->getConsumerTag()
 			) {
-				throw new WrongStateException(
-					"Consumer change tag consumerTag="
-					."{$this->consumer->getConsumerTag()}, "
-					."message.consumerTag={$incoming->getConsumerTag()}, "
-					."message.body={$incoming->getBody()}"
+				$this->consumer->handleChangeConsumerTag(
+					$this->consumer->getConsumerTag(),
+					$incoming->getConsumerTag()
 				);
 			}
 

test/main/Utils/AMQP/AMQPPeclTest.class.php

@@ -32,6 +32,11 @@ public function getCheckString()
 		{
 			return $this->checkString;
 		}
+
+		public function handleChangeConsumerTag($fromTag, $toTag)
+		{
+			return;
+		}
 	}
 
 	class AMQPPeclTest extends TestCase