X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FAuth%2FColumnInformation.pm;h=024b0cf41b77c5ecb5be0c52fd55fcb5aa1f444b;hb=53593baa211863fbf66540cf1bcc36c8fb37257f;hp=e053561b4331f1dbdd3faca73465c3c0bb5fc43d;hpb=e0ba33ff38a40207472185d639567966e136da6b;p=kivitendo-erp.git

diff --git a/SL/Auth/ColumnInformation.pm b/SL/Auth/ColumnInformation.pm
index e053561b4..024b0cf41 100644
--- a/SL/Auth/ColumnInformation.pm
+++ b/SL/Auth/ColumnInformation.pm
@@ -23,17 +23,19 @@ sub _fetch {
 
   return $self if $self->{info};
 
-  my $query = <<SQL;
-    SELECT a.attname, format_type(a.atttypid, a.atttypmod) AS format_type, d.adsrc, a.attnotnull
-    FROM pg_attribute a
-    LEFT JOIN pg_attrdef d ON (a.attrelid = d.adrelid) AND (a.attnum = d.adnum)
-    WHERE (a.attrelid = 'auth.session_content'::regclass)
-      AND (a.attnum > 0)
-      AND NOT a.attisdropped
-    ORDER BY a.attnum
+  $self->{info} = {};
+
+  foreach my $table (qw(session session_content)) {
+    my $query = <<SQL;
+      SELECT attname
+      FROM pg_attribute
+      WHERE (attrelid = 'auth.${table}'::regclass)
+        AND (attnum > 0)
+        AND NOT attisdropped
 SQL
 
-  $self->{info} = { selectall_as_map($::form, $self->{auth}->dbconnect, $query, 'attname', [ qw(format_type adsrc attnotnull) ]) };
+    $self->{info}->{$table} = { selectall_as_map($::form, $self->{auth}->dbconnect, $query, 'attname', [ qw(attname) ]) };
+  }
 
   return $self;
 }
@@ -44,8 +46,8 @@ sub info {
 }
 
 sub has {
-  my ($self, $column) = @_;
-  return $self->info->{$column};
+  my ($self, $column, $table) = @_;
+  return $self->info->{$table || 'session_content'}->{$column};
 }
 
 1;