DataObjects/Core_notify_recur.php

[Pman.Core] / UpdateDatabase.php

diff --git a/UpdateDatabase.php b/UpdateDatabase.php
index 923bf00..29e1bbc 100644 (file)
--- a/UpdateDatabase.php
+++ b/UpdateDatabase.php
@@ -186,7 +186,7 @@ class Pman_Core_UpdateDatabase extends Pman
                 // files ending in .pg.sql are native postgres files..
                 $fn = preg_match('#\.pg\.sql$#', basename($bfn)) ? false : $this->convertToPG($bfn);
                 
-                $cmd = "$psql_cmd -f  " . escapeshellarg($fn ? $fn : $bfn) . ' 2>&1' ;
+                $cmd = "$psql_cmd  < " . escapeshellarg($fn ? $fn : $bfn) . ' 2>&1' ;
                 
                 echo "$bfn:   $cmd ". ($this->cli ? "\n" : "<BR>\n");
                 
@@ -201,18 +201,20 @@ class Pman_Core_UpdateDatabase extends Pman
             
             
             $fd = $this->rootDir. "/Pman/$m/sql";
-            
+            // sql directory  - we try to convert..
             foreach(glob($fd.'/*.sql') as $bfn) {
                 $fn =  $this->convertToPG($bfn);
-                $cmd = "$psql_cmd -f < " . escapeshellarg($fn) ;
+                $cmd = "$psql_cmd  < " . escapeshellarg($fn) ;
                 echo $cmd. ($this->cli ? "\n" : "<BR>\n");
                 passthru($cmd);
             }
             
+            // postgres specific directory..
+            
             $fd = $this->rootDir. "/Pman/$m/pgsql";
             
             foreach(glob($fd.'/*.sql') as $fn) {
-                $cmd = "$psql_cmd -f < " . escapeshellarg($fn) ;
+                $cmd = "$psql_cmd   < " . escapeshellarg($fn) ;
                 echo $cmd. ($this->cli ? "\n" : "<BR>\n");
                 passthru($cmd);
             }