Merge pull request #75 from NetCommons3/bugfix/update_serialize

fix: 一括アップデートの際、既に登録しているライブラリを更新するとpackageの内容によってはSQLエラーになり登録できない場合がある。

Author: s-nakajima

Model/Behavior/PluginBehavior.php

@@ -338,7 +338,7 @@ public function updateVersion(Model $model, $packages) {
 						'version' => '\'' . $package['version'] . '\'',
 						'commit_version' => '\'' . $package['commit_version'] . '\'',
 						'commited' => '\'' . $package['commited'] . '\'',
-						'serialize_data' => '\'' . serialize($package) . '\'',
+						'serialize_data' => $model->Plugin->getDataSource()->value(serialize($package), 'string'),
 					);
 					if (! $model->Plugin->updateAll($update, $conditions)) {
 						CakeLog::info(sprintf('[update version] Line(' . __LINE__ . ') Error'));

Test/Case/Model/Behavior/PluginBehavior/UpdateVersionPhotoAlbumsTest.php

@@ -66,7 +66,7 @@ public function testUpdateVersion() {
 			'version' => '\'' . $package['version'] . '\'',
 			'commit_version' => '\'' . $package['commit_version'] . '\'',
 			'commited' => '\'' . $package['commited'] . '\'',
-			'serialize_data' => '\'' . serialize($package) . '\'',
+			'serialize_data' => $this->TestModel->Plugin->getDataSource()->value(serialize($package), 'string'),
 		);
 		$expectedConditions = array(
 			'namespace' => array('netcommons/photo-albums', 'netcommons/photo_albums')

Test/Case/Model/Behavior/PluginBehavior/UpdateVersionTest.php

@@ -64,7 +64,7 @@ private function __prepareUpdateAll($namespace, $return) {
 			'version' => '\'' . $package['version'] . '\'',
 			'commit_version' => '\'' . $package['commit_version'] . '\'',
 			'commited' => '\'' . $package['commited'] . '\'',
-			'serialize_data' => '\'' . serialize($package) . '\'',
+			'serialize_data' => $this->TestModel->Plugin->getDataSource()->value(serialize($package), 'string'),
 		);
 		$expectedConditions = array(
 			'namespace' => $namespace