Revert "Kleinere DB-Details (Fremdschlüssel und verwaiste Tabelle)"

This reverts commit d0118dc6303e04507a77f3dde2c2bf0565ecb388.

diff --git a/SL/DB/Helper/Mappings.pm b/SL/DB/Helper/Mappings.pm
index 022894c16706c765f0d7ebe33238eb98833142b7..633a067935d81006e8ad238166802867b5d91e4a 100644 (file)
--- a/SL/DB/Helper/Mappings.pm
+++ b/SL/DB/Helper/Mappings.pm
@@ -84,6 +84,7 @@ my @kivitendo_blacklist = (@kivitendo_blacklist_permanent, @kivitendo_blacklist_
 my %kivitendo_package_names = (
   # TABLE                           # MODEL (given in C style)
   acc_trans                      => 'acc_transaction',
 my %kivitendo_package_names = (
   # TABLE                           # MODEL (given in C style)
   acc_trans                      => 'acc_transaction',

+  audittrail                     => 'audit_trail',

   'auth.clients'                 => 'auth_client',
   'auth.clients_users'           => 'auth_client_user',
   'auth.clients_groups'          => 'auth_client_group',
   'auth.clients'                 => 'auth_client',
   'auth.clients_users'           => 'auth_client_user',
   'auth.clients_groups'          => 'auth_client_group',

diff --git a/SL/DB/MetaSetup/AuditTrail.pm b/SL/DB/MetaSetup/AuditTrail.pm
new file mode 100644 (file)
index 0000000..fd8add0
--- /dev/null
+++ b/SL/DB/MetaSetup/AuditTrail.pm
@@ -0,0 +1,25 @@
+# This file has been auto-generated. Do not modify it; it will be overwritten
+# by rose_auto_create_model.pl automatically.
+package SL::DB::AuditTrail;
+
+use strict;
+
+use base qw(SL::DB::Object);
+
+__PACKAGE__->meta->table('audittrail');
+
+__PACKAGE__->meta->columns(
+  action      => { type => 'text' },
+  employee_id => { type => 'integer' },
+  formname    => { type => 'text' },
+  id          => { type => 'serial', not_null => 1 },
+  reference   => { type => 'text' },
+  tablename   => { type => 'text' },
+  trans_id    => { type => 'integer' },
+  transdate   => { type => 'timestamp', default => 'now' },
+);
+
+__PACKAGE__->meta->primary_key_columns([ 'id' ]);
+
+1;
+;

diff --git a/SL/DB/MetaSetup/Customer.pm b/SL/DB/MetaSetup/Customer.pm
index d65b0b37b76216ba419680956bc041369fdaf0d0..0f523a46625c9a0b857a3a5cc3fe6471938dc97b 100644 (file)
--- a/SL/DB/MetaSetup/Customer.pm
+++ b/SL/DB/MetaSetup/Customer.pm
@@ -89,11 +89,6 @@ __PACKAGE__->meta->foreign_keys(
     class       => 'SL::DB::PaymentTerm',
     key_columns => { payment_id => 'id' },
   },
     class       => 'SL::DB::PaymentTerm',
     key_columns => { payment_id => 'id' },
   },

-
-  salesman => {
-    class       => 'SL::DB::Employee',
-    key_columns => { salesman_id => 'id' },
-  },

 );
 
 1;
 );
 
 1;

diff --git a/SL/DB/MetaSetup/Default.pm b/SL/DB/MetaSetup/Default.pm
index 8c0319cc31a50618f0350e2e989068f1f185919b..48551285c0377eefe8b3c98ff97eacd01d730594 100644 (file)
--- a/SL/DB/MetaSetup/Default.pm
+++ b/SL/DB/MetaSetup/Default.pm
@@ -18,6 +18,7 @@ __PACKAGE__->meta->columns(
   ar_show_mark_as_paid                    => { type => 'boolean', default => 'true' },
   articlenumber                           => { type => 'text' },
   assemblynumber                          => { type => 'text' },
   ar_show_mark_as_paid                    => { type => 'boolean', default => 'true' },
   articlenumber                           => { type => 'text' },
   assemblynumber                          => { type => 'text' },

+  audittrail                              => { type => 'boolean', default => 'false' },

   bin_id                                  => { type => 'integer' },
   bin_id_ignore_onhand                    => { type => 'integer' },
   businessnumber                          => { type => 'text' },
   bin_id                                  => { type => 'integer' },
   bin_id_ignore_onhand                    => { type => 'integer' },
   businessnumber                          => { type => 'text' },

diff --git a/SL/DB/MetaSetup/Vendor.pm b/SL/DB/MetaSetup/Vendor.pm
index aa44b133b3dbed9141d41b2a3a6742288b447c1c..0493aa3744de4a42c8f3662b4b507372f0929bbc 100644 (file)
--- a/SL/DB/MetaSetup/Vendor.pm
+++ b/SL/DB/MetaSetup/Vendor.pm
@@ -85,11 +85,6 @@ __PACKAGE__->meta->foreign_keys(
     class       => 'SL::DB::PaymentTerm',
     key_columns => { payment_id => 'id' },
   },
     class       => 'SL::DB::PaymentTerm',
     key_columns => { payment_id => 'id' },
   },

-
-  salesman => {
-    class       => 'SL::DB::Employee',
-    key_columns => { salesman_id => 'id' },
-  },

 );
 
 1;
 );
 
 1;

diff --git a/sql/Pg-upgrade2/drop_audittrail.sql b/sql/Pg-upgrade2/drop_audittrail.sql
deleted file mode 100644 (file)
index b998dc6..0000000
--- a/sql/Pg-upgrade2/drop_audittrail.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- @tag: drop_audittrail
--- @description: Tabelle audittrail wird nicht mehr benutzt
--- @depends: release_3_0_0
--- @ignore: 0
-ALTER TABLE defaults DROP COLUMN audittrail;
-DROP TABLE audittrail;

diff --git a/sql/Pg-upgrade2/employee_id_foreignkeys.pl b/sql/Pg-upgrade2/employee_id_foreignkeys.pl
deleted file mode 100644 (file)
index 3716da6..0000000
--- a/sql/Pg-upgrade2/employee_id_foreignkeys.pl
+++ /dev/null
@@ -1,24 +0,0 @@
-# @tag: employee_id_foreignkeys
-# @description: Falls ein Benutzer hart in der Datenbank gelöscht werden soll, entsprechende Fremdschlüssel setzen, entfernt ferner verwaiste Einträge
-# @depends: release_3_0_0
-package SL::DBUpgrade2::employee_id_foreignkeys;
-
-use utf8;
-
-use parent qw(SL::DBUpgrade2::Base);
-use strict;
-
-sub run {
-  my ($self) = @_;
-
-  # this query will fail if we have orphaned entries
-  # should only occur
-  $self->db_query(qq|UPDATE customer set salesman_id = NULL where salesman_id not in (select id from employee)|, may_fail => 0);
-  $self->db_query(qq|UPDATE vendor set salesman_id = NULL where salesman_id not in (select id from employee)|, may_fail => 0);
-  $self->db_query(qq|ALTER TABLE customer ADD FOREIGN KEY (salesman_id) REFERENCES employee (id)|, may_fail => 0);
-  $self->db_query(qq|ALTER TABLE vendor ADD FOREIGN KEY (salesman_id) REFERENCES employee (id)|, may_fail => 0);
-
-  return 1;
-}
-
-1;