SF.net SVN: ledger-smb:[6582] trunk

[..hidden..]

Revision: 6582
          http://sourceforge.net/p/ledger-smb/code/6582
Author:   ehuelsmann
Date:     2014-01-21 10:08:21 +0000 (Tue, 21 Jan 2014)
Log Message:
-----------
Revert accidental part of commit r6581.

Revision Links:
--------------
    http://sourceforge.net/p/ledger-smb/code/6581

Modified Paths:
--------------
    trunk/LedgerSMB/Database.pm
    trunk/LedgerSMB/Scripts/setup.pm
    trunk/LedgerSMB.pm

Modified: trunk/LedgerSMB/Database.pm
===================================================================
--- trunk/LedgerSMB/Database.pm	2014-01-21 10:04:47 UTC (rev 6581)
+++ trunk/LedgerSMB/Database.pm	2014-01-21 10:08:21 UTC (rev 6582)
@@ -565,7 +565,7 @@
     # The statement below is likely to fail, because
     # the language already exists. Unfortunately, it's an error.
     # If it had been a notice, 
-    $self->dbh->do("CREATE LANGUAGE plpgsql");
+    $self->dbh->do("CREATE LANGAGE plpgsql");
     $self->dbh->commit;
     $self->exec_script(
 	{

Modified: trunk/LedgerSMB/Scripts/setup.pm
===================================================================
--- trunk/LedgerSMB/Scripts/setup.pm	2014-01-21 10:04:47 UTC (rev 6581)
+++ trunk/LedgerSMB/Scripts/setup.pm	2014-01-21 10:08:21 UTC (rev 6582)
@@ -346,7 +346,7 @@
     $sth->execute();
     my ($src_schema) = $sth->fetchrow_array();
     $dbh->rollback();
-#     $dbh->begin_work();
+    $dbh->begin_work();
     $dbh->do("DROP SCHEMA public CASCADE");
     $dbh->do("ALTER SCHEMA $src_schema RENAME TO public");
     $dbh->commit();
@@ -560,7 +560,7 @@
         $template->render($request);
     } else {
         $request->{dbh}->rollback();
-#        $request->{dbh}->begin_work();
+        $request->{dbh}->begin_work();
 
         __PACKAGE__->can($upgrade_run_step{$upgrade_type})->($request);
     } 
@@ -647,7 +647,7 @@
     }
     $sth->finish();
     $request->{dbh}->commit;
-#    $request->{dbh}->begin_work;
+    $request->{dbh}->begin_work;
     upgrade($request);
 }
 
@@ -870,7 +870,7 @@
         $request->error($request->{_locale}->text('No Permissions Assigned'));
    }
    $request->{dbh}->commit;
-#   $request->{dbh}->begin_work;
+   $request->{dbh}->begin_work;
 
    rebuild_modules($request);
 }
@@ -889,7 +889,7 @@
     $dbh->do('CREATE SCHEMA PUBLIC')
 	or die "Failed to create schema PUBLIC (" . $dbh->errstr . ")";
     $dbh->commit;
-#    $dbh->begin_work;
+    $dbh->begin_work;
 
     $database->load_base_schema({
 	log     => $temp . "_stdout",
@@ -909,7 +909,7 @@
                      VALUES ('migration_src_schema', '$src_schema')
      ));
     $dbh->commit;
-#    $dbh->begin_work;
+    $dbh->begin_work;
 
     my $dbtemplate = LedgerSMB::Template->new(
         user => {}, 
@@ -941,7 +941,7 @@
 
     $dbh->do("delete from defaults where setting_key like 'migration_%'");
     $dbh->commit;
-#    $dbh->begin_work;
+    $dbh->begin_work;
 }
 
 

Modified: trunk/LedgerSMB.pm
===================================================================
--- trunk/LedgerSMB.pm	2014-01-21 10:04:47 UTC (rev 6581)
+++ trunk/LedgerSMB.pm	2014-01-21 10:08:21 UTC (rev 6582)
@@ -676,7 +676,7 @@
     }
 
     $self->{dbh} = LedgerSMB::DBH->connect($self->{company})
-      or LedgerSMB::Auth::credential_prompt;
+      || LedgerSMB::Auth::credential_prompt;
 
     LedgerSMB::App_State::set_DBH($self->{dbh});
     LedgerSMB::App_State::set_DBName($self->{company});

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today. 
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
Ledger-smb-commits mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-commits