Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
fdfeb5c
[5.3][joomla/database] use createQuery
heelc29 Mar 2, 2025
f1cefaa
temp update joomla-framework/database#325
heelc29 Mar 15, 2025
fc3a2d0
Merge branch '6.0-dev' into 5.3/dababase/createquery
heelc29 Mar 15, 2025
4d4282b
update test stubs
heelc29 Mar 16, 2025
f1358a2
Merge branch '6.0-dev' into pr/45056
heelc29 May 19, 2025
04192db
update
heelc29 May 19, 2025
e390ca7
update
heelc29 May 19, 2025
be5b031
Merge branch '6.0-dev' into 6.0/dababase/createquery
heelc29 Jun 8, 2025
f9ab453
update
heelc29 Jun 8, 2025
a4db5bb
Merge branch '6.0-dev' into 5.3/dababase/createquery
rdeutz Jun 25, 2025
68fd364
fix merge conflicts
heelc29 Jun 25, 2025
707c6ba
use 4.x-dev branch of joomla/database
heelc29 Jun 25, 2025
edf6644
Merge branch '6.0-dev' into 6.0/dababase/createquery
heelc29 Jul 5, 2025
b0c38c3
update
heelc29 Jul 5, 2025
8d011e2
Merge branch '6.0-dev' into 6.0/dababase/createquery
heelc29 Jul 14, 2025
e4fe829
Merge branch '6.0-dev' into 6.0/dababase/createquery
heelc29 Jul 24, 2025
51f47af
Merge branch '6.0-dev' into 6.0/dababase/createquery
heelc29 Jul 30, 2025
1242c5b
Update phpstan-baseline.neon
heelc29 Jul 30, 2025
f69d222
Merge branch '6.0-dev' into 6.0/dababase/createquery
heelc29 Aug 5, 2025
876eba7
Merge branch '6.0-dev' into 6.0/dababase/createquery
heelc29 Aug 14, 2025
34e2b8f
Merge branch '6.0-dev' into 6.0/dababase/createquery
heelc29 Aug 16, 2025
8ee8eeb
update
heelc29 Aug 16, 2025
d96eb1a
Merge branch '6.0-dev' into 6.0/dababase/createquery
heelc29 Sep 23, 2025
45f9bea
Update composer.lock
heelc29 Sep 25, 2025
dd3ab77
Merge branch '6.0-dev' into 5.3/dababase/createquery
Bodge-IT Sep 25, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class ExtensionField extends ListField
public function getOptions()
{
$db = $this->getDatabase();
$query = $db->getQuery(true)
$query = $db->createQuery()
->select('DISTINCT ' . $db->quoteName('extension'))
->from($db->quoteName('#__action_logs'))
->order($db->quoteName('extension'));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ protected function getOptions()
$db = $this->getDatabase();

// Construct the query
$query = $db->getQuery(true)
$query = $db->createQuery()
->select($db->quoteName('u.id', 'value'))
->select($db->quoteName('u.username', 'text'))
->from($db->quoteName('#__users', 'u'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class LogtypeField extends ListField
public function getOptions()
{
$db = $this->getDatabase();
$query = $db->getQuery(true)
$query = $db->createQuery()
->select($db->quoteName('extension'))
->from($db->quoteName('#__action_logs_extensions'));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class PlugininfoField extends FormField
protected function getInput()
{
$db = $this->getDatabase();
$query = $db->getQuery(true)
$query = $db->createQuery()
->select($db->quoteName('extension_id'))
->from($db->quoteName('#__extensions'))
->where($db->quoteName('folder') . ' = ' . $db->quote('actionlog'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function getOptions()
{
$db = $this->getDatabase();
$user = Factory::getApplication()->getIdentity();
$query = $db->getQuery(true)
$query = $db->createQuery()
->select($db->quoteName('extensions'))
->from($db->quoteName('#__action_logs_users'))
->where($db->quoteName('user_id') . ' = :userid')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ public static function loadActionLogPluginsLanguage()
$db = Factory::getDbo();

// Get all (both enabled and disabled) actionlog plugins
$query = $db->getQuery(true)
$query = $db->createQuery()
->select(
$db->quoteName(
[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class ActionlogConfigModel extends BaseDatabaseModel
public function getLogContentTypeParams(string $context): ?\stdClass
{
$db = $this->getDatabase();
$query = $db->getQuery(true)
$query = $db->createQuery()
->select('a.*')
->from($db->quoteName('#__action_log_config', 'a'))
->where($db->quoteName('a.type_alias') . ' = :context')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ protected function sendNotificationEmails($messages, $username, $context)
$app = Factory::getApplication();
$lang = $app->getLanguage();
$db = $this->getDatabase();
$query = $db->getQuery(true);
$query = $db->createQuery();

$query
->select($db->quoteName(['u.email', 'l.extensions']))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ protected function populateState($ordering = 'a.id', $direction = 'desc')
protected function getListQuery()
{
$db = $this->getDatabase();
$query = $db->getQuery(true)
$query = $db->createQuery()
->select('a.*')
->select($db->quoteName('u.name'))
->from($db->quoteName('#__action_logs', 'a'))
Expand Down Expand Up @@ -234,7 +234,7 @@ public function getLogsForItem($extension, $itemId)
{
$itemId = (int) $itemId;
$db = $this->getDatabase();
$query = $db->getQuery(true)
$query = $db->createQuery()
->select('a.*')
->select($db->quoteName('u.name'))
->from($db->quoteName('#__action_logs', 'a'))
Expand Down Expand Up @@ -307,7 +307,7 @@ public function getLogDataAsIterator($pks = null)
private function getLogDataQuery($pks = null)
{
$db = $this->getDatabase();
$query = $db->getQuery(true)
$query = $db->createQuery()
->select('a.*')
->select($db->quoteName('u.name'))
->from($db->quoteName('#__action_logs', 'a'))
Expand All @@ -334,7 +334,7 @@ public function delete(&$pks)
{
$keys = ArrayHelper::toInteger($pks);
$db = $this->getDatabase();
$query = $db->getQuery(true)
$query = $db->createQuery()
->delete($db->quoteName('#__action_logs'))
->whereIn($db->quoteName('id'), $keys);
$db->setQuery($query);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
function admin_postinstall_languageaccess340_condition()
{
$db = Factory::getDbo();
$query = $db->getQuery(true)
$query = $db->createQuery()
->select($db->quoteName('access'))
->from($db->quoteName('#__languages'))
->where($db->quoteName('access') . ' = ' . $db->quote('0'));
Expand Down
10 changes: 5 additions & 5 deletions administrator/components/com_admin/script.php
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ protected function clearStatsCache()
try {
// Get the params for the stats plugin
$params = $db->setQuery(
$db->getQuery(true)
$db->createQuery()
->select($db->quoteName('params'))
->from($db->quoteName('#__extensions'))
->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
Expand All @@ -192,7 +192,7 @@ protected function clearStatsCache()

$params = json_encode($params);

$query = $db->getQuery(true)
$query = $db->createQuery()
->update($db->quoteName('#__extensions'))
->set($db->quoteName('params') . ' = ' . $db->quote($params))
->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
Expand Down Expand Up @@ -295,7 +295,7 @@ protected function uninstallExtensions()

foreach ($extensions as $extension) {
$row = $db->setQuery(
$db->getQuery(true)
$db->createQuery()
->select('*')
->from($db->quoteName('#__extensions'))
->where($db->quoteName('type') . ' = ' . $db->quote($extension['type']))
Expand All @@ -319,7 +319,7 @@ protected function uninstallExtensions()

// Unlock and unprotect the plugin so we can uninstall it
$db->setQuery(
$db->getQuery(true)
$db->createQuery()
->update($db->quoteName('#__extensions'))
->set($db->quoteName('locked') . ' = 0')
->set($db->quoteName('protected') . ' = 0')
Expand Down Expand Up @@ -351,7 +351,7 @@ protected function updateManifestCaches()

// Attempt to refresh manifest caches
$db = Factory::getDbo();
$query = $db->getQuery(true)
$query = $db->createQuery()
->select('*')
->from('#__extensions');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ public function getExtensions(): array
{
$installed = [];
$db = $this->getDatabase();
$query = $db->getQuery(true)
$query = $db->createQuery()
->select('*')
->from($db->quoteName('#__extensions'));
$db->setQuery($query);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
$db = Factory::getDbo();

// Get the category name
$query = $db->getQuery(true)
$query = $db->createQuery()
->select($db->quoteName('title'))
->from($db->quoteName('#__categories'))
->where($db->quoteName('id') . ' = :id')
Expand All @@ -272,7 +272,7 @@ public static function getAssociationHtmlList($extensionName, $typeName, $itemId
$db = Factory::getDbo();

// Get the menutype name
$query = $db->getQuery(true)
$query = $db->createQuery()
->select($db->quoteName('title'))
->from($db->quoteName('#__menu_types'))
->where($db->quoteName('menutype') . ' = :menutype')
Expand Down Expand Up @@ -448,7 +448,7 @@ private static function getEnabledExtensions()
{
$db = Factory::getDbo();

$query = $db->getQuery(true)
$query = $db->createQuery()
->select('*')
->from($db->quoteName('#__extensions'))
->where($db->quoteName('type') . ' = ' . $db->quote('component'))
Expand Down Expand Up @@ -653,7 +653,7 @@ public static function getTypeFieldName($extensionName, $typeName, $fieldName)
public static function getLanguagefilterPluginId()
{
$db = Factory::getDbo();
$query = $db->getQuery(true)
$query = $db->createQuery()
->select($db->quoteName('extension_id'))
->from($db->quoteName('#__extensions'))
->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ protected function getListQuery()
// Create a new query object.
$user = $this->getCurrentUser();
$db = $this->getDatabase();
$query = $db->getQuery(true);
$query = $db->createQuery();

$details = $type->get('details');

Expand Down Expand Up @@ -462,7 +462,7 @@ public function purge($context = '', $key = '')
{
$app = Factory::getApplication();
$db = $this->getDatabase();
$query = $db->getQuery(true)->delete($db->quoteName('#__associations'));
$query = $db->createQuery()->delete($db->quoteName('#__associations'));

// Filter by associations context.
if ($context) {
Expand Down Expand Up @@ -508,7 +508,7 @@ public function clean($context = '', $key = '')
{
$app = Factory::getApplication();
$db = $this->getDatabase();
$query = $db->getQuery(true)
$query = $db->createQuery()
->select($db->quoteName('key') . ', COUNT(*)')
->from($db->quoteName('#__associations'))
->group($db->quoteName('key'))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public static function updateReset()
$app = Factory::getApplication();
$user = $app->getIdentity();

$query = $db->getQuery(true)
$query = $db->createQuery()
->select('*')
->from($db->quoteName('#__banners'))
->where(
Expand Down Expand Up @@ -110,7 +110,7 @@ public static function updateReset()
}

// Update the row ordering field.
$query = $db->getQuery(true)
$query = $db->createQuery()
->update($db->quoteName('#__banners'))
->set(
[
Expand Down Expand Up @@ -147,7 +147,7 @@ public static function getClientOptions()
$options = [];

$db = Factory::getDbo();
$query = $db->getQuery(true)
$query = $db->createQuery()
->select(
[
$db->quoteName('id', 'value'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ protected function cleanupPostBatchCopy(TableInterface $table, $newId, $oldId)
// Initialise clicks and impmade
$db = $this->getDatabase();

$query = $db->getQuery(true)
$query = $db->createQuery()
->update($db->quoteName('#__banners'))
->set($db->quoteName('clicks') . ' = 0')
->set($db->quoteName('impmade') . ' = 0')
Expand Down Expand Up @@ -353,7 +353,7 @@ protected function prepareTable($table)
// Set ordering to the last item if not set
if (empty($table->ordering)) {
$db = $this->getDatabase();
$query = $db->getQuery(true)
$query = $db->createQuery()
->select('MAX(' . $db->quoteName('ordering') . ')')
->from($db->quoteName('#__banners'));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function &getCategoryOrders()
{
if (!isset($this->cache['categoryorders'])) {
$db = $this->getDatabase();
$query = $db->getQuery(true)
$query = $db->createQuery()
->select(
[
'MAX(' . $db->quoteName('ordering') . ') AS ' . $db->quoteName('max'),
Expand All @@ -104,7 +104,7 @@ public function &getCategoryOrders()
protected function getListQuery()
{
$db = $this->getDatabase();
$query = $db->getQuery(true);
$query = $db->createQuery();

// Select the required fields from the table.
$query->select(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ protected function getListQuery()
{
// Create a new query object.
$db = $this->getDatabase();
$query = $db->getQuery(true);
$query = $db->createQuery();

$defaultPurchase = (int) ComponentHelper::getParams('com_banners')->get('purchase_type', 3);

Expand Down Expand Up @@ -227,7 +227,7 @@ public function getItems()
$db = $this->getDatabase();
$clientIds = array_column($items, 'id');

$query = $db->getQuery(true)
$query = $db->createQuery()
->select(
[
$db->quoteName('cid'),
Expand Down
10 changes: 5 additions & 5 deletions administrator/components/com_banners/src/Model/TracksModel.php
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ protected function getListQuery()
{
// Create a new query object.
$db = $this->getDatabase();
$query = $db->getQuery(true);
$query = $db->createQuery();

// Select the required fields from the table.
$query->select(
Expand Down Expand Up @@ -202,7 +202,7 @@ public function delete()
if ($allow) {
// Delete tracks from this banner
$db = $this->getDatabase();
$query = $db->getQuery(true)
$query = $db->createQuery()
->delete($db->quoteName('#__banner_tracks'));

// Filter by type
Expand All @@ -223,7 +223,7 @@ public function delete()
->bind(':end', $end);
}

$subQuery = $db->getQuery(true);
$subQuery = $db->createQuery();
$subQuery->select($db->quoteName('id'))
->from($db->quoteName('#__banners'));

Expand Down Expand Up @@ -344,7 +344,7 @@ protected function getCategoryName()

if ($categoryId) {
$db = $this->getDatabase();
$query = $db->getQuery(true)
$query = $db->createQuery()
->select($db->quoteName('title'))
->from($db->quoteName('#__categories'))
->where($db->quoteName('id') . ' = :categoryId')
Expand Down Expand Up @@ -378,7 +378,7 @@ protected function getClientName()

if ($clientId) {
$db = $this->getDatabase();
$query = $db->getQuery(true)
$query = $db->createQuery()
->select($db->quoteName('name'))
->from($db->quoteName('#__banner_clients'))
->where($db->quoteName('id') . ' = :clientId')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function clients()
public function clientlist()
{
$db = $this->getDatabase();
$query = $db->getQuery(true)
$query = $db->createQuery()
->select(
[
$db->quoteName('id', 'value'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public function clicks()
{
$id = (int) $this->id;
$db = $this->getDatabase();
$query = $db->getQuery(true)
$query = $db->createQuery()
->update($db->quoteName('#__banners'))
->set($db->quoteName('clicks') . ' = ' . $db->quoteName('clicks') . ' + 1')
->where($db->quoteName('id') . ' = :id')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ protected function getOptions()
$db = $this->getDatabase();
$user = $this->getCurrentUser();

$query = $db->getQuery(true)
$query = $db->createQuery()
->select(
[
$db->quoteName('a.id', 'value'),
Expand Down Expand Up @@ -316,7 +316,7 @@ protected function getOptions()
&& !isset($options[0])
&& isset($this->element['show_root'])
) {
$rowQuery = $db->getQuery(true)
$rowQuery = $db->createQuery()
->select(
[
$db->quoteName('a.id', 'value'),
Expand Down
Loading
Loading