From e4c1f28d849c6a60c369265a502315260babe80b Mon Sep 17 00:00:00 2001
From: Alejandro Ibarra <ajibarra@gmail.com>
Date: Fri, 15 Jul 2011 15:18:38 -0430
Subject: [PATCH] Included validation to skip AppModel on
 CakeSchema->readSchema because it tries to find 'app_models' table. Added
 testSchemaReadWithAppModel test

---
 lib/Cake/Model/CakeSchema.php               | 12 +++++--
 lib/Cake/Test/Case/Model/CakeSchemaTest.php | 35 +++++++++++++++++++++
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/lib/Cake/Model/CakeSchema.php b/lib/Cake/Model/CakeSchema.php
index 206f4a5a1..05b5536e3 100644
--- a/lib/Cake/Model/CakeSchema.php
+++ b/lib/Cake/Model/CakeSchema.php
@@ -224,11 +224,16 @@ class CakeSchema extends Object {
 				$models = App::objects('Model');
 			}
 		}
-
+		
 		if (is_array($models)) {
 			foreach ($models as $model) {
 				$importModel = $model;
 				$plugin = null;
+				
+				if ($model == 'AppModel') {
+					continue;
+				}
+				
 				if (isset($this->plugin)) {
 					if ($model == $this->plugin . 'AppModel') {
 						continue;
@@ -236,7 +241,7 @@ class CakeSchema extends Object {
 					$importModel = $model;
 					$plugin = $this->plugin . '.';
 				}
-
+				
 				App::uses($importModel, $plugin . 'Model');
 				if (!class_exists($importModel)) {
 					continue;
@@ -290,7 +295,7 @@ class CakeSchema extends Object {
 				}
 			}
 		}
-
+		
 		if (!empty($currentTables)) {
 			foreach ($currentTables as $table) {
 				if ($prefix) {
@@ -324,6 +329,7 @@ class CakeSchema extends Object {
 
 		ksort($tables);
 		return compact('name', 'tables');
+		
 	}
 
 /**
diff --git a/lib/Cake/Test/Case/Model/CakeSchemaTest.php b/lib/Cake/Test/Case/Model/CakeSchemaTest.php
index f7e76bee0..d0a878550 100644
--- a/lib/Cake/Test/Case/Model/CakeSchemaTest.php
+++ b/lib/Cake/Test/Case/Model/CakeSchemaTest.php
@@ -602,6 +602,41 @@ class CakeSchemaTest extends CakeTestCase {
 		));
 		$this->assertFalse(isset($read['tables']['missing']['posts_tags']), 'Join table marked as missing');
 	}
+	
+/**
+* testSchemaReadWithAppModel method
+*
+* @access public
+* @return void
+*/
+	public function testSchemaReadWithAppModel() {
+		$connections = ConnectionManager::enumConnectionObjects();
+		if (!empty($connections['default'])) { 
+			$backup = $connections['default']; 
+			ConnectionManager::drop('default'); 
+		}
+		ConnectionManager::create('default', $connections['test']);
+		try {
+			$read = $this->Schema->read(array(
+					'connection' => 'default',
+					'name' => 'TestApp',
+					'models' => array('AppModel')
+			));
+			unset($read['tables']['missing']);
+			$this->assertTrue(empty($read['tables']));
+			if (!empty($backup)) {
+				ConnectionManager::drop('default');
+				ConnectionManager::create('default', $backup);
+			}
+		} catch(MissingTableException $mte) {
+			if (!empty($backup)) {
+				ConnectionManager::drop('default');
+				ConnectionManager::create('default', $backup);
+			}
+			$this->fail($mte->getMessage());
+		}
+		
+	}
 
 /**
  * testSchemaReadWithOddTablePrefix method