Skip to content

Fix PostgreSQL column name case sensitivity in WHERE clauses #574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wazum wants to merge 1 commit into
base: 0.24.x
Choose a base branch
from
+10 −10
Open

Fix PostgreSQL column name case sensitivity in WHERE clauses #574

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/Db/PdoRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,54 +362,54 @@ public function buildWhere(array $search): array

// simple_url equals match
if (isset($search['simple_url'])) {
$where['conditions'] .= ' and simple_url = :simple_url';
$where['conditions'] .= ' and "simple_url" = :simple_url';
$where['params']['simple_url'] = $search['simple_url'];
}

if (isset($search['date_start']) && !$hasLimit) {
$where['conditions'] .= ' and request_date >= :date_start';
$where['conditions'] .= ' and "request_date" >= :date_start';
$where['params']['date_start'] = $search['date_start'];
}

if (isset($search['date_end']) && !$hasLimit) {
$where['conditions'] .= ' and request_date <= :date_end';
$where['conditions'] .= ' and "request_date" <= :date_end';
$where['params']['date_end'] = $search['date_end'];
}

if (isset($search['request_start'])) {
$where['conditions'] .= ' and request_ts >= :request_start';
$where['conditions'] .= ' and "request_ts" >= :request_start';
$where['params']['request_start'] = strtotime($search['request_start']);
}

if (isset($search['request_end'])) {
$where['conditions'] .= ' and request_ts <= :request_end';
$where['conditions'] .= ' and "request_ts" <= :request_end';
$where['params']['request_end'] = strtotime($search['request_end']);
}

// TODO need JSON support
if (isset($search['remote_addr'])) {
$where['conditions'] .= ' and SERVER like :remote_addr';
$where['conditions'] .= ' and "SERVER" like :remote_addr';
$where['params']['remote_addr'] = '%' . $search['remote_addr'] . '%';
}

if (isset($search['cookie'])) {
$where['conditions'] .= ' and SERVER like :cookie';
$where['conditions'] .= ' and "SERVER" like :cookie';
$where['params']['cookie'] = '%' . $search['cookie'] . '%';
}

if (isset($search['server_name'])) {
$where['conditions'] .= ' and SERVER like :server_name';
$where['conditions'] .= ' and "SERVER" like :server_name';
$where['params']['server_name'] = '%' . $search['server_name'] . '%';
}

if ($hasLimit && $search['limit'][0] === 'P') {
$date = new DateTime();
try {
$date->sub(new DateInterval($search['limit']));
$where['conditions'] .= ' and request_ts >= :limit_start';
$where['conditions'] .= ' and "request_ts" >= :limit_start';
$where['params']['limit_start'] = $date->getTimestamp();
} catch (\Exception) {
$where['conditions'] .= ' and request_ts >= :limit_start';
$where['conditions'] .= ' and "request_ts" >= :limit_start';
$where['params']['limit_start'] = time() + 86400;
}
}
Expand Down