DataObjects/ProjectDirectory.php

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 1f5e5b9..0b2704f 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -128,17 +128,17 @@ class Pman_Core_UpdateDatabase extends Pman
             
             $fd = $this->rootDir. "/Pman/$m/DataObjects";
             
-            foreach(glob($fd.'/*.sql') as $fn) {
+            foreach(glob($fd.'/*.sql') as $bfn) {
                 
                  
-                if (preg_match('/migrate/i', basename($fn))) { // skip migration scripts at present..
+                if (preg_match('/migrate/i', basename($bfn))) { // skip migration scripts at present..
                     continue;
                 }
-                $fn = $this->convertToPG($fn);
+                $fn = $this->convertToPG($bfn);
                 
-                $cmd = "$psql_cmd -f  " . escapeshellarg($fn) . '2>&1' ;
+                $cmd = "$psql_cmd -f  " . escapeshellarg($fn) . ' 2>&1' ;
                 
-                echo "$fn:   $cmd ". ($this->cli ? "\n" : "<BR>\n");
+                echo "$bfn:   $cmd ". ($this->cli ? "\n" : "<BR>\n");
                 
                 
                 $res = `$cmd`;
@@ -154,7 +154,7 @@ class Pman_Core_UpdateDatabase extends Pman
      */
     function convertToPG($src)
     {
-        $fn = $this->tempName('.sql');
+        $fn = $this->tempName('sql');
         
         $ret = array( ); // pad it a bit.
         $extra = array("", "" );