depend on DBIx::DBSchema 0.26 for dbdef-create (for Pg 'public' schema fix) and 0...

diff --git a/FS/FS/Record.pm b/FS/FS/Record.pm
index 2b74da4..5dbcd4d 100644 (file)
--- a/FS/FS/Record.pm
+++ b/FS/FS/Record.pm
@@ -9,7 +9,7 @@ use Carp qw(carp cluck croak confess);
 use File::CounterFile;
 use Locale::Country;
 use DBI qw(:sql_types);
 use File::CounterFile;
 use Locale::Country;
 use DBI qw(:sql_types);

-use DBIx::DBSchema 0.23;
+use DBIx::DBSchema 0.25;

 use FS::UID qw(dbh getotaker datasrc driver_name);
 use FS::SearchCache;
 use FS::Msgcat qw(gettext);
 use FS::UID qw(dbh getotaker datasrc driver_name);
 use FS::SearchCache;
 use FS::Msgcat qw(gettext);


@@ -883,8 +883,6 @@ sub replace {
   my $new = shift;
   my $old = shift;  
 
   my $new = shift;
   my $old = shift;  
 

-  my $saved = {};
-

   if (!defined($old)) { 
     warn "[debug]$me replace called with no arguments; autoloading old record\n"
      if $DEBUG;
   if (!defined($old)) { 
     warn "[debug]$me replace called with no arguments; autoloading old record\n"
      if $DEBUG;


@@ -911,6 +909,7 @@ sub replace {
   return $error if $error;
   
   # Encrypt for replace
   return $error if $error;
   
   # Encrypt for replace

+  my $saved = {};

   if ($conf->exists('encryption') && defined(eval '@FS::'. $new->table . 'encrypted_fields')) {
     foreach my $field (eval '@FS::'. $new->table . '::encrypted_fields') {
       $saved->{$field} = $new->getfield($field);
   if ($conf->exists('encryption') && defined(eval '@FS::'. $new->table . 'encrypted_fields')) {
     foreach my $field (eval '@FS::'. $new->table . '::encrypted_fields') {
       $saved->{$field} = $new->getfield($field);

diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 30ef205..a2ef31e 100755 (executable)
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -9,7 +9,7 @@ use Getopt::Std;
 use Locale::Country;
 use Locale::SubCountry;
 use DBI;
 use Locale::Country;
 use Locale::SubCountry;
 use DBI;

-use DBIx::DBSchema 0.21;
+use DBIx::DBSchema 0.25;

 use DBIx::DBSchema::Table;
 use DBIx::DBSchema::Column;
 use DBIx::DBSchema::ColGroup::Unique;
 use DBIx::DBSchema::Table;
 use DBIx::DBSchema::Column;
 use DBIx::DBSchema::ColGroup::Unique;

diff --git a/bin/dbdef-create b/bin/dbdef-create
index a449d67..fea02c8 100755 (executable)
--- a/bin/dbdef-create
+++ b/bin/dbdef-create
@@ -2,7 +2,7 @@
 
 use strict;
 use DBI;
 
 use strict;
 use DBI;

-use DBIx::DBSchema 0.22;
+use DBIx::DBSchema 0.26;

 use FS::UID qw(adminsuidsetup datasrc driver_name);
 
 my $user = shift or die &usage;
 use FS::UID qw(adminsuidsetup datasrc driver_name);
 
 my $user = shift or die &usage;

diff --git a/bin/fix-sequences b/bin/fix-sequences
index 2ff89d3..dc4abd7 100755 (executable)
--- a/bin/fix-sequences
+++ b/bin/fix-sequences
@@ -4,7 +4,7 @@
 
 use strict;
 use DBI;
 
 use strict;
 use DBI;

-use DBIx::DBSchema 0.21;
+use DBIx::DBSchema 0.26;

 use DBIx::DBSchema::Table;
 use DBIx::DBSchema::Column;
 use DBIx::DBSchema::ColGroup::Unique;
 use DBIx::DBSchema::Table;
 use DBIx::DBSchema::Column;
 use DBIx::DBSchema::ColGroup::Unique;