Nicht benutzte Spalte employee.role entfernen

diff --git a/SL/DB/MetaSetup/Employee.pm b/SL/DB/MetaSetup/Employee.pm
index a99121dfdd7090e61f55766924e2b3430a3e7760..b7b06be86cf9e4340eb24527184b6d6304ead5b4 100644 (file)
--- a/SL/DB/MetaSetup/Employee.pm
+++ b/SL/DB/MetaSetup/Employee.pm
@@ -15,7 +15,6 @@ __PACKAGE__->meta->setup(
     startdate => { type => 'date', default => 'now' },
     enddate   => { type => 'date' },
     notes     => { type => 'text' },
     startdate => { type => 'date', default => 'now' },
     enddate   => { type => 'date' },
     notes     => { type => 'text' },

-    role      => { type => 'text' },

     sales     => { type => 'boolean', default => 'true' },
     itime     => { type => 'timestamp', default => 'now()' },
     mtime     => { type => 'timestamp' },
     sales     => { type => 'boolean', default => 'true' },
     itime     => { type => 'timestamp', default => 'now()' },
     mtime     => { type => 'timestamp' },

diff --git a/SL/User.pm b/SL/User.pm
index e984dbf0f0748d001129fadf30ab3a1ccb31a9e8..2159d92435d665a27e4e14235302c0b54416f322 100644 (file)
--- a/SL/User.pm
+++ b/SL/User.pm
@@ -614,11 +614,11 @@ sub create_employee_entry {
      ($can_delete) = selectrow_query($form, $dbh, qq|SELECT tag FROM schema_info WHERE tag = ?|, 'employee_deleted') if $good_db;
 
   if (!$id) {
      ($can_delete) = selectrow_query($form, $dbh, qq|SELECT tag FROM schema_info WHERE tag = ?|, 'employee_deleted') if $good_db;
 
   if (!$id) {

-    my $query = qq|INSERT INTO employee (login, name, workphone, role) VALUES (?, ?, ?, ?)|;
-    do_query($form, $dbh, $query, ($self->{login}, $myconfig->{name}, $myconfig->{tel}, "user"));
+    my $query = qq|INSERT INTO employee (login, name, workphone) VALUES (?, ?, ?)|;
+    do_query($form, $dbh, $query, ($self->{login}, $myconfig->{name}, $myconfig->{tel}));

 
   } elsif ($update_existing && $can_delete) {
 
   } elsif ($update_existing && $can_delete) {

-    my $query = qq|UPDATE employee SET name = ?, workphone = ?, role = 'user', deleted = 'f' WHERE id = ?|;
+    my $query = qq|UPDATE employee SET name = ?, workphone = ?, deleted = 'f' WHERE id = ?|;

     do_query($form, $dbh, $query, $myconfig->{name}, $myconfig->{tel}, $id);
   }
 
     do_query($form, $dbh, $query, $myconfig->{name}, $myconfig->{tel}, $id);
   }
 

diff --git a/sql/Pg-upgrade2/remove_role_from_employee.sql b/sql/Pg-upgrade2/remove_role_from_employee.sql
new file mode 100644 (file)
index 0000000..0e8b481
--- /dev/null
+++ b/sql/Pg-upgrade2/remove_role_from_employee.sql
@@ -0,0 +1,5 @@
+-- @tag: remove_role_from_employee
+-- @description: Nicht benutzte Spalte employee.role entfernen
+-- @depends: clients
+-- @charset: utf-8
+ALTER TABLE employee DROP COLUMN role;