Skip to content

Commit ffe4f43

Browse files
HackwarHackwar
authored
Converting DatabaseQuery::castAsChar() to castAs() (joomla#45826)
1 parent 2acc28f commit ffe4f43

File tree

11 files changed

+20
-20
lines changed

11 files changed

+20
-20
lines changed

‎administrator/components/com_finder/src/Model/IndexModel.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ protected function getListQuery()
228228

229229
// Filter by indexdate only if $search doesn't contains non-ascii characters
230230
if (!preg_match('/[^\x00-\x7F]/', $search)) {
231-
$orSearchSql .= ' OR ' . $query->castAsChar($db->quoteName('l.indexdate')) . ' LIKE ' . $search;
231+
$orSearchSql .= ' OR ' . $query->castAs('CHAR', $db->quoteName('l.indexdate')) . ' LIKE ' . $search;
232232
}
233233

234234
$query->where('(' . $orSearchSql . ')');

‎components/com_contact/src/Model/CategoryModel.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,9 +466,9 @@ private function getSlugColumn($query, $id, $alias)
466466
return 'CASE WHEN '
467467
. $query->charLength($alias, '!=', '0')
468468
. ' THEN '
469-
. $query->concatenate([$query->castAsChar($id), $alias], ':')
469+
. $query->concatenate([$query->castAs('CHAR', $id), $alias], ':')
470470
. ' ELSE '
471-
. $query->castAsChar($id) . ' END';
471+
. $query->castAs('CHAR', $id) . ' END';
472472
}
473473

474474
/**

‎components/com_contact/src/Model/ContactModel.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,9 +403,9 @@ private function getSlugColumn($query, $id, $alias)
403403
return 'CASE WHEN '
404404
. $query->charLength($alias, '!=', '0')
405405
. ' THEN '
406-
. $query->concatenate([$query->castAsChar($id), $alias], ':')
406+
. $query->concatenate([$query->castAs('CHAR', $id), $alias], ':')
407407
. ' ELSE '
408-
. $query->castAsChar($id) . ' END';
408+
. $query->castAs('CHAR', $id) . ' END';
409409
}
410410

411411
/**

‎components/com_content/src/Model/ArchiveModel.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ private function getSlugColumn($query, $id, $alias)
207207
return 'CASE WHEN '
208208
. $query->charLength($db->quoteName($alias), '!=', '0')
209209
. ' THEN '
210-
. $query->concatenate([$query->castAsChar($db->quoteName($id)), $db->quoteName($alias)], ':')
210+
. $query->concatenate([$query->castAs('CHAR', $db->quoteName($id)), $db->quoteName($alias)], ':')
211211
. ' ELSE '
212-
. $query->castAsChar($id) . ' END';
212+
. $query->castAs('CHAR', $id) . ' END';
213213
}
214214
}

‎libraries/src/Categories/Categories.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ protected function _load($id)
292292
$case_when = ' CASE WHEN ';
293293
$case_when .= $query->charLength($db->quoteName('c.alias'), '!=', '0');
294294
$case_when .= ' THEN ';
295-
$c_id = $query->castAsChar($db->quoteName('c.id'));
295+
$c_id = $query->castAs('CHAR', $db->quoteName('c.id'));
296296
$case_when .= $query->concatenate([$c_id, $db->quoteName('c.alias')], ':');
297297
$case_when .= ' ELSE ';
298298
$case_when .= $c_id . ' END as ' . $db->quoteName('slug');

‎plugins/content/pagenavigation/src/Extension/PageNavigation.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,12 @@ public function onContentBeforeDisplay(BeforeDisplayEvent $event)
158158
$query->order($orderby);
159159

160160
$case_when = ' CASE WHEN ' . $query->charLength($db->quoteName('a.alias'), '!=', '0')
161-
. ' THEN ' . $query->concatenate([$query->castAsChar($db->quoteName('a.id')), $db->quoteName('a.alias')], ':')
162-
. ' ELSE ' . $query->castAsChar('a.id') . ' END AS ' . $db->quoteName('slug');
161+
. ' THEN ' . $query->concatenate([$query->castAs('CHAR', $db->quoteName('a.id')), $db->quoteName('a.alias')], ':')
162+
. ' ELSE ' . $query->castAs('CHAR', 'a.id') . ' END AS ' . $db->quoteName('slug');
163163

164164
$case_when1 = ' CASE WHEN ' . $query->charLength($db->quoteName('cc.alias'), '!=', '0')
165-
. ' THEN ' . $query->concatenate([$query->castAsChar($db->quoteName('cc.id')), $db->quoteName('cc.alias')], ':')
166-
. ' ELSE ' . $query->castAsChar('cc.id') . ' END AS ' . $db->quoteName('catslug');
165+
. ' THEN ' . $query->concatenate([$query->castAs('CHAR', $db->quoteName('cc.id')), $db->quoteName('cc.alias')], ':')
166+
. ' ELSE ' . $query->castAs('CHAR', 'cc.id') . ' END AS ' . $db->quoteName('catslug');
167167

168168
$query->select($db->quoteName(['a.id', 'a.title', 'a.catid', 'a.language']))
169169
->select([$case_when, $case_when1])

‎plugins/finder/categories/src/Extension/Categories.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ protected function getListQuery($query = null)
439439
$case_when_item_alias = ' CASE WHEN ';
440440
$case_when_item_alias .= $query->charLength($db->quoteName('a.alias'), '!=', '0');
441441
$case_when_item_alias .= ' THEN ';
442-
$a_id = $query->castAsChar($db->quoteName('a.id'));
442+
$a_id = $query->castAs('CHAR', $db->quoteName('a.id'));
443443
$case_when_item_alias .= $query->concatenate([$a_id, 'a.alias'], ':');
444444
$case_when_item_alias .= ' ELSE ';
445445
$case_when_item_alias .= $a_id . ' END AS slug';

‎plugins/finder/contacts/src/Extension/Contacts.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ protected function getListQuery($query = null)
447447
$case_when_item_alias = ' CASE WHEN ';
448448
$case_when_item_alias .= $query->charLength('a.alias', '!=', '0');
449449
$case_when_item_alias .= ' THEN ';
450-
$a_id = $query->castAsChar('a.id');
450+
$a_id = $query->castAs('CHAR', 'a.id');
451451
$case_when_item_alias .= $query->concatenate([$a_id, 'a.alias'], ':');
452452
$case_when_item_alias .= ' ELSE ';
453453
$case_when_item_alias .= $a_id . ' END as slug';
@@ -456,7 +456,7 @@ protected function getListQuery($query = null)
456456
$case_when_category_alias = ' CASE WHEN ';
457457
$case_when_category_alias .= $query->charLength('c.alias', '!=', '0');
458458
$case_when_category_alias .= ' THEN ';
459-
$c_id = $query->castAsChar('c.id');
459+
$c_id = $query->castAs('CHAR', 'c.id');
460460
$case_when_category_alias .= $query->concatenate([$c_id, 'c.alias'], ':');
461461
$case_when_category_alias .= ' ELSE ';
462462
$case_when_category_alias .= $c_id . ' END as catslug';

‎plugins/finder/content/src/Extension/Content.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ protected function getListQuery($query = null)
394394
$case_when_item_alias = ' CASE WHEN ';
395395
$case_when_item_alias .= $query->charLength('a.alias', '!=', '0');
396396
$case_when_item_alias .= ' THEN ';
397-
$a_id = $query->castAsChar('a.id');
397+
$a_id = $query->castAs('CHAR', 'a.id');
398398
$case_when_item_alias .= $query->concatenate([$a_id, 'a.alias'], ':');
399399
$case_when_item_alias .= ' ELSE ';
400400
$case_when_item_alias .= $a_id . ' END as slug';
@@ -403,7 +403,7 @@ protected function getListQuery($query = null)
403403
$case_when_category_alias = ' CASE WHEN ';
404404
$case_when_category_alias .= $query->charLength('c.alias', '!=', '0');
405405
$case_when_category_alias .= ' THEN ';
406-
$c_id = $query->castAsChar('c.id');
406+
$c_id = $query->castAs('CHAR', 'c.id');
407407
$case_when_category_alias .= $query->concatenate([$c_id, 'c.alias'], ':');
408408
$case_when_category_alias .= ' ELSE ';
409409
$case_when_category_alias .= $c_id . ' END as catslug';

‎plugins/finder/newsfeeds/src/Extension/Newsfeeds.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ protected function getListQuery($query = null)
375375
$case_when_item_alias = ' CASE WHEN ';
376376
$case_when_item_alias .= $query->charLength('a.alias', '!=', '0');
377377
$case_when_item_alias .= ' THEN ';
378-
$a_id = $query->castAsChar('a.id');
378+
$a_id = $query->castAs('CHAR', 'a.id');
379379
$case_when_item_alias .= $query->concatenate([$a_id, 'a.alias'], ':');
380380
$case_when_item_alias .= ' ELSE ';
381381
$case_when_item_alias .= $a_id . ' END as slug';
@@ -384,7 +384,7 @@ protected function getListQuery($query = null)
384384
$case_when_category_alias = ' CASE WHEN ';
385385
$case_when_category_alias .= $query->charLength('c.alias', '!=', '0');
386386
$case_when_category_alias .= ' THEN ';
387-
$c_id = $query->castAsChar('c.id');
387+
$c_id = $query->castAs('CHAR', 'c.id');
388388
$case_when_category_alias .= $query->concatenate([$c_id, 'c.alias'], ':');
389389
$case_when_category_alias .= ' ELSE ';
390390
$case_when_category_alias .= $c_id . ' END as catslug';

0 commit comments

Comments
 (0)