index cf53043a0d5bdb279bc0fd5fc3ee5728a74e59a2..556b31ef7e96878077fe6793d4c0a0a73973aa3b 100644 (file)
unlink($lock);
}
my $self = {dbh=>undef,db_name=>undef,db_lock=>undef,db_lock_handle=>undef};
- my $dbh = DBI->connect("dbi:SQLite:dbname=$db_name");
+ my $dbh = DBI->connect("dbi:SQLite:dbname=$db_name", "", "", {RaiseError => 1, AutoCommit => 1});
$self->{dbh} = $dbh;
$self->{db_name} = $db_name;
$self->{db_lock} = $lock;
return($self);
}
+
sub create_table {
my $self = shift;
my $table_name = shift;
$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' )";
- $self->{dbh}->do($sql_statement);
+ eval {
+ my $res = $self->{dbh}->do($sql_statement);
+ };
+ if($@) {
+ $self->{dbh}->do("ANALYZE");
+ }
+ eval {
+ my $res = $self->{dbh}->do($sql_statement);
+ };
+ if($@) {
+ &main::daemon_log("ERROR: $sql_statement failed with $@", 1);
+ }
+
return 0;
}
sub add_dbentry {
- my $self = shift;
- my $arg = shift;
-
- # if dbh not specified, return errorflag 1
- my $table = $arg->{table};
- if( not defined $table ) {
- return 1 ;
- }
-
- # specify primary key in table
- if (not exists $arg->{primkey}) {
- return (2, "a hash key 'primkey' with at least an empty list as value is necessary for add_dbentry");
- }
- 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";
- my $max_id = @{ @{ $self->{dbh}->selectall_arrayref($sql_statement) }[0] }[0];
- 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}."'");
- }
- $prim_statement = "WHERE ".join(" AND ", @prim_list);
- }
-
- # if timestamp is not provided, add timestamp
- if( not exists $arg->{timestamp} ) {
- $arg->{timestamp} = &get_time;
- }
+ my $self = shift;
+ my $arg = shift;
+ my $res = 0; # default value
+
+ # if dbh not specified, return errorflag 1
+ my $table = $arg->{table};
+ if( not defined $table ) {
+ return 1 ;
+ }
- # check wether primkey is unique in table, otherwise return errorflag
- my $sql_statement = "SELECT * FROM $table $prim_statement";
- my $res = @{ $self->{dbh}->selectall_arrayref($sql_statement) };
+ # if timestamp is not provided, add timestamp
+ if( not exists $arg->{timestamp} ) {
+ $arg->{timestamp} = &get_time;
+ }
- if ($res == 0) {
- # primekey is unique
+ # check primkey and run insert or update
+ my $primkeys = $arg->{'primkey'};
+ my $prim_statement="";
+ if( 0 != @$primkeys ) { # more than one primkey exist in list
+ my @prim_list;
+ foreach my $primkey (@$primkeys) {
+ if( not exists $arg->{$primkey} ) {
+ return (3, "primkey '$primkey' has no value for add_dbentry");
+ }
+ push(@prim_list, "$primkey='".$arg->{$primkey}."'");
+ }
+ $prim_statement = "WHERE ".join(" AND ", @prim_list);
+
+ # check wether primkey is unique in table, otherwise return errorflag
+ my $sql_statement = "SELECT * FROM $table $prim_statement";
+ eval {
+ $res = @{ $self->{dbh}->selectall_arrayref($sql_statement) };
+ };
+ if($@) {
+ $self->{dbh}->do("ANALYZE");
+ eval {
+ $res = @{ $self->{dbh}->selectall_arrayref($sql_statement) };
+ };
+ if($@) {
+ &main::daemon_log("ERROR: $sql_statement failed with $@", 1);
+ }
+ }
- # fetch column names of table
- my $col_names = &get_table_columns($self, $table);
+ }
- # assign values to column name variables
- my @col_list;
+ # primkey is unique or no primkey specified -> run insert
+ if ($res == 0) {
+ # fetch column names of table
+ my $col_names = &get_table_columns($self, $table);
+
+ my $create_id=0;
+ foreach my $col_name (@{$col_names}) {
+ if($col_name eq "id" && (! exists $arg->{$col_name})) {
+ &main::daemon_log("DEBUG: id field found without value! Creating autoincrement statement!");
+ $create_id=1;
+ }
+ }
+
+ # assign values to column name variables
+ my @col_list;
my @val_list;
- foreach my $col_name (@{$col_names}) {
- # use function parameter for column values
- if (exists $arg->{$col_name}) {
- push(@col_list, $col_name);
- push(@val_list, $arg->{$col_name});
- }
- }
-
- my $sql_statement = "INSERT INTO $table (".join(", ", @col_list).") VALUES ('".join("', '", @val_list)."')";
- &main::daemon_log("DEBUG: $sql_statement", 7);
- my $db_res = $self->{dbh}->do($sql_statement);
- if( $db_res != 1 ) {
- return (4, $sql_statement);
- }
-
- } else {
- # entry already exists, so update it
- my @update_l;
- while( my ($pram, $val) = each %{$arg} ) {
- if( $pram eq 'table' ) { next; }
- if( $pram eq 'primkey' ) { next; }
- push(@update_l, "$pram='$val'");
- }
- my $update_str= join(", ", @update_l);
- $update_str= " SET $update_str";
-
- my $sql_statement= "UPDATE $table $update_str $prim_statement";
- my $db_res = &update_dbentry($self, $sql_statement );
-
- }
+ foreach my $col_name (@{$col_names}) {
+ # use function parameter for column values
+ if (exists $arg->{$col_name}) {
+ push(@col_list, "'".$col_name."'");
+ push(@val_list, "'".$arg->{$col_name}."'");
+ }
+ }
+
+ my $sql_statement;
+ if($create_id==1) {
+ $sql_statement = "INSERT INTO $table ('id', ".join(", ", @col_list).") VALUES ((select coalesce(max(id), 0)+1 from $table), ".join(", ", @val_list).")";
+ } else {
+ $sql_statement = "INSERT INTO $table (".join(", ", @col_list).") VALUES (".join(", ", @val_list).")";
+ }
+ my $db_res;
+ eval {
+ $db_res = $self->{dbh}->do($sql_statement);
+ };
+ if($@) {
+ $self->{dbh}->do("ANALYZE");
+ eval {
+ $db_res = $self->{dbh}->do($sql_statement);
+ };
+ if($@) {
+ &main::daemon_log("ERROR: $sql_statement failed with $@", 1);
+ }
+ }
+
+ if( $db_res != 1 ) {
+ return (4, $sql_statement);
+ }
+
+ # entry already exists -> run update
+ } else {
+ my @update_l;
+ while( my ($pram, $val) = each %{$arg} ) {
+ if( $pram eq 'table' ) { next; }
+ if( $pram eq 'primkey' ) { next; }
+ push(@update_l, "$pram='$val'");
+ }
+ my $update_str= join(", ", @update_l);
+ $update_str= " SET $update_str";
+
+ my $sql_statement= "UPDATE $table $update_str $prim_statement";
+ my $db_res = &update_dbentry($self, $sql_statement );
+ }
- return 0;
+ return 0;
}
+
sub update_dbentry {
my ($self, $sql)= @_;
my $db_answer= &exec_statement($self, $sql);
my $table = shift;
my @column_names;
- if(exists $col_names->{$table}) {
- @column_names = @{$col_names->{$table}};
- } else {
- my @res = @{$self->{dbh}->selectall_arrayref("pragma table_info('$table')")};
-
- foreach my $column (@res) {
- push(@column_names, @$column[1]);
- }
- }
+ if(exists $col_names->{$table}) {
+ @column_names = @{$col_names->{$table}};
+ } else {
+ my @res;
+ eval {
+ @res = @{$self->{dbh}->selectall_arrayref("pragma table_info('$table')")};
+ };
+ if($@) {
+ $self->{dbh}->do("ANALYZE");
+ eval {
+ @res = @{$self->{dbh}->selectall_arrayref("pragma table_info('$table')")};
+ };
+ if($@) {
+ &main::daemon_log("ERROR: pragma table_info('$table') failed with $@", 1);
+ }
+ }
+
+ foreach my $column (@res) {
+ push(@column_names, @$column[1]);
+ }
+ }
return \@column_names;
}
my $sql_statement= "SELECT * FROM $table_name ORDER BY timestamp";
my $res= &exec_statement($self, $sql_statement);
-
my @answer;
foreach my $hit (@{$res}) {
push(@answer, "hit: ".join(', ', @{$hit}));
}
+
return join("\n", @answer);
}
sub exec_statement {
my $self = shift;
my $sql_statement = shift;
+ my @db_answer;
- my @db_answer = @{$self->{dbh}->selectall_arrayref($sql_statement)};
+ eval {
+ @db_answer = @{$self->{dbh}->selectall_arrayref($sql_statement)};
+ };
+ if($@) {
+ $self->{dbh}->do("ANALYZE");
+ eval {
+ @db_answer = @{$self->{dbh}->selectall_arrayref($sql_statement)};
+ };
+ if($@) {
+ &main::daemon_log("ERROR: $sql_statement failed with $@", 1);
+ }
+ }
return \@db_answer;
}
sub exec_statementlist {
- my $self = shift;
- my $sql_list = shift;
- my @db_answer;
-
- foreach my $sql (@$sql_list) {
- @db_answer = @{$self->{dbh}->selectall_arrayref($sql)};
- }
+ my $self = shift;
+ my $sql_list = shift;
+ my @db_answer;
+
+ foreach my $sql (@$sql_list) {
+ if(defined($sql) && length($sql) > 0) {
+ eval {
+ my @answer = @{$self->{dbh}->selectall_arrayref($sql)};
+ push @db_answer, @answer;
+ };
+ if($@) {
+ $self->{dbh}->do("ANALYZE");
+ eval {
+ my @answer = @{$self->{dbh}->selectall_arrayref($sql)};
+ push @db_answer, @answer;
+ };
+ if($@) {
+ &main::daemon_log("ERROR: $sql failed with $@", 1);
+ }
+ }
+ } else {
+ next;
+ }
+ }
- return \@db_answer;
+ return \@db_answer;
}
+
sub count_dbentries {
my ($self, $table)= @_;
my $error= 0;
}
-
sub move_table {
- my ($self, $from, $to) = @_;
+ my ($self, $from, $to) = @_;
+
+ my $sql_statement_drop = "DROP TABLE IF EXISTS $to";
+ my $sql_statement_alter = "ALTER TABLE $from RENAME TO $to";
+
+ eval {
+ $self->{dbh}->do($sql_statement_drop);
+ };
+ if($@) {
+ $self->{dbh}->do("ANALYZE");
+ eval {
+ $self->{dbh}->do($sql_statement_drop);
+ };
+ if($@) {
+ &main::daemon_log("ERROR: $sql_statement_drop failed with $@", 1);
+ }
+ }
- my $sql_statement_drop = "DROP TABLE IF EXISTS $to";
- my $sql_statement_alter = "ALTER TABLE $from RENAME TO $to";
+ eval {
+ $self->{dbh}->do($sql_statement_alter);
+ };
+ if($@) {
+ $self->{dbh}->do("ANALYZE");
+ eval {
+ $self->{dbh}->do($sql_statement_alter);
+ };
+ if($@) {
+ &main::daemon_log("ERROR: $sql_statement_alter failed with $@", 1);
+ }
+ }
- return;
+ return;
}