From c84fb21d37ce8405da41b48f372104227201502a Mon Sep 17 00:00:00 2001
From: Alexandre Rosenfeld <alexandre@colosa.com>
Date: Tue, 22 Feb 2011 15:11:49 +0000
Subject: [PATCH] Fix Propel for MySQL 5.5 (also fixes is_object problems added
 in revision 11).

---
 .../propel/engine/builder/sql/mysql/MysqlDDLBuilder.php       | 4 ++--
 .../classes/propel/engine/database/model/Table.php            | 3 ++-
 .../classes/propel/engine/platform/DefaultPlatform.php        | 2 +-
 .../propel-generator/classes/propel/phing/PropelOMTask.php    | 2 +-
 .../propel-generator/classes/propel/phing/PropelSQLTask.php   | 2 +-
 gulliver/thirdparty/propel/om/BaseObject.php                  | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/gulliver/thirdparty/propel-generator/classes/propel/engine/builder/sql/mysql/MysqlDDLBuilder.php b/gulliver/thirdparty/propel-generator/classes/propel/engine/builder/sql/mysql/MysqlDDLBuilder.php
index 80c5ab120..5496d99c8 100644
--- a/gulliver/thirdparty/propel-generator/classes/propel/engine/builder/sql/mysql/MysqlDDLBuilder.php
+++ b/gulliver/thirdparty/propel-generator/classes/propel/engine/builder/sql/mysql/MysqlDDLBuilder.php
@@ -25,7 +25,7 @@ require_once 'propel/engine/builder/sql/DDLBuilder.php';
 /**
  * DDL Builder class for MySQL.
  *
- * @author     David Zülke
+ * @author     David Z�lke
  * @author     Hans Lellelid <hans@xmpl.org>
  * @package    propel.engine.builder.sql.mysql
  */
@@ -142,7 +142,7 @@ CREATE TABLE ".$this->quoteIdentifier($table->getName())."
 			}
 		}
 
-		$script .= "Type=$mysqlTableType ";
+		$script .= "ENGINE=$mysqlTableType ";
 //		print_r ($vendorSpecific);
 		if($vendorSpecific['Collation'] ) {
 //			$script .= " DEFAULT CHARSET='". $platform->escapeText( $vendorSpecific['Collation'] )."'";
diff --git a/gulliver/thirdparty/propel-generator/classes/propel/engine/database/model/Table.php b/gulliver/thirdparty/propel-generator/classes/propel/engine/database/model/Table.php
index d513ea392..2e80031bd 100644
--- a/gulliver/thirdparty/propel-generator/classes/propel/engine/database/model/Table.php
+++ b/gulliver/thirdparty/propel-generator/classes/propel/engine/database/model/Table.php
@@ -427,7 +427,8 @@ class Table extends XMLElement implements IDMethod {
 		$children = $this->inheritanceColumn->getChildren();
 		$names = array();
 		for ($i = 0, $size=count($children); $i < $size; $i++) {
-			$names[] = is_object($children[$i]) && get_class($children[$i]);
+      if (is_object($children[$i]))
+        $names[] = get_class($children[$i]);
 		}
 		return $names;
 	}
diff --git a/gulliver/thirdparty/propel-generator/classes/propel/engine/platform/DefaultPlatform.php b/gulliver/thirdparty/propel-generator/classes/propel/engine/platform/DefaultPlatform.php
index 65ed83775..e9e4d9c45 100644
--- a/gulliver/thirdparty/propel-generator/classes/propel/engine/platform/DefaultPlatform.php
+++ b/gulliver/thirdparty/propel-generator/classes/propel/engine/platform/DefaultPlatform.php
@@ -64,7 +64,7 @@ class DefaultPlatform implements Platform {
 	 */
 	public function getDatabaseType()
 	{
-		$clazz = is_object($this) && get_class($this);
+		$clazz = is_object($this) ? get_class($this) : 'NULL';
 		$pos = strpos($clazz, 'Platform');
 		return strtolower(substr($clazz,0,$pos));
 	}
diff --git a/gulliver/thirdparty/propel-generator/classes/propel/phing/PropelOMTask.php b/gulliver/thirdparty/propel-generator/classes/propel/phing/PropelOMTask.php
index 24f197921..d0b52f7f0 100644
--- a/gulliver/thirdparty/propel-generator/classes/propel/phing/PropelOMTask.php
+++ b/gulliver/thirdparty/propel-generator/classes/propel/phing/PropelOMTask.php
@@ -84,7 +84,7 @@ class PropelOMTask extends AbstractPropelDataModelTask {
 
 		$_f = new PhingFile($this->getOutputDirectory(), $path);
 		if ($overwrite || !$_f->exists()) {
-			$this->log("\t\t-> " . $builder->getClassname() . " [builder: " .is_object($builder) && get_class($builder) . "]");
+			$this->log("\t\t-> " . $builder->getClassname() . " [builder: " . (is_object($builder) ? get_class($builder) : '') . "]");
 			$script = $builder->build();
 			file_put_contents($_f->getAbsolutePath(), $script);
 			foreach($builder->getWarnings() as $warning) {
diff --git a/gulliver/thirdparty/propel-generator/classes/propel/phing/PropelSQLTask.php b/gulliver/thirdparty/propel-generator/classes/propel/phing/PropelSQLTask.php
index a864aa229..730acce53 100644
--- a/gulliver/thirdparty/propel-generator/classes/propel/phing/PropelSQLTask.php
+++ b/gulliver/thirdparty/propel-generator/classes/propel/phing/PropelSQLTask.php
@@ -175,7 +175,7 @@ class PropelSQLTask extends AbstractPropelDataModelTask {
 
 					if (!$table->isSkipSql()) {
 						$builder = DataModelBuilder::builderFactory($table, 'ddl');
-						$this->log("\t+ " . $table->getName() . " [builder: " . is_object($builder) && get_class($builder) . "]");
+            $this->log("\t+ " . $table->getName() . " [builder: " . (is_object($builder) ? get_class($builder) : "NULL") . "]");
 						$ddl .= $builder->build();
 						foreach($builder->getWarnings() as $warning) {
 							$this->log($warning, PROJECT_MSG_WARN);
diff --git a/gulliver/thirdparty/propel/om/BaseObject.php b/gulliver/thirdparty/propel/om/BaseObject.php
index 13f376fed..8ef9942e7 100644
--- a/gulliver/thirdparty/propel/om/BaseObject.php
+++ b/gulliver/thirdparty/propel/om/BaseObject.php
@@ -181,7 +181,7 @@ abstract class BaseObject {
 	 */
 	protected function log($msg, $priority = Propel::LOG_INFO)
 	{
-		return Propel::log(is_object($this) && get_class($this) . ': ' . $msg, $priority);
+		return Propel::log((is_object($this) ? get_class($this) : 'NULL') . ': ' . $msg, $priority);
 	}
 
 }