ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2975 from LocutusOfBorg/master 

Quote some more MySQL8 Reserved keywords
This commit is contained in:
Isaac Connor 2020-07-11 10:39:13 -04:00 committed by GitHub
parent b53b666442 cc93d553d8
commit ba8ab85411
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/ZoneMinder/lib/ZoneMinder/Database.pm
View File

@ -146,15 +146,15 @@ sub zmDbGetMonitors {
if ( $function ) {
if ( $function == DB_MON_CAPT ) {
$sql .= " where Function >= 'Monitor'";
$sql .= " where `Function` >= 'Monitor'";
} elsif ( $function == DB_MON_ACTIVE ) {
$sql .= " where Function > 'Monitor'";
$sql .= " where `Function` > 'Monitor'";
} elsif ( $function == DB_MON_MOTION ) {
$sql .= " where Function = 'Modect' or Function = 'Mocord'";
$sql .= " where `Function` = 'Modect' or Function = 'Mocord'";
} elsif ( $function == DB_MON_RECORD ) {
$sql .= " where Function = 'Record' or Function = 'Mocord'";
$sql .= " where `Function` = 'Record' or Function = 'Mocord'";
} elsif ( $function == DB_MON_PASSIVE ) {
$sql .= " where Function = 'Nodect'";
$sql .= " where `Function` = 'Nodect'";
}
}
my $sth = $dbh->prepare_cached( $sql );

2
utils/zm-alarm.pl
View File

@ -16,7 +16,7 @@ my @monitors;
my $dbh = zmDbConnect();
my $sql = "SELECT * FROM Monitors
WHERE find_in_set( Function, 'Modect,Mocord,Nodect' )".
WHERE find_in_set( `Function`, 'Modect,Mocord,Nodect' )".
( $Config{ZM_SERVER_ID} ? 'AND ServerId=?' : '' )
;