Merge pull request #407 from grray/master

Fix for using platform class configured in build properties
propelorm · Jul 13, 2012 · 8c2d287 · 8c2d287
2 parents 251b03e + 66f91c9
commit 8c2d287
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/generator/lib/config/GeneratorConfig.php b/generator/lib/config/GeneratorConfig.php
@@ -156,11 +156,11 @@ public function getBuilderClassname($type)
     public function getConfiguredPlatform(PDO $con = null, $database = null)
     {
         $buildConnection = $this->getBuildConnection($database);
-        if (null !== $buildConnection['adapter']) {
-            $clazz = Phing::import('platform.' . ucfirst($buildConnection['adapter']) . 'Platform');
-        } elseif ($this->getBuildProperty('platformClass')) {
+        if ($this->getBuildProperty('platformClass')) {
             // propel.platform.class = platform.${propel.database}Platform by default
             $clazz = $this->getClassname('platformClass');
+        } elseif (null !== $buildConnection['adapter']) {
+            $clazz = Phing::import('platform.' . ucfirst($buildConnection['adapter']) . 'Platform');
         } else {
             return null;
         }