FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-25 16:05:19 +00:00
Code Issues Releases Wiki Activity

93_DbRep: attribute allowDeletion deleted, multiCmd: use of executeBeforeProc, executeAfterProc possible, prepare support of MariaDB

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@28620 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2024-03-08 23:04:33 +00:00
parent da786370c6
commit 3b8515e2f1
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/93_DbRep.pm
View File

@ -6247,7 +6247,7 @@ sub DbRep_delseqdoubl {
my $sql1 = DbRep_createSelectSql($hash,$table,$selspec,$device,$reading,$runtime_string_first,$runtime_string_next,''); my $sql1 = DbRep_createSelectSql($hash,$table,$selspec,$device,$reading,$runtime_string_first,$runtime_string_next,'');
Log3 ($name, 4, "DbRep $name - SQL execute: $sql1"); Log3 ($name, 4, "DbRep $name - SQL execute: $sql1");
eval{$sth->execute($runtime_string_first, $runtime_string_next);}; eval {$sth->execute($runtime_string_first, $runtime_string_next);};
if ($@) { if ($@) {
$err = encode_base64($@,""); $err = encode_base64($@,"");
Log3 ($name, 2, "DbRep $name - $@"); Log3 ($name, 2, "DbRep $name - $@");
@ -6386,6 +6386,7 @@ sub DbRep_delseqdoubl {
use warnings; use warnings;
Log3 ($name, 5, "DbRep $name - row result list:\n$rowlist"); Log3 ($name, 5, "DbRep $name - row result list:\n$rowlist");
$sth->finish if($sth);
$dbh->disconnect; $dbh->disconnect;
$rowlist = encode_base64($rowlist,""); # Daten müssen als Einzeiler zurückgegeben werden $rowlist = encode_base64($rowlist,""); # Daten müssen als Einzeiler zurückgegeben werden
@ -6831,6 +6832,7 @@ sub DbRep_impfile {
$err = DbRep_commitOnly ($name, $dbh, "import committed"); $err = DbRep_commitOnly ($name, $dbh, "import committed");
return "$name|$err" if ($err); return "$name|$err" if ($err);
$sth->finish if($sth);
$dbh->disconnect; $dbh->disconnect;
close(FH); close(FH);
@ -6986,10 +6988,9 @@ sub DbRep_sqlCmd {
Log3 ($name, 3, "DbRep $name - Number of entries processed in db $hash->{DATABASE}: $nrows by $com"); Log3 ($name, 3, "DbRep $name - Number of entries processed in db $hash->{DATABASE}: $nrows by $com");
} }
$sth->finish;
my $rt = tv_interval($st); # SQL-Laufzeit ermitteln my $rt = tv_interval($st); # SQL-Laufzeit ermitteln
$sth->finish if($sth);
$dbh->disconnect; $dbh->disconnect;
my $rowstring = join("§", @rows); # Daten müssen als Einzeiler zurückgegeben werden my $rowstring = join("§", @rows); # Daten müssen als Einzeiler zurückgegeben werden
@ -8276,6 +8277,9 @@ sub DbRep_mysql_DumpClientSide {
my $hash = $paref->{hash}; my $hash = $paref->{hash};
my $name = $paref->{name}; my $name = $paref->{name};
my $dbloghash = $defs{$hash->{HELPER}{DBLOGDEVICE}};
my $dbmodel = $dbloghash->{MODEL};
my $dump_path = AttrVal ($name, "dumpDirLocal", $dbrep_dump_path_def); my $dump_path = AttrVal ($name, "dumpDirLocal", $dbrep_dump_path_def);
my $optimize_tables_beforedump = AttrVal ($name, "optimizeTablesBeforeDump", 0); my $optimize_tables_beforedump = AttrVal ($name, "optimizeTablesBeforeDump", 0);
my $memory_limit = AttrVal ($name, "dumpMemlimit", 100000); my $memory_limit = AttrVal ($name, "dumpMemlimit", 100000);
@ -8317,7 +8321,7 @@ sub DbRep_mysql_DumpClientSide {
my ($err, $dbh, $dbmodel) = DbRep_dbConnect($name, 0); my ($err, $dbh, $dbmodel) = DbRep_dbConnect($name, 0);
return "$name|$err" if($err); return "$name|$err" if($err);
$dbh->{mysql_enable_utf8} = 0; # Dump Performance !!! Forum: https://forum.fhem.de/index.php/topic,53584.msg1204535.html#msg1204535 $dbh->{mysql_enable_utf8} = 0 if($dbmodel =~ /MYSQL/xs); # Dump Performance !!! Forum: https://forum.fhem.de/index.php/topic,53584.msg1204535.html#msg1204535
my $st = [gettimeofday]; # SQL-Startzeit my $st = [gettimeofday]; # SQL-Startzeit
@ -9306,7 +9310,7 @@ sub DbRep_mysql_RestoreClientSide {
my ($err,$dbh,$dbmodel) = DbRep_dbConnect ($name, 0); my ($err,$dbh,$dbmodel) = DbRep_dbConnect ($name, 0);
return "$name|$err" if($err); return "$name|$err" if($err);
$dbh->{mysql_enable_utf8} = 0; # identisch zu DbRep_mysql_DumpClientSide setzen ! $dbh->{mysql_enable_utf8} = 0 if($dbmodel =~ /MYSQL/xs); # identisch zu DbRep_mysql_DumpClientSide setzen !
my @row_ary; my @row_ary;
my $sql = "show variables like 'max_allowed_packet'"; # maximal mögliche Packetgröße ermitteln (in Bits) -> Umrechnen in max. Zeichen my $sql = "show variables like 'max_allowed_packet'"; # maximal mögliche Packetgröße ermitteln (in Bits) -> Umrechnen in max. Zeichen
@ -11719,7 +11723,7 @@ sub DbRep_dbConnect {
if ($utf8) { if ($utf8) {
if ($dbmodel =~ /MYSQL|MARIADB/xs) { if ($dbmodel =~ /MYSQL|MARIADB/xs) {
$dbh->{mysql_enable_utf8} = 1 if($dbmodel =~ /MYSQL/xs); # MariaDB kenn kein mysql_enable_utf8 $dbh->{mysql_enable_utf8} = 1 if($dbmodel =~ /MYSQL/xs); # MariaDB kennt kein mysql_enable_utf8
($err, my @se) = DbRep_prepareExec2Array ($name, $dbh, "SHOW VARIABLES LIKE 'collation_database'"); ($err, my @se) = DbRep_prepareExec2Array ($name, $dbh, "SHOW VARIABLES LIKE 'collation_database'");
return $err if ($err); return $err if ($err);