FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

93_DbRep: contrib 8.40.7

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@22784 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-09-18 11:09:31 +00:00
parent e1ddd67534
commit 2817bb13c2
1 changed files with 44 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
fhem/contrib/DS_Starter/93_DbRep.pm
View File

@ -57,7 +57,7 @@ no if $] >= 5.017011, warnings => 'experimental::smartmatch';
# Version History intern # Version History intern
our %DbRep_vNotesIntern = ( our %DbRep_vNotesIntern = (
"8.40.8" => "17.09.2020 sqlCmd supports PREPARE statament, commandRef revised ", "8.40.8" => "17.09.2020 sqlCmd supports PREPARE statament Forum: #114293, commandRef revised ",
"8.40.7" => "03.09.2020 rename getter dbValue to sqlCmdBlocking, consider attr timeout in function DbRep_sqlCmdBlocking (blocking function), commandRef revised ", "8.40.7" => "03.09.2020 rename getter dbValue to sqlCmdBlocking, consider attr timeout in function DbRep_sqlCmdBlocking (blocking function), commandRef revised ",
"8.40.6" => "27.08.2020 commandRef revised ", "8.40.6" => "27.08.2020 commandRef revised ",
"8.40.5" => "29.07.2020 fix crash if delEntries startet without any time limits, Forum:#113202 ", "8.40.5" => "29.07.2020 fix crash if delEntries startet without any time limits, Forum:#113202 ",
@ -6197,7 +6197,8 @@ sub sqlCmd_DoParse {
# Set Session Variablen "SET" oder PRAGMA aus Attribut "sqlCmdVars" # Set Session Variablen "SET" oder PRAGMA aus Attribut "sqlCmdVars"
my $vars = AttrVal($name, "sqlCmdVars", ""); my $vars = AttrVal($name, "sqlCmdVars", "");
if ($vars) { if ($vars) {
@pms = split(";",$vars); @pms = split(";",$vars);
for my $pm (@pms) { for my $pm (@pms) {
if($pm !~ /PRAGMA|SET/i) { if($pm !~ /PRAGMA|SET/i) {
next; next;
@ -6217,23 +6218,21 @@ sub sqlCmd_DoParse {
# Abarbeitung von Session Variablen vor einem SQL-Statement # Abarbeitung von Session Variablen vor einem SQL-Statement
# z.B. SET @open:=NULL, @closed:=NULL; Select ... # z.B. SET @open:=NULL, @closed:=NULL; Select ...
if($cmd =~ /^\s*(SET|PREPARE).*;/i) { if($cmd =~ /^\s*SET.*;/i) {
@pms = split(";",$cmd); @pms = split(";",$cmd);
$sql = q{};
for my $pm (@pms) { for my $pm (@pms) {
if($pm !~ /SET|PREPARE/i) { if($pm !~ /SET/i) {
$sql = $pm.";"; $sql .= $pm.";";
next; next;
} }
$pm = ltrim($pm).";"; $pm = ltrim($pm).";";
$pm =~ s/ESC_ESC_ESC/;/gx; # wiederherstellen von escapeten ";" -> umwandeln von ";;" in ";" $pm =~ s/ESC_ESC_ESC/;/gx; # wiederherstellen von escapeten ";" -> umwandeln von ";;" in ";"
if($pm =~ /SET/i) { Log3($name, 4, "DbRep $name - Set SQL session variable: $pm");
Log3($name, 4, "DbRep $name - Set SQL session variable: $pm");
} else {
Log3($name, 4, "DbRep $name - Exec PREPARE statement: $pm");
}
eval {$dbh->do($pm);}; eval {$dbh->do($pm);};
if ($@) { if ($@) {
@ -6247,24 +6246,49 @@ sub sqlCmd_DoParse {
# Abarbeitung aller Pragmas vor einem SQLite Statement, SQL wird extrahiert # Abarbeitung aller Pragmas vor einem SQLite Statement, SQL wird extrahiert
# wenn Pragmas im SQL vorangestellt sind # wenn Pragmas im SQL vorangestellt sind
if($cmd =~ /^\s*(PRAGMA|PREPARE).*;/i) { if($cmd =~ /^\s*PRAGMA.*;/i) {
@pms = split(";",$cmd); @pms = split(";",$cmd);
$sql = q{};
for my $pm (@pms) { for my $pm (@pms) {
if($pm !~ /PRAGMA|PREPARE/i) { if($pm !~ /PRAGMA/i) {
$sql = $pm.";"; $sql .= $pm.";";
next; next;
} }
$pm = ltrim($pm).";"; $pm = ltrim($pm).";";
$pm =~ s/ESC_ESC_ESC/;/gx; # wiederherstellen von escapeten ";" -> umwandeln von ";;" in ";" $pm =~ s/ESC_ESC_ESC/;/gx; # wiederherstellen von escapeten ";" -> umwandeln von ";;" in ";"
if($pm =~ /PRAGMA/i) { Log3($name, 4, "DbRep $name - Exec PRAGMA Statement: $pm");
Log3($name, 4, "DbRep $name - Exec PRAGMA Statement: $pm");
} else { eval {$dbh->do($pm);};
Log3($name, 4, "DbRep $name - Exec PREPARE statement: $pm"); if ($@) {
$err = encode_base64($@,"");
Log3 ($name, 2, "DbRep $name - ERROR - $@");
$dbh->disconnect;
return "$name|''|$opt|$sql|''|''|$err";
}
}
}
# Abarbeitung von PREPARE statement als Befehl als Bestandteil des SQL Forum: #114293
# z.B. PREPARE statement FROM @CMD
if($sql =~ /^\s*PREPARE.*;/i) {
@pms = split(";",$sql);
$sql = q{};
for my $pm (@pms) {
if($pm !~ /PREPARE/i) {
$sql .= $pm.";";
next;
} }
$pm = ltrim($pm).";";
$pm =~ s/ESC_ESC_ESC/;/gx; # wiederherstellen von escapeten ";" -> umwandeln von ";;" in ";"
Log3($name, 4, "DbRep $name - Exec PREPARE statement: $pm");
eval {$dbh->do($pm);}; eval {$dbh->do($pm);};
if ($@) { if ($@) {
$err = encode_base64($@,""); $err = encode_base64($@,"");
@ -6302,7 +6326,7 @@ sub sqlCmd_DoParse {
my (@rows,$row,@head); my (@rows,$row,@head);
my $nrows = 0; my $nrows = 0;
if($sql =~ m/^\s*(explain|select|pragma|show)/is) { if($sql =~ m/^\s*(explain|select|pragma|show)/is) {
@head = map { uc($sth->{NAME}[$_]) } keys @{$sth->{NAME}}; # https://metacpan.org/pod/DBI#NAME1 @head = map { uc($sth->{NAME}[$_]) } keys @{$sth->{NAME}}; # https://metacpan.org/pod/DBI#NAME1
if (@head) { if (@head) {
$row = join("$srs", @head); $row = join("$srs", @head);
push(@rows, $row); push(@rows, $row);