Fremschlüssel für »unit« in Tabellen orderitems, delivery_order_items, invoice

diff --git a/SL/DB/DeliveryOrderItem.pm b/SL/DB/DeliveryOrderItem.pm
index 29c85a2cb21c5a90e60d98e7a3d13c3d23e00376..638082ccf61d58cbd15a77c2ef444602c8213aba 100644 (file)
--- a/SL/DB/DeliveryOrderItem.pm
+++ b/SL/DB/DeliveryOrderItem.pm
@@ -15,13 +15,6 @@ use SL::DB::Helper::CustomVariables (
 );
 
 __PACKAGE__->meta->make_manager_class;
 );
 
 __PACKAGE__->meta->make_manager_class;

-__PACKAGE__->meta->add_relationship(
-  unit_obj       => {
-    type         => 'many to one',
-    class        => 'SL::DB::Unit',
-    column_map   => { unit => 'name' },
-  },
-);

 
 __PACKAGE__->meta->initialize;
 
 
 __PACKAGE__->meta->initialize;
 

diff --git a/SL/DB/InvoiceItem.pm b/SL/DB/InvoiceItem.pm
index 8f9a4dde7bae629beb2df365c38f0786c7a0a793..eeeb679fc594240a87f5d4bd0c1db63be71f4414 100644 (file)
--- a/SL/DB/InvoiceItem.pm
+++ b/SL/DB/InvoiceItem.pm
@@ -14,14 +14,6 @@ use SL::DB::Helper::CustomVariables (
   },
 );
 
   },
 );
 

-__PACKAGE__->meta->add_relationship(
-  unit_obj       => {
-    type         => 'many to one',
-    class        => 'SL::DB::Unit',
-    column_map   => { unit => 'name' },
-  },
-);
-

 # Creates get_all, get_all_count, get_all_iterator, delete_all and update_all.
 __PACKAGE__->meta->make_manager_class;
 
 # Creates get_all, get_all_count, get_all_iterator, delete_all and update_all.
 __PACKAGE__->meta->make_manager_class;
 

diff --git a/SL/DB/MetaSetup/DeliveryOrderItem.pm b/SL/DB/MetaSetup/DeliveryOrderItem.pm
index 7735c9ea891ef6f4d23ed0dc11156576b305bd5e..54f261f28895fa863fdd14a1436b894426ff820c 100644 (file)
--- a/SL/DB/MetaSetup/DeliveryOrderItem.pm
+++ b/SL/DB/MetaSetup/DeliveryOrderItem.pm
@@ -63,6 +63,11 @@ __PACKAGE__->meta->foreign_keys(
     class       => 'SL::DB::Project',
     key_columns => { project_id => 'id' },
   },
     class       => 'SL::DB::Project',
     key_columns => { project_id => 'id' },
   },

+
+  unit_obj => {
+    class       => 'SL::DB::Unit',
+    key_columns => { unit => 'name' },
+  },

 );
 
 1;
 );
 
 1;

diff --git a/SL/DB/MetaSetup/InvoiceItem.pm b/SL/DB/MetaSetup/InvoiceItem.pm
index d527f76f53497cbfb9fd14c1ff8d2c719929c204..86e0a9d5d9ed14d843488d331e01ee4613c33f49 100644 (file)
--- a/SL/DB/MetaSetup/InvoiceItem.pm
+++ b/SL/DB/MetaSetup/InvoiceItem.pm
@@ -64,6 +64,11 @@ __PACKAGE__->meta->foreign_keys(
     class       => 'SL::DB::Project',
     key_columns => { project_id => 'id' },
   },
     class       => 'SL::DB::Project',
     key_columns => { project_id => 'id' },
   },

+
+  unit_obj => {
+    class       => 'SL::DB::Unit',
+    key_columns => { unit => 'name' },
+  },

 );
 
 1;
 );
 
 1;

diff --git a/SL/DB/MetaSetup/OrderItem.pm b/SL/DB/MetaSetup/OrderItem.pm
index 66d2ad2613e9eb6a2ee4dfed22e4e5a369dce579..e3a66d53162492ac85ae84e530fde74ac968674d 100644 (file)
--- a/SL/DB/MetaSetup/OrderItem.pm
+++ b/SL/DB/MetaSetup/OrderItem.pm
@@ -67,6 +67,11 @@ __PACKAGE__->meta->foreign_keys(
     class       => 'SL::DB::Project',
     key_columns => { project_id => 'id' },
   },
     class       => 'SL::DB::Project',
     key_columns => { project_id => 'id' },
   },

+
+  unit_obj => {
+    class       => 'SL::DB::Unit',
+    key_columns => { unit => 'name' },
+  },

 );
 
 1;
 );
 
 1;

diff --git a/SL/DB/OrderItem.pm b/SL/DB/OrderItem.pm
index 37520977bfc9ca486e049d91b269efb54083287d..e75c78f5ffcbddf28191e006af23c819f777439e 100644 (file)
--- a/SL/DB/OrderItem.pm
+++ b/SL/DB/OrderItem.pm
@@ -17,14 +17,6 @@ use SL::DB::Helper::CustomVariables (
   },
 );
 
   },
 );
 

-__PACKAGE__->meta->add_relationship(
-  unit_obj       => {
-    type         => 'many to one',
-    class        => 'SL::DB::Unit',
-    column_map   => { unit => 'name' },
-  },
-);
-

 __PACKAGE__->meta->initialize;
 
 sub is_price_update_available {
 __PACKAGE__->meta->initialize;
 
 sub is_price_update_available {

diff --git a/sql/Pg-upgrade2/unit_foreign_key_for_line_items.sql b/sql/Pg-upgrade2/unit_foreign_key_for_line_items.sql
new file mode 100644 (file)
index 0000000..d99e1a7
--- /dev/null
+++ b/sql/Pg-upgrade2/unit_foreign_key_for_line_items.sql
@@ -0,0 +1,6 @@
+-- @tag: unit_foreign_key_for_line_items
+-- @description: Fremdschlüssel auf »unit« für Beleg-Positionstabellen
+-- @depends: release_3_0_0
+ALTER TABLE orderitems           ADD FOREIGN KEY (unit) REFERENCES units (name);
+ALTER TABLE delivery_order_items ADD FOREIGN KEY (unit) REFERENCES units (name);
+ALTER TABLE invoice              ADD FOREIGN KEY (unit) REFERENCES units (name);