Skip to content

Commit a614dfd

Browse files
avoid hardcoded prefix for table names (WP-948)
1 parent 9d5e836 commit a614dfd

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

inc/Smartling/DbAl/UploadQueueManager.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function count(): int
4343
public function dequeue(int $blogId): ?UploadQueueItem
4444
{
4545
$query = sprintf(<<<'SQL'
46-
select q.%1$s, q.%2$s, q.%3$s from wp_smartling_upload_queue q left join wp_smartling_submissions s
46+
select q.%1$s, q.%2$s, q.%3$s from %7$s q left join %8$s s
4747
on if(locate(',', q.%2$s), left(%2$s, locate(',', %2$s) - 1), %2$s) = s.%4$s
4848
where s.%5$s = %6$d
4949
SQL,
@@ -53,6 +53,8 @@ public function dequeue(int $blogId): ?UploadQueueItem
5353
SubmissionEntity::FIELD_ID,
5454
SubmissionEntity::FIELD_SOURCE_BLOG_ID,
5555
$blogId,
56+
UploadQueueEntity::getTableName(),
57+
SubmissionEntity::getTableName(),
5658
);
5759
while (($row = $this->db->getRowArray($query)) !== null) {
5860
$this->delete($row[UploadQueueEntity::FIELD_ID]);

tests/Smartling/DbAl/UploadQueueManagerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public function query() {}
148148
$matcherGetRowArray = $this->exactly(3);
149149
$db->expects($matcherGetRowArray)->method('getRowArray')->willReturnCallback(function ($query) use ($matcherGetRowArray) {
150150
$this->assertEquals(<<<SQL
151-
select q.id, q.submission_ids, q.batch_uid from wp_smartling_upload_queue q left join wp_smartling_submissions s
151+
select q.id, q.submission_ids, q.batch_uid from smartling_upload_queue q left join smartling_submissions s
152152
on if(locate(',', q.submission_ids), left(submission_ids, locate(',', submission_ids) - 1), submission_ids) = s.id
153153
where s.source_blog_id = 1
154154
SQL, $query);

0 commit comments

Comments
 (0)