ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make NULL be case-insensitive

pull/4202/head
Isaac Connor 2024-09-03 09:50:58 -04:00
parent b176709c30
commit 0f0f571c7a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
View File

@ -232,7 +232,7 @@ sub Sql {
$value = "'$ZoneMinder::Config::Config{ZM_SERVER_ID}'"; $value = "'$ZoneMinder::Config::Config{ZM_SERVER_ID}'";
# This gets used later, I forget for what # This gets used later, I forget for what
$$self{Server} = new ZoneMinder::Server($ZoneMinder::Config::Config{ZM_SERVER_ID}); $$self{Server} = new ZoneMinder::Server($ZoneMinder::Config::Config{ZM_SERVER_ID});
} elsif ( $temp_value eq 'NULL' ) { } elsif ( uc($temp_value) eq 'NULL' ) {
$value = $temp_value; $value = $temp_value;
} else { } else {
$value = "'$temp_value'"; $value = "'$temp_value'";
@ -254,7 +254,7 @@ sub Sql {
} }
$value = "'$temp_value'"; $value = "'$temp_value'";
} elsif ( $term->{attr} eq 'DateTime' or $term->{attr} eq 'StartDateTime' or $term->{attr} eq 'EndDateTime' ) { } elsif ( $term->{attr} eq 'DateTime' or $term->{attr} eq 'StartDateTime' or $term->{attr} eq 'EndDateTime' ) {
if ( $temp_value eq 'NULL' ) { if ( uc($temp_value) eq 'NULL' ) {
$value = $temp_value; $value = $temp_value;
} else { } else {
$value = DateTimeToSQL($temp_value); $value = DateTimeToSQL($temp_value);
@ -265,7 +265,7 @@ sub Sql {
$value = "'$value'"; $value = "'$value'";
} }
} elsif ( $term->{attr} eq 'Date' or $term->{attr} eq 'StartDate' or $term->{attr} eq 'EndDate' ) { } elsif ( $term->{attr} eq 'Date' or $term->{attr} eq 'StartDate' or $term->{attr} eq 'EndDate' ) {
if ( $temp_value eq 'NULL' ) { if ( uc($temp_value) eq 'NULL' ) {
$value = $temp_value; $value = $temp_value;
} elsif ( $temp_value eq 'CURDATE()' or $temp_value eq 'NOW()' ) { } elsif ( $temp_value eq 'CURDATE()' or $temp_value eq 'NOW()' ) {
$value = 'to_days('.$temp_value.')'; $value = 'to_days('.$temp_value.')';
@ -278,7 +278,7 @@ sub Sql {
$value = "to_days( '$value' )"; $value = "to_days( '$value' )";
} }
} elsif ( $term->{attr} eq 'Time' or $term->{attr} eq 'StartTime' or $term->{attr} eq 'EndTime' ) { } elsif ( $term->{attr} eq 'Time' or $term->{attr} eq 'StartTime' or $term->{attr} eq 'EndTime' ) {
if ( $temp_value eq 'NULL' ) { if ( uc($temp_value) eq 'NULL' ) {
$value = $temp_value; $value = $temp_value;
} else { } else {
$value = DateTimeToSQL($temp_value); $value = DateTimeToSQL($temp_value);