fixed view tests

murich · Dec 4, 2011 · 45df416 · 45df416
1 parent 0793064
commit 45df416
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 79 deletions.
diff --git a/RedBean/Facade.php b/RedBean/Facade.php
@@ -592,7 +592,6 @@ public static function dup($bean,$trail=array()) {
 		$trail[$key]=true;
 		$copy = RedBean_Facade::dispense($type);
 		$copy->import( $bean->export() );
-		//$copy->copyMetaFrom( $bean );
 		$copy->id = 0;
 		$tables = self::$writer->getTables();
 		foreach($tables as $table) {
@@ -967,17 +966,6 @@ public static function genSlots($array) {
 		}
 	}
 
-	/**
-	 * Installs the default bean formatter with a prefix.
-	 *
-	 * @param string $prefix prefix
-	 */
-	public static function prefix($prefix) {
-		$beanFormatter = new RedBean_DefaultBeanFormatter;
-		$beanFormatter->setPrefix($prefix);
-		self::$writer->setBeanFormatter($beanFormatter);
-	}
-
 	/**
 	 * Nukes the entire database.
 	 */

diff --git a/testing/RedUNIT/Mysql/Views.php b/testing/RedUNIT/Mysql/Views.php
@@ -21,21 +21,7 @@ class RedUNIT_Mysql_Views extends RedUNIT_Mysql {
 	 * @return void
 	 */
 	public function run() {
-		testpack("test views");
-		$tf = new Fm();
-		R::$writer->setBeanFormatter($tf);
-		$this->views("prefix_");
-		$tf2 = new Fm2();
-		R::$writer->setBeanFormatter($tf2);
-		$this->views("prefix_");
-	}
-
-	/**
-	 * Helper function to generate views
-	 * 
-	 * @param string $p prefix for views
-	 */	
-	public function views($p='') {
+		$p='';
 		R::nuke();
 		R::exec(" drop table if exists prefix_bandmember_musician ");
 		R::exec(" drop table if exists prefix_band_bandmember ");
@@ -93,7 +79,7 @@ public function views($p='') {
 			fail();
 		}
 		//can we do a simple query?
-		$nameOfBandWithID1 = R::getCell("select `name` from ".$p."bandlist where ".R::$writer->getIDField("band")." = 1 group by  ".R::$writer->getIDField("band"));
+		$nameOfBandWithID1 = R::getCell("select `name` from ".$p."bandlist where id = 1 group by  id");
 		asrt($nameOfBandWithID1,"The Groofy");
 		//can we generate a report? list all bandleaders
 		$bandleaders = R::getAll("select  `bandleader_of_bandmember`,`name_of_musician`,`name` AS bandname
@@ -109,8 +95,8 @@ public function views($p='') {
 		}
 		//can we draw statistics?
 		$inHowManyBandsDoYouPlay = R::getAll("select
-		`name_of_musician` ,count( distinct `".R::$writer->getIDField("band")."`) as bands
-		from ".$p."bandlist group by `".R::$writer->getIDField("musician")."_of_musician`  order by `name_of_musician` asc
+		`name_of_musician` ,count( distinct `id`) as bands
+		from ".$p."bandlist group by `id_of_musician`  order by `name_of_musician` asc
 		");
 		asrt($inHowManyBandsDoYouPlay[0]["name_of_musician"],"Donald");
 		asrt($inHowManyBandsDoYouPlay[0]["bands"],'2');
@@ -121,9 +107,9 @@ public function views($p='') {
 		//who plays in band 2
 		//can we make a selectbox
 		$selectbox = R::getAll("
-			select m.".R::$writer->getIDField("musician").", m.name, b.".R::$writer->getIDField("band")." as selected from ".$p."musician as m
-			left join ".$p."bandlist as b on b.".R::$writer->getIDField("musician")."_of_musician = m.".R::$writer->getIDField("musician")." and
-			b.".R::$writer->getIDField("band")." =2
+			select m.id, m.name, b.id as selected from ".$p."musician as m
+			left join ".$p."bandlist as b on b.id_of_musician = m.id and
+			b.id =2
 			order by m.name asc
 		");
 

diff --git a/testing/RedUNIT/Postgres/Views.php b/testing/RedUNIT/Postgres/Views.php
@@ -21,22 +21,8 @@ class RedUNIT_Postgres_Views extends RedUNIT_Postgres {
 	 * @return void
 	 */
 	public function run() {
-		testpack("test views");
-		$tf = new Fm();
-		R::$writer->setBeanFormatter($tf);
-		$this->views("prefix_");
-		$tf2 = new Fm2();
-		R::$writer->setBeanFormatter($tf2);
-		$this->views("prefix_");
-	}
-
-	/**
-	 * Helper function to test views.
-	 * 
-	 * @param string $p prefix to be used for views.
-	 */	
-	public function views($p='') {
-		R::nuke();		
+		R::nuke();
+		$p='';
 		R::exec(" drop table if exists bandmember_musician CASCADE");
 		R::exec(" drop table if exists band_bandmember CASCADE");
 		R::exec(" drop table if exists prefix_bandmember_musician CASCADE");
@@ -92,13 +78,13 @@ public function views($p='') {
 		}
 
 		//can we do a simple query?
-		$nameOfBandWithID1 = R::getCell("select name from ".$p."bandlist where ".R::$writer->getIDField("band")." = 1
-		group by  ".R::$writer->getIDField("band").",\"name\"");
+		$nameOfBandWithID1 = R::getCell("select name from ".$p."bandlist where id = 1
+		group by  id,\"name\"");
 		asrt($nameOfBandWithID1,"The Groofy");
 
 		//can we generate a report? list all bandleaders
 		$bandleaders = R::getAll("select  bandleader_of_bandmember,name_of_musician,\"name\" AS bandname
-			from ".$p."bandlist where bandleader_of_bandmember =  1 group by id ");
+			from ".$p."bandlist where bandleader_of_bandmember =  1 ");
 
 		foreach($bandleaders as $bl) {
 			if ($bl["bandname"]=="Wickey Mickey") {
@@ -110,8 +96,8 @@ public function views($p='') {
 		}
 		//can we draw statistics?
 		$inHowManyBandsDoYouPlay = R::getAll("select
-		name_of_musician ,count( distinct ".R::$writer->getIDField("band").") as bands
-		from ".$p."bandlist group by ".R::$writer->getIDField("musician")."_of_musician,name_of_musician order by name_of_musician asc
+		name_of_musician ,count( distinct id ) as bands
+		from ".$p."bandlist group by id_of_musician,name_of_musician order by name_of_musician asc
 		");
 
 		asrt($inHowManyBandsDoYouPlay[0]["name_of_musician"],"Donald");
@@ -124,9 +110,9 @@ public function views($p='') {
 		//who plays in band 2
 		//can we make a selectbox
 		$selectbox = R::getAll("
-			select m.".R::$writer->getIDField("musician").", m.name, b.".R::$writer->getIDField("band")." as selected from ".$p."musician as m
-			left join ".$p."bandlist as b on b.".R::$writer->getIDField("musician")."_of_musician = m.".R::$writer->getIDField("musician")." and
-			b.".R::$writer->getIDField("band")." =2
+			select m.id, m.name, b.id as selected from ".$p."musician as m
+			left join ".$p."bandlist as b on b.id_of_musician = m.id and
+			b.id =2
 			order by m.name asc
 		");
 

diff --git a/testing/RedUNIT/Sqlite/Views.php b/testing/RedUNIT/Sqlite/Views.php
@@ -21,22 +21,7 @@ class RedUNIT_Sqlite_Views extends RedUNIT_Sqlite {
 	 * @return void
 	 */
 	public function run() {
-		testpack("test views");
-		$tf = new Fm();
-		R::$writer->setBeanFormatter($tf);
-		$this->views("prefix_");
-		$tf2 = new Fm2();
-		R::$writer->setBeanFormatter($tf2);
-		$this->views("prefix_");
-	}
-
-	/**
-	 * Helper function to test views
-	 * 
-	 * @param string $p prefix for views
-	 */
-	public function views($p='') {
-		R::nuke();		
+		$p='';
 		R::exec(" drop table if exists prefix_bandmember_musician ");
 		R::exec(" drop table if exists prefix_band_bandmember ");
 		R::exec(" drop table if exists bandmember_musician ");
@@ -91,7 +76,7 @@ public function views($p='') {
 		}
 
 		//can we do a simple query?
-		$nameOfBandWithID1 = R::getCell("select name from ".$p."bandlist where ".R::$writer->getIDField("band")." = 1 group by  ".R::$writer->getIDField("band"));
+		$nameOfBandWithID1 = R::getCell("select name from ".$p."bandlist where id = 1 group by id ");
 		asrt($nameOfBandWithID1,"The Groofy");
 
 		//can we generate a report? list all bandleaders
@@ -108,8 +93,8 @@ public function views($p='') {
 		}
 		//can we draw statistics?
 		$inHowManyBandsDoYouPlay = R::getAll("select
-		 name_of_musician ,count( distinct ".R::$writer->getIDField("band").") as bands
-		from ".$p."bandlist group by ".R::$writer->getIDField("musician")."_of_musician  order by name_of_musician asc
+		 name_of_musician ,count( distinct id ) as bands
+		from ".$p."bandlist group by id_of_musician  order by name_of_musician asc
 		");
 		asrt($inHowManyBandsDoYouPlay[0]["name_of_musician"],"Donald");
 		asrt($inHowManyBandsDoYouPlay[0]["bands"],'2');
@@ -120,9 +105,9 @@ public function views($p='') {
 		//who plays in band 2
 		//can we make a selectbox
 		$selectbox = R::getAll("
-			select m.".R::$writer->getIDField("musician").", m.name, b.".R::$writer->getIDField("band")." as selected from ".$p."musician as m
-			left join ".$p."bandlist as b on b.".R::$writer->getIDField("musician")."_of_musician = m.".R::$writer->getIDField("musician")." and
-			b.".R::$writer->getIDField("band")." =2
+			select m.id, m.name, b.id as selected from ".$p."musician as m
+			left join ".$p."bandlist as b on b.id_of_musician = m.id and
+			b.id =2
 			order by m.name asc
 		");
 		asrt($selectbox[0]["name"],"Donald");