Merge branch 'master' of git://github.com/yiisoft/yii.git

marcovtwout · Apr 12, 2013 · 182c718 · 182c718
2 parents 36df2ff + 0adc8cb
commit 182c718
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 77 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -41,6 +41,7 @@ Version 1.1.14 work in progress
 - Bug #2244: MessageCommand has been updated, allowing to merge string with value '0' correctly (klimov-paul)
 - Bug #2258: CJuiSliderInput didn't support string typed 'range' option (bookin)
 - Bug #2283: Gii Model Generator's tooltips are not working and always invisible (resurtm)
+- Bug #2289: CDbCacheDependency with reuseDependentData did not invalidate cache when getting cache across different requests (marcovtwout)
 - Bug #2299: CMssqlSchema: findTableNames(), getTables() and getTableNames() methods used to prepend schema prefix to the table names twice (resurtm)
 - Enh: Better CFileLogRoute performance (Qiang, samdark)
 - Enh: Refactored CHttpRequest::getDelete and CHttpRequest::getPut not to use _restParams directly (samdark)

diff --git a/composer.json b/composer.json
@@ -64,6 +64,9 @@
 		"irc": "irc://irc.freenode.net/yii",
 		"source": "https://github.com/yiisoft/yii"
 	},
+	"bin": [
+		"framework/yiic"
+	],
 	"require": {
 		"php": ">=5.1.0"
 	}

diff --git a/docs/guide/ja/basics.component.txt b/docs/guide/ja/basics.component.txt
@@ -37,7 +37,7 @@ class Document extends CComponent
 class Document extends CComponent
 {
     private $_textWidth;
-    protected $_readOnly=false;
+    protected $_completed=false;
 
     public function getTextWidth()
     {
@@ -54,9 +54,9 @@ class Document extends CComponent
         // テキストの高さを計算して返す
     }
 
-    public function setReadOnly($value)
+    public function setCompleted($value)
     {
-        $this->_readOnly=$value;
+        $this->_completed=$value;
     }
 }
 ~~~
@@ -74,23 +74,10 @@ echo $document->textWidth;
 // テキストの高さは読み出すことしか出来ない
 echo $document->textHeight;
 
-// 読み取り専用プロパティは設定することしかできない
+// 完了フラグは設定することしかできない
 $document->readOnly=true;
 ~~~
 
-~~~
-[php]
-public function getTextWidth()
-{
-    return $this->_textWidth;
-}
-
-public function setTextWidth($value)
-{
-    $this->_textWidth=$value;
-}
-~~~
-
 コンポーネントのプロパティを読み出そうとするとき、そのプロパティがパブリックなクラスメンバとして定義されていない場合には、
 Yii は getter メソッドを使おうと試みます。`textWidth` に対しては `getTextWidth` が
 getter メソッドになります。また、パブリックなクラスメンバとして定義されていないプロパティに対して

diff --git a/framework/caching/dependencies/CCacheDependency.php b/framework/caching/dependencies/CCacheDependency.php
@@ -53,7 +53,7 @@ public function evaluateDependency()
 		if ($this->reuseDependentData)
 		{
 			$hash=$this->getHash();
-			if (!isset(self::$_reusableData[$hash]['dependentData']))
+			if(!isset(self::$_reusableData[$hash]['dependentData']))
 				self::$_reusableData[$hash]['dependentData']=$this->generateDependentData();
 			$this->_data=self::$_reusableData[$hash]['dependentData'];
 		}
@@ -69,13 +69,9 @@ public function getHasChanged()
 		if ($this->reuseDependentData)
 		{
 			$hash=$this->getHash();
-			if (!isset(self::$_reusableData[$hash]['hasChanged']))
-			{
-				if (!isset(self::$_reusableData[$hash]['dependentData']))
-					self::$_reusableData[$hash]['dependentData']=$this->generateDependentData();
-				self::$_reusableData[$hash]['hasChanged']=self::$_reusableData[$hash]['dependentData']!=$this->_data;
-			}
-			return self::$_reusableData[$hash]['hasChanged'];
+			if(!isset(self::$_reusableData[$hash]['dependentData']))
+				self::$_reusableData[$hash]['dependentData']=$this->generateDependentData();
+			return self::$_reusableData[$hash]['dependentData']!=$this->_data;
 		}
 		else
 			return $this->generateDependentData()!=$this->_data;
@@ -90,6 +86,15 @@ public function getDependentData()
 		return $this->_data;
 	}
 
+	/**
+	 * Resets cached data for reusable dependencies.
+	 * @since 1.1.14
+	 */
+	public static function resetReusableData()
+	{
+		self::$_reusableData=array();
+	}
+
 	/**
 	 * Generates the data needed to determine if dependency has been changed.
 	 * Derived classes should override this method to generate actual dependent data.

diff --git a/framework/db/ar/CActiveFinder.php b/framework/db/ar/CActiveFinder.php
@@ -1442,7 +1442,7 @@ private function queryOneMany()
 			$cols=array();
 			foreach($pkTable->primaryKey as $n=>$pk)
 			{
-				$name=$table->columns[$map[$pk]]->rawName;
+				$name=$tableAlias.'.'.$table->columns[$map[$pk]]->rawName;
 				$cols[$name]=$name.' AS '.$schema->quoteColumnName('c'.$n);
 			}
 			$sql='SELECT '.implode(', ',$cols).", {$relation->select} AS $s FROM {$table->rawName} ".$tableAlias.$join

diff --git a/tests/framework/caching/CCacheDependencyTest.php b/tests/framework/caching/CCacheDependencyTest.php
@@ -3,62 +3,65 @@
 
 class CCacheDependencyTest extends CTestCase
 {
-	public function testReusable()
-	{
-		$tempFile=dirname(__FILE__).'/../../runtime/foo.txt';
-		@unlink($tempFile);
-		$fw=fopen($tempFile,"w");
-		fwrite($fw,"test");
-		fclose($fw);
-		clearstatcache();
-		$dependency = new MockFileCacheDependency($tempFile);
-		$dependency->reuseDependentData = true;
-		$dependency->evaluateDependency();
-		$this->assertEquals(1,MockFileCacheDependency::$generateDependentDataCalled);
-		// change file
-		$fw=fopen($tempFile,"w");
-		fwrite($fw,"test again");
-		fclose($fw);
-		clearstatcache();
-		$this->assertFalse($dependency->getHasChanged());
-		$this->assertEquals(1,MockFileCacheDependency::$generateDependentDataCalled);
-		$dependency2 = new MockDirectoryCacheDependency(dirname($tempFile));
-		$dependency2->reuseDependentData = true;
-		// change file
-		$fw=fopen($tempFile,"w");
-		fwrite($fw,"test again");
-		fclose($fw);
-		clearstatcache();
-		$this->assertTrue($dependency2->getHasChanged());
-		$this->assertEquals(1,MockDirectoryCacheDependency::$generateDependentDataCalled);
-		$dependency3 = new MockDirectoryCacheDependency(dirname($tempFile));
-		$dependency3->reuseDependentData = true;
-		$dependency3->evaluateDependency();
-		$this->assertTrue($dependency3->getHasChanged());
-		$this->assertEquals(1,MockDirectoryCacheDependency::$generateDependentDataCalled);
-	}
-}
+    protected $_cacheDependentData=null;
 
-class MockFileCacheDependency extends CFileCacheDependency
-{
-	public static $generateDependentDataCalled = 0;
+    public function setCacheDependentData($cacheDependentData)
+    {
+        $this->_cacheDependentData = $cacheDependentData;
+    }
+
+    public function getCacheDependentData()
+    {
+        return $this->_cacheDependentData;
+    }
+
+    public function testReuseDependentData()
+    {
+        MockCacheDependency::$generateDependentDataCallback=array($this,'getCacheDependentData');
+        $dependency1=new MockCacheDependency();
+        $dependency1->reuseDependentData = true;
+        $dependency2=new MockCacheDependency();
+        $dependency2->reuseDependentData = true;
 
-	public function generateDependentData()
-	{
-		self::$generateDependentDataCalled++;
-		return parent::generateDependentData();
-	}
+        CCacheDependency::resetReusableData();
+        $this->setCacheDependentData('start');
+        $dependency1->evaluateDependency();
+        $dependency2->evaluateDependency();
+        $this->assertFalse($dependency1->getHasChanged(),'Initial dependency1 changed!');
+        $this->assertFalse($dependency2->getHasChanged(),'Initial dependency2 changed!');
+        $this->assertEquals(1,MockCacheDependency::$generateDependentDataCalled,'Extra invokations of "generateDependentData()"!');
 
+        // New request:
+        CCacheDependency::resetReusableData();
+        MockCacheDependency::$generateDependentDataCalled=0;
+        $this->assertFalse($dependency1->getHasChanged(),'Dependency1 changed for new request!');
+        $this->assertFalse($dependency2->getHasChanged(),'Dependency2 changed for new request!');
+        $this->assertEquals(1,MockCacheDependency::$generateDependentDataCalled,'Extra invokations of "generateDependentData()"!');
+
+        // New request:
+        CCacheDependency::resetReusableData();
+        MockCacheDependency::$generateDependentDataCalled=0;
+        $this->setCacheDependentData('change1');
+        $this->assertTrue($dependency1->getHasChanged(),'Dependency1 is not changed after source change!');
+        $dependency1->evaluateDependency();
+
+        // New request:
+        CCacheDependency::resetReusableData();
+        MockCacheDependency::$generateDependentDataCalled=0;
+        $this->assertFalse($dependency1->getHasChanged(),'Dependency1 has been changed!');
+        $this->assertTrue($dependency2->getHasChanged(),'Dependency2 has not been changed!');
+        $this->assertEquals(1,MockCacheDependency::$generateDependentDataCalled,'Extra invokations of "generateDependentData()"!');
+    }
 }
 
-class MockDirectoryCacheDependency extends CDirectoryCacheDependency
+class MockCacheDependency extends CCacheDependency
 {
-	public static $generateDependentDataCalled = 0;
-
-	public function generateDependentData()
-	{
-		self::$generateDependentDataCalled++;
-		return parent::generateDependentData();
-	}
+    public static $generateDependentDataCallback;
+    public static $generateDependentDataCalled = 0;
 
+    public function generateDependentData()
+    {
+        self::$generateDependentDataCalled++;
+        return call_user_func(self::$generateDependentDataCallback);
+    }
 }