X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/5f0a5514943bce086319e6f02b31808874e680eb..e14cb525c640cb15bb6b2dfb62ccebbe78cb45cd:/sql/Pg-upgrade2/warehouse.pl

diff --git a/sql/Pg-upgrade2/warehouse.pl b/sql/Pg-upgrade2/warehouse.pl
index 5fad05839..a9b152f9e 100644
--- a/sql/Pg-upgrade2/warehouse.pl
+++ b/sql/Pg-upgrade2/warehouse.pl
@@ -2,9 +2,29 @@
 # @description:  Diverse neue Tabellen und Spalten zur Mehrlagerfähigkeit inkl. Migration
 # @depends: release_2_4_3
 
+use strict;
 
 die("This script cannot be run from the command line.") unless ($main::form);
-$do_sql_migration = 0;
+
+my $do_sql_migration = 0;
+my ($check_sql, $sqlcode);
+
+sub mydberror {
+  my ($msg) = @_;
+  die($dbup_locale->text("Database update error:") .
+      "<br>$msg<br>" . $DBI::errstr);
+}
+
+sub do_query {
+  my ($query, $may_fail) = @_;
+
+  if (!$dbh->do($query)) {
+    mydberror($query) unless ($may_fail);
+    $dbh->rollback();
+    $dbh->begin_work();
+  }
+}
+
 
 sub print_question {
   print $main::form->parse_html_template("dbupgrade/warehouse_form");
@@ -29,26 +49,28 @@ sub do_update {
   my $warehouse = $main::form->{import_warehouse} ne '' ? $main::form->{import_warehouse} : "Transfer";
   my $bin       = $main::form->{bin_default}      ne '' ? $main::form->{bin_default}      : "1";
 
+  $warehouse    = $dbh->quote($warehouse);
+  $bin          = $dbh->quote($bin);
 
   my $migration_code = <<EOF
 
--- Warehouse anpassen
-INSERT INTO warehouse (description) VALUES ('$warehouse');
+-- Adjust warehouse
+INSERT INTO warehouse (description, sortkey, invalid) VALUES ($warehouse, 1, FALSE);
 
 UPDATE tmp_parts SET bin = NULL WHERE bin = '';
 
--- Warenbestand wiederherstellen
-INSERT INTO bin 
- (warehouse_id, description) 
- (SELECT DISTINCT warehouse.id, COALESCE(bin, '$bin') 
-   FROM warehouse, tmp_parts 
-   WHERE warehouse.description='$warehouse');
-INSERT INTO inventory 
- (warehouse_id, parts_id, bin_id, qty, employee_id, trans_id, trans_type_id)
- (SELECT warehouse.id, tmp_parts.id, bin.id, onhand, (SELECT id FROM employee LIMIT 1), nextval('id'), transfer_type.id 
+-- Restore old onhand
+INSERT INTO bin
+ (warehouse_id, description)
+ (SELECT DISTINCT warehouse.id, COALESCE(bin, $bin)
+   FROM warehouse, tmp_parts
+   WHERE warehouse.description=$warehouse);
+INSERT INTO inventory
+ (warehouse_id, parts_id, bin_id, qty, employee_id, trans_id, trans_type_id, chargenumber)
+ (SELECT warehouse.id, tmp_parts.id, bin.id, onhand, (SELECT id FROM employee LIMIT 1), nextval('id'), transfer_type.id, ''
   FROM transfer_type, warehouse, tmp_parts, bin
-  WHERE warehouse.description = '$warehouse' 
-    AND COALESCE(bin, '$bin') = bin.description 
+  WHERE warehouse.description = $warehouse
+    AND COALESCE(bin, $bin) = bin.description
     AND transfer_type.description = 'stock');
 EOF
 ;
@@ -57,7 +79,7 @@ EOF
   my $query  = $sqlcode;
      $query .= $migration_code if $do_sql_migration;
 
-  do_query($main::form, $dbh, $query);
+  do_query($query);
 
   return 1;
 }
@@ -65,7 +87,7 @@ EOF
 
 
 $sqlcode = <<EOF
--- Tabelle "bin" für Lagerplätze.
+-- Table "bin" for bins.
 CREATE TABLE bin (
   id integer NOT NULL DEFAULT nextval('id'),
   warehouse_id integer NOT NULL,
@@ -80,7 +102,7 @@ CREATE TABLE bin (
 CREATE TRIGGER mtime_bin BEFORE UPDATE ON bin
     FOR EACH ROW EXECUTE PROCEDURE set_mtime();
 
--- Tabelle "warehouse"
+-- Table "warehouse"
 ALTER TABLE warehouse ADD COLUMN sortkey integer;
 CREATE SEQUENCE tmp_counter;
 UPDATE warehouse SET sortkey = nextval('tmp_counter');
@@ -92,7 +114,7 @@ UPDATE warehouse SET invalid = 'f';
 CREATE TRIGGER mtime_warehouse BEFORE UPDATE ON warehouse
     FOR EACH ROW EXECUTE PROCEDURE set_mtime();
 
--- Tabelle "transfer_type"
+-- Table "transfer_type"
 CREATE TABLE transfer_type (
   id integer NOT NULL DEFAULT nextval('id'),
   direction varchar(10) NOT NULL,
@@ -118,7 +140,7 @@ INSERT INTO transfer_type (direction, description, sortkey) VALUES ('out', 'corr
 INSERT INTO transfer_type (direction, description, sortkey) VALUES ('transfer', 'transfer', 10);
 INSERT INTO transfer_type (direction, description, sortkey) VALUES ('transfer', 'correction', 11);
 
--- Anpassungen an "inventory".
+-- Modifications to "inventory".
 DELETE FROM inventory;
 
 ALTER TABLE inventory ADD COLUMN bin_id integer;
@@ -150,8 +172,7 @@ ALTER TABLE inventory ADD FOREIGN KEY (project_id) REFERENCES project (id);
 ALTER TABLE inventory ADD COLUMN chargenumber text;
 ALTER TABLE inventory ADD COLUMN comment text;
 
--- "onhand" in "parts" über einen Trigger automatisch berechnen lassen.
--- Vorher Warenbestand sichern JZ
+-- Let "onhand" in "parts" be calculated automatically by a trigger.
 SELECT id, onhand, bin INTO TEMP TABLE tmp_parts FROM parts WHERE onhand > 0;
 ALTER TABLE parts DROP COLUMN onhand;
 ALTER TABLE parts ADD COLUMN onhand numeric(25,5);