UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 27103c8..d980da9 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -291,39 +291,39 @@ class Pman_Core_UpdateDatabase extends Pman
         //usort($files, $lsort);
         
         
-//        foreach($files as $bfn) {
-//
-//
-//            if (preg_match('/migrate/i', basename($bfn))) { // skip migration scripts at present..
-//                continue;
-//            }
-//            if (preg_match('#\.[a-z]{2}\.sql#i', basename($bfn))
-//                && !preg_match('#\.pg\.sql#i', basename($bfn))
-//            ) { // skip migration scripts at present..
-//                continue;
-//            }
-//            $fn = false;
-//
-//            if (!preg_match('/pgsql/', basename($dir) )) {
-//                 if ( !preg_match('#\.pg\.sql$#', basename($bfn))) {
-//                    $fn = $this->convertToPG($bfn);
-//                }
-//            }
-//
-//            // files ending in .pg.sql are native postgres files.. ## depricated
-//
-//
-//            $cmd = "$psql_cmd  < " . escapeshellarg($fn ? $fn : $bfn) . ' 2>&1' ;
-//
-//            echo "$bfn:   $cmd ". ($ff->cli ? "\n" : "<BR>\n");
-//
-//
-//            passthru($cmd);
-//
-//            if ($fn) {
-//                unlink($fn);
-//            }
-//        }
+        foreach($files as $bfn) {
+
+
+            if (preg_match('/migrate/i', basename($bfn))) { // skip migration scripts at present..
+                continue;
+            }
+            if (preg_match('#\.[a-z]{2}\.sql#i', basename($bfn))
+                && !preg_match('#\.pg\.sql#i', basename($bfn))
+            ) { // skip migration scripts at present..
+                continue;
+            }
+            $fn = false;
+
+            if (!preg_match('/pgsql/', basename($dir) )) {
+                 if ( !preg_match('#\.pg\.sql$#', basename($bfn))) {
+                    $fn = $this->convertToPG($bfn);
+                }
+            }
+
+            // files ending in .pg.sql are native postgres files.. ## depricated
+
+
+            $cmd = "$psql_cmd  < " . escapeshellarg($fn ? $fn : $bfn) . ' 2>&1' ;
+
+            echo "$bfn:   $cmd ". ($ff->cli ? "\n" : "<BR>\n");
+
+
+            passthru($cmd);
+
+            if ($fn) {
+                unlink($fn);
+            }
+        }