Adding db_namespace configuration parameter and restricting method discovery based on it.

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@2105 4979c152-3d1c-0410-bac9-87ea11338e46

2 files changed, 13 insertions, 3 deletions

diff --git a/LedgerSMB/DBObject.pm b/LedgerSMB/DBObject.pm
index 40d621c5..6a44fde8 100644
--- a/LedgerSMB/DBObject.pm
+++ b/LedgerSMB/DBObject.pm
@@ -104,9 +104,18 @@ sub exec_method {
     @in_args = @{ $args{args}} if $args{args};
     my @call_args;
      
-    my $query = "SELECT proname, pronargs, proargnames FROM pg_proc WHERE proname = ?";
-    my $sth   = $self->{dbh}->prepare($query);
-    $sth->execute($funcname) || $self->error($DBI::errstr . "in exec_method");
+    my $query = "
+	SELECT proname, pronargs, proargnames FROM pg_proc 
+	 WHERE proname = ? 
+	       AND pronamespace = 
+	       coalesce((SELECT oid FROM pg_namespace WHERE nspname = ?), 
+	                pronamespace)
+    ";
+    my $sth   = $self->{dbh}->prepare(
+		$query
+    );
+    $sth->execute($funcname, $LedgerSMB::Sysconfig::db_namespace) 
+	|| $self->error($DBI::errstr . "in exec_method");
     my $ref;
 
     $ref = $sth->fetchrow_hashref('NAME_lc');
diff --git a/LedgerSMB/Sysconfig.pm b/LedgerSMB/Sysconfig.pm
index 45304eb0..ed27c176 100644
--- a/LedgerSMB/Sysconfig.pm
+++ b/LedgerSMB/Sysconfig.pm
@@ -138,5 +138,6 @@ for $var (qw(DBhost DBport DBname DBUserName DBPassword)) {
 $ENV{PGHOST} = $config{database}{host};
 $ENV{PGPORT} = $config{database}{port};
 our $default_db = $config{database}{default_db};
+our $db_namespace = $config{database}{db_namespace};
 
 1;