Skip to content

[4.0] Language library prepared statements #26103

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

Merged
merged 9 commits into from
Sep 2, 2019
Merged

[4.0] Language library prepared statements #26103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cdf66e5
Prepared statements
SharkyKZ Aug 31, 2019
a901cc0
Merge remote-tracking branch 'upstream/4.0-dev' into j4/prepared/Lang…
SharkyKZ Aug 31, 2019
2f42625
Merge branch '4.0-dev' into j4/prepared/Language
SharkyKZ Aug 31, 2019
ef9d500
CS
SharkyKZ Aug 31, 2019
80e8ce6
Merge branch 'j4/prepared/Language' of https://github.com/SharkyKZ/jo…
SharkyKZ Aug 31, 2019
52ff0e7
quoteName
SharkyKZ Sep 1, 2019
989ec82
Apply suggestions from code review
SharkyKZ Sep 1, 2019
99f49a5
Merge branch 'j4/prepared/Language' of https://github.com/SharkyKZ/jo…
SharkyKZ Sep 1, 2019
aec9639
Merge branch '4.0-dev' into j4/prepared/Language
wilsonge Sep 2, 2019
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
53 changes: 40 additions & 13 deletions libraries/src/Language/Associations.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

use Joomla\CMS\Factory;
use Joomla\CMS\Plugin\PluginHelper;
use Joomla\Database\ParameterType;
use Joomla\Registry\Registry;

/**
Expand Down Expand Up @@ -46,31 +47,50 @@ public static function getAssociations($extension, $tablename, $context, $id, $p
// To avoid doing duplicate database queries.
static $multilanguageAssociations = array();

// Cast before creating cache key.
$id = (int) $id;

// Multilanguage association array key. If the key is already in the array we don't need to run the query again, just return it.
$queryKey = md5(serialize(array_merge(array($extension, $tablename, $context, $id), $advClause)));

if (!isset($multilanguageAssociations[$queryKey]))
{
$multilanguageAssociations[$queryKey] = array();

$db = Factory::getDbo();
$categoriesExtraSql = (($tablename === '#__categories') ? ' AND c2.extension = ' . $db->quote($extension) : '');
$query = $db->getQuery(true)
->select($db->quoteName('c2.language'))
$db = Factory::getDbo();
$query = $db->getQuery(true);
$categoriesExtraSql = '';

if ($tablename === '#__categories')
{
$categoriesExtraSql = ' AND c2.extension = :extension1';
$query->bind(':extension1', $extension);
}

$query->select($db->quoteName('c2.language'))
->from($db->quoteName($tablename, 'c'))
->join('INNER', $db->quoteName('#__associations', 'a') . ' ON a.id = c.' . $db->quoteName($pk) . ' AND a.context=' . $db->quote($context))
->join('INNER', $db->quoteName('#__associations', 'a2') . ' ON ' . $db->quoteName('a.key') . ' = ' . $db->quoteName('a2.key'))
->join('INNER', $db->quoteName($tablename, 'c2') . ' ON a2.id = c2.' . $db->quoteName($pk) . $categoriesExtraSql);
->join(
'INNER',
$db->quoteName('#__associations', 'a'), $db->quoteName('a.id') . ' = ' . $db->quoteName('c.' . $pk)
. ' AND ' . $db->quoteName('a.context') . ' = :context'
)
->bind(':context', $context)
->join('INNER', $db->quoteName('#__associations', 'a2'), $db->quoteName('a.key') . ' = ' . $db->quoteName('a2.key'))
->join(
'INNER',
$db->quoteName($tablename, 'c2'),
$db->quoteName('a2.id') . ' = ' . $db->quoteName('c2.' . $pk) . $categoriesExtraSql
);

// Use alias field ?
if (!empty($aliasField))
{
$query->select(
$query->concatenate(
array(
[
$db->quoteName('c2.' . $pk),
$db->quoteName('c2.' . $aliasField),
),
],
':'
) . ' AS ' . $db->quoteName($pk)
);
Expand All @@ -85,21 +105,28 @@ public static function getAssociations($extension, $tablename, $context, $id, $p
{
$query->join(
'INNER',
$db->quoteName('#__categories', 'ca') . ' ON ' . $db->quoteName('c2.' . $catField) . ' = ca.id AND ca.extension = ' . $db->quote($extension)
$db->quoteName('#__categories', 'ca'),
$db->quoteName('c2.' . $catField) . ' = ' . $db->quoteName('ca.id') . ' AND ' . $db->quoteName('ca.extension') . ' = :extension2'
)
->bind(':extension2', $extension)
->select(
$query->concatenate(
array('ca.id', 'ca.alias'),
[
$db->quoteName('ca.id'),
$db->quoteName('ca.alias'),
],
':'
) . ' AS ' . $db->quoteName($catField)
);
}

$query->where('c.' . $pk . ' = ' . (int) $id);
$query->where($db->quoteName('c.' . $pk) . ' = :id')
->bind(':id', $id, ParameterType::INTEGER);

if ($tablename === '#__categories')
{
$query->where('c.extension = ' . $db->quote($extension));
$query->where($db->quoteName('c.extension') . ' = :extension3')
->bind(':extension3', $extension);
}

// Advanced where clause
Expand Down
25 changes: 18 additions & 7 deletions libraries/src/Language/LanguageHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,9 @@ public static function getLanguages($key = 'default')
$db = Factory::getDbo();
$query = $db->getQuery(true)
->select('*')
->from('#__languages')
->where('published=1')
->order('ordering ASC');
->from($db->quoteName('#__languages'))
->where($db->quoteName('published') . ' = 1')
->order($db->quoteName('ordering') . ' ASC');
$db->setQuery($query);

$languages['default'] = $db->loadObjectList();
Expand Down Expand Up @@ -211,11 +211,22 @@ public static function getInstalledLanguages($clientId = null, $processMetaData
$db = Factory::getDbo();

$query = $db->getQuery(true)
->select($db->quoteName(array('element', 'name', 'client_id', 'extension_id')))
->select(
[
$db->quoteName('element'),
$db->quoteName('name'),
$db->quoteName('client_id'),
$db->quoteName('extension_id'),
]
)
->from($db->quoteName('#__extensions'))
->where($db->quoteName('type') . ' = ' . $db->quote('language'))
->where($db->quoteName('state') . ' = 0')
->where($db->quoteName('enabled') . ' = 1');
->where(
[
$db->quoteName('type') . ' = ' . $db->quote('language'),
$db->quoteName('state') . ' = 0',
$db->quoteName('enabled') . ' = 1',
]
);

$installedLanguages = $db->setQuery($query)->loadObjectList();

Expand Down
34 changes: 23 additions & 11 deletions libraries/src/Language/Multilanguage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,22 @@ public static function isEnabled(CMSApplication $app = null, DatabaseInterface $
// Determine status of language filter plugin.
$db = $db ?: Factory::getDbo();
$query = $db->getQuery(true)
->select('enabled')
->select($db->quoteName('enabled'))
->from($db->quoteName('#__extensions'))
->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
->where($db->quoteName('folder') . ' = ' . $db->quote('system'))
->where($db->quoteName('element') . ' = ' . $db->quote('languagefilter'));
->where(
[
$db->quoteName('type') . ' = ' . $db->quote('plugin'),
$db->quoteName('folder') . ' = ' . $db->quote('system'),
$db->quoteName('element') . ' = ' . $db->quote('languagefilter'),
]
);
$db->setQuery($query);

static::$enabled = $db->loadResult();
static::$enabled = (bool) $db->loadResult();
$tested = true;
}

return (bool) static::$enabled;
return static::$enabled;
}

/**
Expand All @@ -101,12 +105,20 @@ public static function getSiteHomePages(DatabaseInterface $db = null)
// Check for Home pages languages.
$db = $db ?: Factory::getDbo();
$query = $db->getQuery(true)
->select('language')
->select('id')
->select(
[
$db->quoteName('language'),
$db->quoteName('id'),
]
)
->from($db->quoteName('#__menu'))
->where('home = 1')
->where('published = 1')
->where('client_id = 0');
->where(
[
$db->quoteName('home') . ' = ' . $db->quote('1'),
$db->quoteName('published') . ' = 1',
$db->quoteName('client_id') . ' = 0',
]
);
$db->setQuery($query);

$multilangSiteHomePages = $db->loadObjectList('language');
Expand Down