X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=gosa-si%2Fmodules%2FDBsqlite.pm;h=8eba13d478cf28edeaadfc914db033ef716cfda2;hb=e6affacc914e6ebdb0062ee8bea3a50d37367c54;hp=bce1e620cebb432b6325b374cf7dd7c6461d2415;hpb=137cc176814f2e5d3750309b3bfe2072e14ee373;p=gosa.git

diff --git a/gosa-si/modules/DBsqlite.pm b/gosa-si/modules/DBsqlite.pm
index bce1e620c..8eba13d47 100644
--- a/gosa-si/modules/DBsqlite.pm
+++ b/gosa-si/modules/DBsqlite.pm
@@ -10,7 +10,6 @@ use threads;
 use Time::HiRes qw(usleep);
 
 
-
 my $col_names = {};
 
 sub new {
@@ -52,7 +51,7 @@ sub create_lock : locked {
     my $lock = $self->{db_lock};
     while( -f $lock ) {
 		#&main::daemon_log("(".((defined $funcname)?$funcname:"").") Lock (PID ".$$.") $lock found",8);
-        sleep 1;
+        usleep 100;
     }
 
     open($self->{db_lock_handle},'>',$self->{db_lock});
@@ -79,8 +78,8 @@ sub create_table {
     }
 
     $col_names->{ $table_name } = $col_names_ref;
-    my $col_names_string = join(', ', @col_names);
-    my $sql_statement = "CREATE TABLE IF NOT EXISTS $table_name ( $col_names_string )"; 
+    my $col_names_string = join("', '", @col_names);
+    my $sql_statement = "CREATE TABLE IF NOT EXISTS $table_name ( '$col_names_string' )"; 
     &create_lock($self,'create_table');
     $self->{dbh}->do($sql_statement);
     &remove_lock($self,'create_table');
@@ -100,35 +99,46 @@ sub add_dbentry {
 
     # specify primary key in table
     if (not exists $arg->{primkey}) {
-        return 2;
+        return (2, "a hash key 'primkey' with at least an empty list as value is necessary for add_dbentry");
     }
-    my $primkey = $arg->{primkey};
-
-    # if primkey is id, fetch max id from table and give new job id=  max(id)+1
-    if ($primkey eq 'id') {
-        my $id;
-        my $sql_statement = "SELECT MAX(CAST(id AS INTEGER)) FROM $table";
-        &create_lock($self,'add_dbentry');
-        my $max_id = @{ @{ $self->{dbh}->selectall_arrayref($sql_statement) }[0] }[0];
-        &remove_lock($self,'add_dbentry');
-        if( defined $max_id) {
-            $id = $max_id + 1; 
-        } else {
-            $id = 1;
+    my $primkeys = $arg->{'primkey'};
+    my $prim_statement="";
+    if( 0 != @$primkeys ) { 
+        my @prim_list;
+        foreach my $primkey (@$primkeys) {
+            if($primkey eq 'id') {
+                # if primkey is id, fetch max id from table and give new job id=  max(id)+1
+                my $sql_statement = "SELECT MAX(CAST(id AS INTEGER)) FROM $table";
+                &create_lock($self,'add_dbentry');
+                my $max_id = @{ @{ $self->{dbh}->selectall_arrayref($sql_statement) }[0] }[0];
+                &remove_lock($self,'add_dbentry');
+                my $id;
+                if( defined $max_id) {
+                    $id = $max_id + 1; 
+                } else {
+                    $id = 1;
+                }
+                $arg->{id} = $id;
+            }
+            if( not exists $arg->{$primkey} ) {
+                return (3, "primkey '$primkey' has no value for add_dbentry");
+            }
+           push(@prim_list, "$primkey='".$arg->{$primkey}."'");
         }
-        $arg->{id} = $id;
+        $prim_statement = "WHERE ".join(" AND ", @prim_list);
     }
-
+ 
     # if timestamp is not provided, add timestamp   
     if( not exists $arg->{timestamp} ) {
         $arg->{timestamp} = &get_time;
     }
 
     # check wether primkey is unique in table, otherwise return errorflag
-    my $sql_statement = "SELECT * FROM $table WHERE $primkey='$arg->{$primkey}'";
+    my $sql_statement = "SELECT * FROM $table $prim_statement";
     &create_lock($self,'add_dbentry');
     my $res = @{ $self->{dbh}->selectall_arrayref($sql_statement) };
     &remove_lock($self,'add_dbentry');
+
     if ($res == 0) {
         # primekey is unique
 
@@ -136,27 +146,26 @@ sub add_dbentry {
         my $col_names = &get_table_columns($self, $table);
 
         # assign values to column name variables
-        my @add_list;
+        my @col_list;
+		my @val_list;
         foreach my $col_name (@{$col_names}) {
             # use function parameter for column values
-    
             if (exists $arg->{$col_name}) {
-                push(@add_list, $arg->{$col_name});
+                push(@col_list, $col_name);
+				push(@val_list, $arg->{$col_name});
             }
         }    
 
-        my $sql_statement = "INSERT INTO $table VALUES ('".join("', '", @add_list)."')";
+        my $sql_statement = "INSERT INTO $table (".join(", ", @col_list).") VALUES ('".join("', '", @val_list)."')";
         &create_lock($self,'add_dbentry');
         my $db_res = $self->{dbh}->do($sql_statement);
         &remove_lock($self,'add_dbentry');
         if( $db_res != 1 ) {
-            return 4;
+            return (4, $sql_statement);
         } 
 
     } else  {
         # entry already exists, so update it 
-        my $where_str= " WHERE $primkey='".$arg->{$primkey}."'";
-
         my @update_l;
         while( my ($pram, $val) = each %{$arg} ) {
             if( $pram eq 'table' ) { next; }
@@ -166,7 +175,7 @@ sub add_dbentry {
         my $update_str= join(", ", @update_l);
         $update_str= " SET $update_str";
 
-        my $sql_statement= "UPDATE $table $update_str $where_str";
+        my $sql_statement= "UPDATE $table $update_str $prim_statement";
         my $db_res = &update_dbentry($self, $sql_statement );
 
     }
@@ -260,6 +269,20 @@ sub exec_statement {
 }
 
 
+sub exec_statementlist {
+    my $self = shift;
+    my $sql_list = shift;
+    my @db_answer;
+
+    &create_lock($self,'exec_statement');
+    foreach my $sql (@$sql_list) {
+        @db_answer = @{$self->{dbh}->selectall_arrayref($sql)};
+    }
+    &remove_lock($self, 'exec_statement');
+
+    return \@db_answer;
+}
+
 sub count_dbentries {
     my ($self, $table)= @_;
     my $error= 0;
@@ -272,4 +295,20 @@ sub count_dbentries {
     return $count;
 }
 
+
+
+sub move_table {
+    my ($self, $from, $to) = @_;
+
+    my $sql_statement_drop = "DROP TABLE IF EXISTS $to";
+    my $sql_statement_alter = "ALTER TABLE $from RENAME TO $to";
+    &create_lock($self,'move_table');
+    my $db_res = $self->{dbh}->do($sql_statement_drop);
+    $db_res = $self->{dbh}->do($sql_statement_alter);
+    &remove_lock($self,'move_table');
+
+    return;
+} 
+
+
 1;