diff --git a/administrator/components/com_actionlogs/src/Field/ExtensionField.php b/administrator/components/com_actionlogs/src/Field/ExtensionField.php
index 49ec4a0a6d123..63220ade7e0b9 100644
--- a/administrator/components/com_actionlogs/src/Field/ExtensionField.php
+++ b/administrator/components/com_actionlogs/src/Field/ExtensionField.php
@@ -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'));
diff --git a/administrator/components/com_actionlogs/src/Field/LogcreatorField.php b/administrator/components/com_actionlogs/src/Field/LogcreatorField.php
index d7d5c516dba87..0925ddbc108a0 100644
--- a/administrator/components/com_actionlogs/src/Field/LogcreatorField.php
+++ b/administrator/components/com_actionlogs/src/Field/LogcreatorField.php
@@ -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'))
diff --git a/administrator/components/com_actionlogs/src/Field/LogtypeField.php b/administrator/components/com_actionlogs/src/Field/LogtypeField.php
index 6aae799f0c2b2..ba2eb4569b152 100644
--- a/administrator/components/com_actionlogs/src/Field/LogtypeField.php
+++ b/administrator/components/com_actionlogs/src/Field/LogtypeField.php
@@ -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'));
 
diff --git a/administrator/components/com_actionlogs/src/Field/PlugininfoField.php b/administrator/components/com_actionlogs/src/Field/PlugininfoField.php
index b1c3ac45f3a81..2b62df3e5b8bd 100644
--- a/administrator/components/com_actionlogs/src/Field/PlugininfoField.php
+++ b/administrator/components/com_actionlogs/src/Field/PlugininfoField.php
@@ -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'))
diff --git a/administrator/components/com_actionlogs/src/Field/UserlogtypeField.php b/administrator/components/com_actionlogs/src/Field/UserlogtypeField.php
index c821e5fb67a4e..4849e0379dccd 100644
--- a/administrator/components/com_actionlogs/src/Field/UserlogtypeField.php
+++ b/administrator/components/com_actionlogs/src/Field/UserlogtypeField.php
@@ -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')
diff --git a/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php b/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php
index 956b9f911a7d0..c4716bde87ccb 100644
--- a/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php
+++ b/administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php
@@ -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(
                     [
diff --git a/administrator/components/com_actionlogs/src/Model/ActionlogConfigModel.php b/administrator/components/com_actionlogs/src/Model/ActionlogConfigModel.php
index 9ff7c98f3dafb..f772f5f29659a 100644
--- a/administrator/components/com_actionlogs/src/Model/ActionlogConfigModel.php
+++ b/administrator/components/com_actionlogs/src/Model/ActionlogConfigModel.php
@@ -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')
diff --git a/administrator/components/com_actionlogs/src/Model/ActionlogModel.php b/administrator/components/com_actionlogs/src/Model/ActionlogModel.php
index 0f7e5dafa86a3..c54c58c7f139a 100644
--- a/administrator/components/com_actionlogs/src/Model/ActionlogModel.php
+++ b/administrator/components/com_actionlogs/src/Model/ActionlogModel.php
@@ -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']))
diff --git a/administrator/components/com_actionlogs/src/Model/ActionlogsModel.php b/administrator/components/com_actionlogs/src/Model/ActionlogsModel.php
index 0ea1267b102f6..d02610f132f7b 100644
--- a/administrator/components/com_actionlogs/src/Model/ActionlogsModel.php
+++ b/administrator/components/com_actionlogs/src/Model/ActionlogsModel.php
@@ -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'))
@@ -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'))
@@ -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'))
@@ -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);
diff --git a/administrator/components/com_admin/postinstall/languageaccess340.php b/administrator/components/com_admin/postinstall/languageaccess340.php
index 32ec165e056c0..d60c2b6f38864 100644
--- a/administrator/components/com_admin/postinstall/languageaccess340.php
+++ b/administrator/components/com_admin/postinstall/languageaccess340.php
@@ -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'));
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
index 2aea863281c4e..ac09867895b99 100644
--- a/administrator/components/com_admin/script.php
+++ b/administrator/components/com_admin/script.php
@@ -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'))
@@ -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'))
@@ -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']))
@@ -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')
@@ -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');
 
diff --git a/administrator/components/com_admin/src/Model/SysinfoModel.php b/administrator/components/com_admin/src/Model/SysinfoModel.php
index d5a3eb239f48b..c40623f6e3912 100644
--- a/administrator/components/com_admin/src/Model/SysinfoModel.php
+++ b/administrator/components/com_admin/src/Model/SysinfoModel.php
@@ -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);
diff --git a/administrator/components/com_associations/src/Helper/AssociationsHelper.php b/administrator/components/com_associations/src/Helper/AssociationsHelper.php
index 6f591141a919e..3fb7a8d10446d 100644
--- a/administrator/components/com_associations/src/Helper/AssociationsHelper.php
+++ b/administrator/components/com_associations/src/Helper/AssociationsHelper.php
@@ -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')
@@ -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')
@@ -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'))
@@ -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'))
diff --git a/administrator/components/com_associations/src/Model/AssociationsModel.php b/administrator/components/com_associations/src/Model/AssociationsModel.php
index ab66d7ff095a2..03adf17c33da7 100644
--- a/administrator/components/com_associations/src/Model/AssociationsModel.php
+++ b/administrator/components/com_associations/src/Model/AssociationsModel.php
@@ -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');
 
@@ -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) {
@@ -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'))
diff --git a/administrator/components/com_banners/src/Helper/BannersHelper.php b/administrator/components/com_banners/src/Helper/BannersHelper.php
index 254314b3d6459..a74c0f0add8dc 100644
--- a/administrator/components/com_banners/src/Helper/BannersHelper.php
+++ b/administrator/components/com_banners/src/Helper/BannersHelper.php
@@ -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(
@@ -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(
                     [
@@ -147,7 +147,7 @@ public static function getClientOptions()
         $options = [];
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('id', 'value'),
diff --git a/administrator/components/com_banners/src/Model/BannerModel.php b/administrator/components/com_banners/src/Model/BannerModel.php
index 9eab11d30dd15..32b9e532809f0 100644
--- a/administrator/components/com_banners/src/Model/BannerModel.php
+++ b/administrator/components/com_banners/src/Model/BannerModel.php
@@ -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')
@@ -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'));
 
diff --git a/administrator/components/com_banners/src/Model/BannersModel.php b/administrator/components/com_banners/src/Model/BannersModel.php
index a835d5bb23f5a..bd38b3a8f1fe3 100644
--- a/administrator/components/com_banners/src/Model/BannersModel.php
+++ b/administrator/components/com_banners/src/Model/BannersModel.php
@@ -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'),
@@ -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(
diff --git a/administrator/components/com_banners/src/Model/ClientsModel.php b/administrator/components/com_banners/src/Model/ClientsModel.php
index 54216dd4f553e..4d0105543bec7 100644
--- a/administrator/components/com_banners/src/Model/ClientsModel.php
+++ b/administrator/components/com_banners/src/Model/ClientsModel.php
@@ -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);
 
@@ -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'),
diff --git a/administrator/components/com_banners/src/Model/TracksModel.php b/administrator/components/com_banners/src/Model/TracksModel.php
index 3656463c93cf2..c2f60ce7e468c 100644
--- a/administrator/components/com_banners/src/Model/TracksModel.php
+++ b/administrator/components/com_banners/src/Model/TracksModel.php
@@ -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(
@@ -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
@@ -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'));
 
@@ -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')
@@ -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')
diff --git a/administrator/components/com_banners/src/Service/Html/Banner.php b/administrator/components/com_banners/src/Service/Html/Banner.php
index 77314f24fd6f3..bf57f4b80742c 100644
--- a/administrator/components/com_banners/src/Service/Html/Banner.php
+++ b/administrator/components/com_banners/src/Service/Html/Banner.php
@@ -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'),
diff --git a/administrator/components/com_banners/src/Table/BannerTable.php b/administrator/components/com_banners/src/Table/BannerTable.php
index b26cd2b1782df..b49d8de2353be 100644
--- a/administrator/components/com_banners/src/Table/BannerTable.php
+++ b/administrator/components/com_banners/src/Table/BannerTable.php
@@ -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')
diff --git a/administrator/components/com_categories/src/Field/CategoryeditField.php b/administrator/components/com_categories/src/Field/CategoryeditField.php
index 42adbd6bd8462..ecea83040d1df 100644
--- a/administrator/components/com_categories/src/Field/CategoryeditField.php
+++ b/administrator/components/com_categories/src/Field/CategoryeditField.php
@@ -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'),
@@ -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'),
diff --git a/administrator/components/com_categories/src/Field/ComponentsCategoryField.php b/administrator/components/com_categories/src/Field/ComponentsCategoryField.php
index c6599b83b6127..ede94cfa605df 100644
--- a/administrator/components/com_categories/src/Field/ComponentsCategoryField.php
+++ b/administrator/components/com_categories/src/Field/ComponentsCategoryField.php
@@ -47,7 +47,7 @@ protected function getOptions()
         $db      = $this->getDatabase();
         $options = [];
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select('DISTINCT ' . $db->quoteName('extension'))
             ->from($db->quoteName('#__categories'))
             ->where($db->quoteName('extension') . ' != ' . $db->quote('system'));
diff --git a/administrator/components/com_categories/src/Field/Modal/CategoryField.php b/administrator/components/com_categories/src/Field/Modal/CategoryField.php
index ba48fdcc64355..0541fa37e7dda 100644
--- a/administrator/components/com_categories/src/Field/Modal/CategoryField.php
+++ b/administrator/components/com_categories/src/Field/Modal/CategoryField.php
@@ -145,7 +145,7 @@ protected function getValueTitle()
         if ($value) {
             try {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('title'))
                     ->from($db->quoteName('#__categories'))
                     ->where($db->quoteName('id') . ' = :value')
diff --git a/administrator/components/com_categories/src/Helper/CategoriesHelper.php b/administrator/components/com_categories/src/Helper/CategoriesHelper.php
index 20a3fdde4ab38..7fd0c43956930 100644
--- a/administrator/components/com_categories/src/Helper/CategoriesHelper.php
+++ b/administrator/components/com_categories/src/Helper/CategoriesHelper.php
@@ -47,7 +47,7 @@ public static function getAssociations($pk, $extension = 'com_content')
             $assocId = (int) $arrId[0];
             $db      = Factory::getDbo();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('published'))
                 ->from($db->quoteName('#__categories'))
                 ->whereIn($db->quoteName('access'), $groups)
diff --git a/administrator/components/com_categories/src/Model/CategoriesModel.php b/administrator/components/com_categories/src/Model/CategoriesModel.php
index 10f7cc33bc258..f5a016a9fedbc 100644
--- a/administrator/components/com_categories/src/Model/CategoriesModel.php
+++ b/administrator/components/com_categories/src/Model/CategoriesModel.php
@@ -164,7 +164,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $user  = $this->getCurrentUser();
 
         // Select the required fields from the table.
@@ -341,7 +341,7 @@ protected function getListQuery()
                 $includeNone = true;
             }
 
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                 ->from($db->quoteName('#__contentitem_tag_map'))
                 ->where(
@@ -359,7 +359,7 @@ protected function getListQuery()
             ->bind(':typeAlias', $typeAlias);
 
             if ($includeNone) {
-                $subQuery2 = $db->getQuery(true)
+                $subQuery2 = $db->createQuery()
                     ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                     ->from($db->quoteName('#__contentitem_tag_map'))
                     ->where($db->quoteName('type_alias') . ' = :typeAlias2');
@@ -378,7 +378,7 @@ protected function getListQuery()
             $tag = (int) $tag;
 
             if ($tag === 0) {
-                $subQuery = $db->getQuery(true)
+                $subQuery = $db->createQuery()
                     ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                     ->from($db->quoteName('#__contentitem_tag_map'))
                     ->where($db->quoteName('type_alias') . ' = :typeAlias');
diff --git a/administrator/components/com_categories/src/Model/CategoryModel.php b/administrator/components/com_categories/src/Model/CategoryModel.php
index b4fb1b5290a27..e807520e96303 100644
--- a/administrator/components/com_categories/src/Model/CategoryModel.php
+++ b/administrator/components/com_categories/src/Model/CategoryModel.php
@@ -606,7 +606,7 @@ public function save($data)
             // Get associationskey for edited item
             $db    = $this->getDatabase();
             $id    = (int) $table->id;
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('key'))
                 ->from($db->quoteName('#__associations'))
                 ->where($db->quoteName('context') . ' = :associationscontext')
@@ -620,7 +620,7 @@ public function save($data)
                 $where = [];
 
                 // Deleting old associations for the associated items
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->delete($db->quoteName('#__associations'))
                     ->where($db->quoteName('context') . ' = :associationscontext')
                     ->bind(':associationscontext', $this->associationsContext);
@@ -820,7 +820,7 @@ protected function batchFlipordering($value, $pks, $contexts)
         $successful = [];
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         /**
          * For each category get the max ordering value
@@ -929,7 +929,7 @@ protected function batchCopy($value, $pks, $contexts)
         $parents = [];
 
         // Calculate the emergency stop count as a precaution against a runaway loop bug
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(' . $db->quoteName('id') . ')')
             ->from($db->quoteName('#__categories'));
         $db->setQuery($query);
@@ -1080,7 +1080,7 @@ protected function batchMove($value, $pks, $contexts)
         $this->type = $type->getTypeByAlias($this->typeAlias);
 
         $db        = $this->getDatabase();
-        $query     = $db->getQuery(true);
+        $query     = $db->createQuery();
         $extension = Factory::getApplication()->getInput()->get('extension', '', 'word');
 
         // Check that the parent exists.
diff --git a/administrator/components/com_categories/src/Service/HTML/AdministratorService.php b/administrator/components/com_categories/src/Service/HTML/AdministratorService.php
index c2c819e1f5960..cddb935cf5517 100644
--- a/administrator/components/com_categories/src/Service/HTML/AdministratorService.php
+++ b/administrator/components/com_categories/src/Service/HTML/AdministratorService.php
@@ -52,7 +52,7 @@ public function association($catid, $extension = 'com_content')
 
             // Get the associated categories
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('c.id'),
diff --git a/administrator/components/com_checkin/src/Model/CheckinModel.php b/administrator/components/com_checkin/src/Model/CheckinModel.php
index d468199f9c0e1..4d57e06515d69 100644
--- a/administrator/components/com_checkin/src/Model/CheckinModel.php
+++ b/administrator/components/com_checkin/src/Model/CheckinModel.php
@@ -106,7 +106,7 @@ public function checkin($ids = [])
                 continue;
             }
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName($tn))
                 ->set($db->quoteName('checked_out') . ' = DEFAULT');
 
@@ -187,7 +187,7 @@ public function getItems()
                     continue;
                 }
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select('COUNT(*)')
                     ->from($db->quoteName($tn));
 
diff --git a/administrator/components/com_config/src/Field/ConfigComponentsField.php b/administrator/components/com_config/src/Field/ConfigComponentsField.php
index 7ec5fb115417f..d63b17e649693 100644
--- a/administrator/components/com_config/src/Field/ConfigComponentsField.php
+++ b/administrator/components/com_config/src/Field/ConfigComponentsField.php
@@ -44,7 +44,7 @@ class ConfigComponentsField extends ListField
     protected function getOptions()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('name AS text, element AS value')
             ->from('#__extensions')
             ->where('enabled >= 1')
diff --git a/administrator/components/com_config/src/Field/FiltersField.php b/administrator/components/com_config/src/Field/FiltersField.php
index d2b5a6a9cc2e5..d851735ae21e9 100644
--- a/administrator/components/com_config/src/Field/FiltersField.php
+++ b/administrator/components/com_config/src/Field/FiltersField.php
@@ -162,7 +162,7 @@ protected function getUserGroups()
         $db = $this->getDatabase();
 
         // Get the user groups from the database.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select('a.id AS value, a.title AS text, COUNT(DISTINCT b.id) AS level, a.parent_id as parent');
         $query->from('#__usergroups AS a');
         $query->join('LEFT', '#__usergroups AS b on a.lft > b.lft AND a.rgt < b.rgt');
diff --git a/administrator/components/com_config/src/Helper/ConfigHelper.php b/administrator/components/com_config/src/Helper/ConfigHelper.php
index 115d384402162..92c472b351057 100644
--- a/administrator/components/com_config/src/Helper/ConfigHelper.php
+++ b/administrator/components/com_config/src/Helper/ConfigHelper.php
@@ -36,7 +36,7 @@ class ConfigHelper extends ContentHelper
     public static function getAllComponents()
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('element')
             ->from('#__extensions')
             ->where('type = ' . $db->quote('component'))
diff --git a/administrator/components/com_config/src/Model/ApplicationModel.php b/administrator/components/com_config/src/Model/ApplicationModel.php
index 6dbc4603f71f6..41f4087f8fe18 100644
--- a/administrator/components/com_config/src/Model/ApplicationModel.php
+++ b/administrator/components/com_config/src/Model/ApplicationModel.php
@@ -461,7 +461,7 @@ public function save($data)
         // Purge the database session table if we are changing to the database handler.
         if ($prev['session_handler'] != 'database' && $data['session_handler'] == 'database') {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__session'))
                 ->where($db->quoteName('time') . ' < ' . (time() - 1));
             $db->setQuery($query);
@@ -474,7 +474,7 @@ public function save($data)
                 // If we are are using the session handler, purge the extra columns, otherwise truncate the whole session table
                 if ($data['session_handler'] === 'database') {
                     $revisedDbo->setQuery(
-                        $revisedDbo->getQuery(true)
+                        $revisedDbo->createQuery()
                             ->update('#__session')
                             ->set(
                                 [
@@ -1034,7 +1034,7 @@ public function storePermissions($permission = null)
             $db = $this->getDatabase();
 
             // Get the asset id by the name of the component.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__assets'))
                 ->where($db->quoteName('name') . ' = :component')
diff --git a/administrator/components/com_contact/src/Field/Modal/ContactField.php b/administrator/components/com_contact/src/Field/Modal/ContactField.php
index 7dc872ac6db99..6832f18b7e8e0 100644
--- a/administrator/components/com_contact/src/Field/Modal/ContactField.php
+++ b/administrator/components/com_contact/src/Field/Modal/ContactField.php
@@ -138,7 +138,7 @@ protected function getValueTitle()
         if ($value) {
             try {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('name'))
                     ->from($db->quoteName('#__contact_details'))
                     ->where($db->quoteName('id') . ' = :value')
diff --git a/administrator/components/com_contact/src/Model/ContactModel.php b/administrator/components/com_contact/src/Model/ContactModel.php
index f5d884f848622..44604ecc47887 100644
--- a/administrator/components/com_contact/src/Model/ContactModel.php
+++ b/administrator/components/com_contact/src/Model/ContactModel.php
@@ -369,7 +369,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(ordering)')
                     ->from($db->quoteName('#__contact_details'));
                 $db->setQuery($query);
@@ -479,7 +479,7 @@ public function featured($pks, $value = 0)
         try {
             $db = $this->getDatabase();
 
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
             $query->update($db->quoteName('#__contact_details'));
             $query->set($db->quoteName('featured') . ' = :featured');
             $query->whereIn($db->quoteName('id'), $pks);
diff --git a/administrator/components/com_contact/src/Model/ContactsModel.php b/administrator/components/com_contact/src/Model/ContactsModel.php
index 7046f83ecce34..a781a3ca4e6f4 100644
--- a/administrator/components/com_contact/src/Model/ContactsModel.php
+++ b/administrator/components/com_contact/src/Model/ContactsModel.php
@@ -146,7 +146,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $user  = $this->getCurrentUser();
 
         // Select the required fields from the table.
@@ -208,7 +208,7 @@ protected function getListQuery()
 
         // Join over the associations.
         if (Associations::isEnabled()) {
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select('COUNT(' . $db->quoteName('asso1.id') . ') > 1')
                 ->from($db->quoteName('#__associations', 'asso1'))
                 ->join('INNER', $db->quoteName('#__associations', 'asso2'), $db->quoteName('asso1.key') . ' = ' . $db->quoteName('asso2.key'))
@@ -291,7 +291,7 @@ protected function getListQuery()
                 $includeNone = true;
             }
 
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                 ->from($db->quoteName('#__contentitem_tag_map'))
                 ->where(
@@ -308,7 +308,7 @@ protected function getListQuery()
             );
 
             if ($includeNone) {
-                $subQuery2 = $db->getQuery(true)
+                $subQuery2 = $db->createQuery()
                     ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                     ->from($db->quoteName('#__contentitem_tag_map'))
                     ->where($db->quoteName('type_alias') . ' = ' . $db->quote('com_contact.contact'));
@@ -326,7 +326,7 @@ protected function getListQuery()
             $tag = (int) $tag;
 
             if ($tag === 0) {
-                $subQuery = $db->getQuery(true)
+                $subQuery = $db->createQuery()
                     ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                     ->from($db->quoteName('#__contentitem_tag_map'))
                     ->where($db->quoteName('type_alias') . ' = ' . $db->quote('com_contact.contact'));
diff --git a/administrator/components/com_contact/src/Service/HTML/AdministratorService.php b/administrator/components/com_contact/src/Service/HTML/AdministratorService.php
index d99c69510bb38..4c6a829bec937 100644
--- a/administrator/components/com_contact/src/Service/HTML/AdministratorService.php
+++ b/administrator/components/com_contact/src/Service/HTML/AdministratorService.php
@@ -52,7 +52,7 @@ public function association($contactid)
 
             // Get the associated contact items
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('c.id'),
diff --git a/administrator/components/com_content/src/Field/Modal/ArticleField.php b/administrator/components/com_content/src/Field/Modal/ArticleField.php
index c173321bbf6c0..478227bb2dbb0 100644
--- a/administrator/components/com_content/src/Field/Modal/ArticleField.php
+++ b/administrator/components/com_content/src/Field/Modal/ArticleField.php
@@ -138,7 +138,7 @@ protected function getValueTitle()
         if ($value) {
             try {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('title'))
                     ->from($db->quoteName('#__content'))
                     ->where($db->quoteName('id') . ' = :value')
diff --git a/administrator/components/com_content/src/Helper/ContentHelper.php b/administrator/components/com_content/src/Helper/ContentHelper.php
index 46aa32889767d..db9da991acba1 100644
--- a/administrator/components/com_content/src/Helper/ContentHelper.php
+++ b/administrator/components/com_content/src/Helper/ContentHelper.php
@@ -41,7 +41,7 @@ class ContentHelper extends \Joomla\CMS\Helper\ContentHelper
     public static function canDeleteState(int $id): bool
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select('id')
             ->from($db->quoteName('#__content'))
@@ -110,7 +110,7 @@ public static function onPrepareForm(Form $form, $data)
             return;
         }
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName('title'))
             ->from($db->quoteName('#__workflows'))
@@ -139,7 +139,7 @@ public static function onPrepareForm(Form $form, $data)
             if (!empty($categories)) {
                 $categories = array_reverse($categories);
 
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
 
                 $query->select($db->quoteName('title'))
                     ->from($db->quoteName('#__workflows'))
diff --git a/administrator/components/com_content/src/Model/ArticleModel.php b/administrator/components/com_content/src/Model/ArticleModel.php
index 106a7139a7634..f4f94e90c643e 100644
--- a/administrator/components/com_content/src/Model/ArticleModel.php
+++ b/administrator/components/com_content/src/Model/ArticleModel.php
@@ -141,7 +141,7 @@ protected function cleanupPostBatchCopy(TableInterface $table, $newId, $oldId)
         // Check if the article was featured and update the #__content_frontpage table
         if ($table->featured == 1) {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('featured_up'),
@@ -155,7 +155,7 @@ protected function cleanupPostBatchCopy(TableInterface $table, $newId, $oldId)
             $featured = $db->setQuery($query)->loadObject();
 
             if ($featured) {
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->insert($db->quoteName('#__content_frontpage'))
                     ->values(':newId, 0, :featuredUp, :featuredDown')
                     ->bind(':newId', $newId, ParameterType::INTEGER)
@@ -411,7 +411,7 @@ public function getItem($pk = null)
                 if ($item->featured) {
                     // Get featured dates.
                     $db    = $this->getDatabase();
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->select(
                             [
                                 $db->quoteName('featured_up'),
@@ -875,7 +875,7 @@ public function featured($pks, $value = 0, $featuredUp = null, $featuredDown = n
 
         try {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName('#__content'))
                 ->set($db->quoteName('featured') . ' = :featured')
                 ->whereIn($db->quoteName('id'), $pks)
@@ -886,14 +886,14 @@ public function featured($pks, $value = 0, $featuredUp = null, $featuredDown = n
             if ($value === 0) {
                 // Adjust the mapping table.
                 // Clear the existing features settings.
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->delete($db->quoteName('#__content_frontpage'))
                     ->whereIn($db->quoteName('content_id'), $pks);
                 $db->setQuery($query);
                 $db->execute();
             } else {
                 // First, we find out which of our new featured articles are already featured.
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('content_id'))
                     ->from($db->quoteName('#__content_frontpage'))
                     ->whereIn($db->quoteName('content_id'), $pks);
@@ -903,7 +903,7 @@ public function featured($pks, $value = 0, $featuredUp = null, $featuredDown = n
 
                 // Update old featured articles
                 if (\count($oldFeatured)) {
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->update($db->quoteName('#__content_frontpage'))
                         ->set(
                             [
@@ -923,7 +923,7 @@ public function featured($pks, $value = 0, $featuredUp = null, $featuredDown = n
 
                 // Featuring.
                 if ($newFeatured) {
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->insert($db->quoteName('#__content_frontpage'))
                         ->columns(
                             [
@@ -1106,7 +1106,7 @@ public function delete(&$pks)
         if ($return) {
             // Now check to see if this articles was featured if so delete it from the #__content_frontpage table
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__content_frontpage'))
                 ->whereIn($db->quoteName('content_id'), $pks);
             $db->setQuery($query);
diff --git a/administrator/components/com_content/src/Model/ArticlesModel.php b/administrator/components/com_content/src/Model/ArticlesModel.php
index b446992ed5987..aa5ba437569ee 100644
--- a/administrator/components/com_content/src/Model/ArticlesModel.php
+++ b/administrator/components/com_content/src/Model/ArticlesModel.php
@@ -198,7 +198,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $user  = $this->getCurrentUser();
 
         $params = ComponentHelper::getParams('com_content');
@@ -287,7 +287,7 @@ protected function getListQuery()
 
         // Join over the associations.
         if (Associations::isEnabled()) {
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select('COUNT(' . $db->quoteName('asso1.id') . ') > 1')
                 ->from($db->quoteName('#__associations', 'asso1'))
                 ->join('INNER', $db->quoteName('#__associations', 'asso2'), $db->quoteName('asso1.key') . ' = ' . $db->quoteName('asso2.key'))
@@ -414,7 +414,7 @@ protected function getListQuery()
 
             if ($authorId === 0) {
                 // Only show deleted authors' articles
-                $subQuery = $db->getQuery(true)
+                $subQuery = $db->createQuery()
                     ->select($db->quoteName('id'))
                     ->from($db->quoteName('#__users'));
 
@@ -440,7 +440,7 @@ protected function getListQuery()
                 $authorId = array_filter($authorId);
 
                 // Subquery for deleted users
-                $subQuery = $db->getQuery(true)
+                $subQuery = $db->createQuery()
                     ->select($db->quoteName('id'))
                     ->from($db->quoteName('#__users'));
 
@@ -528,7 +528,7 @@ protected function getListQuery()
                 $includeNone = true;
             }
 
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                 ->from($db->quoteName('#__contentitem_tag_map'))
                 ->where(
@@ -545,7 +545,7 @@ protected function getListQuery()
             );
 
             if ($includeNone) {
-                $subQuery2 = $db->getQuery(true)
+                $subQuery2 = $db->createQuery()
                     ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                     ->from($db->quoteName('#__contentitem_tag_map'))
                     ->where($db->quoteName('type_alias') . ' = ' . $db->quote('com_content.article'));
@@ -563,7 +563,7 @@ protected function getListQuery()
             $tag = (int) $tag;
 
             if ($tag === 0) {
-                $subQuery = $db->getQuery(true)
+                $subQuery = $db->createQuery()
                     ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                     ->from($db->quoteName('#__contentitem_tag_map'))
                     ->where($db->quoteName('type_alias') . ' = ' . $db->quote('com_content.article'));
@@ -665,7 +665,7 @@ public function getTransitions()
             if (\count($stage_ids) || \count($workflow_ids)) {
                 Factory::getLanguage()->load('com_workflow', JPATH_ADMINISTRATOR);
 
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
 
                 $query  ->select(
                     [
diff --git a/administrator/components/com_content/src/Service/HTML/AdministratorService.php b/administrator/components/com_content/src/Service/HTML/AdministratorService.php
index bc6836e6897a4..651637a1ea09d 100644
--- a/administrator/components/com_content/src/Service/HTML/AdministratorService.php
+++ b/administrator/components/com_content/src/Service/HTML/AdministratorService.php
@@ -51,7 +51,7 @@ public function association($articleid)
 
             // Get the associated menu items
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         'c.*',
diff --git a/administrator/components/com_contenthistory/src/Helper/ContenthistoryHelper.php b/administrator/components/com_contenthistory/src/Helper/ContenthistoryHelper.php
index 8dfe1ee757952..ade226ba68bc4 100644
--- a/administrator/components/com_contenthistory/src/Helper/ContenthistoryHelper.php
+++ b/administrator/components/com_contenthistory/src/Helper/ContenthistoryHelper.php
@@ -202,7 +202,7 @@ public static function getLookupValue($lookup, $value)
         if (isset($lookup->sourceColumn, $lookup->targetTable, $lookup->targetColumn, $lookup->displayColumn)) {
             $db    = Factory::getDbo();
             $value = (int) $value;
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
             $query->select($db->quoteName($lookup->displayColumn))
                 ->from($db->quoteName($lookup->targetTable))
                 ->where($db->quoteName($lookup->targetColumn) . ' = :value')
diff --git a/administrator/components/com_contenthistory/src/Model/HistoryModel.php b/administrator/components/com_contenthistory/src/Model/HistoryModel.php
index 5e787852ef607..6de7590725b77 100644
--- a/administrator/components/com_contenthistory/src/Model/HistoryModel.php
+++ b/administrator/components/com_contenthistory/src/Model/HistoryModel.php
@@ -327,7 +327,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db     = $this->getDatabase();
-        $query  = $db->getQuery(true);
+        $query  = $db->createQuery();
         $itemId = $this->getState('item_id');
 
         // Select the required fields from the table.
diff --git a/administrator/components/com_fields/src/Field/ComponentsFieldgroupField.php b/administrator/components/com_fields/src/Field/ComponentsFieldgroupField.php
index a0a846231577e..988e1a552947d 100644
--- a/administrator/components/com_fields/src/Field/ComponentsFieldgroupField.php
+++ b/administrator/components/com_fields/src/Field/ComponentsFieldgroupField.php
@@ -48,7 +48,7 @@ protected function getOptions()
         // Initialise variable.
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT a.name AS text, a.element AS value')
             ->from('#__extensions as a')
             ->where('a.enabled >= 1')
diff --git a/administrator/components/com_fields/src/Field/ComponentsFieldsField.php b/administrator/components/com_fields/src/Field/ComponentsFieldsField.php
index 5e63972a75754..6991a493afa1d 100644
--- a/administrator/components/com_fields/src/Field/ComponentsFieldsField.php
+++ b/administrator/components/com_fields/src/Field/ComponentsFieldsField.php
@@ -48,7 +48,7 @@ protected function getOptions()
         // Initialise variable.
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT a.name AS text, a.element AS value')
             ->from('#__extensions as a')
             ->where('a.enabled >= 1')
diff --git a/administrator/components/com_fields/src/Field/FieldLayoutField.php b/administrator/components/com_fields/src/Field/FieldLayoutField.php
index 95216b097eadb..b5d4c26b39166 100644
--- a/administrator/components/com_fields/src/Field/FieldLayoutField.php
+++ b/administrator/components/com_fields/src/Field/FieldLayoutField.php
@@ -51,7 +51,7 @@ protected function getInput()
         if ($extension) {
             // Get the database object and a new query object.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // Build the query.
             $query->select('element, name')
diff --git a/administrator/components/com_fields/src/Field/FieldgroupsField.php b/administrator/components/com_fields/src/Field/FieldgroupsField.php
index 65e0110c776d0..bdaf402a17f84 100644
--- a/administrator/components/com_fields/src/Field/FieldgroupsField.php
+++ b/administrator/components/com_fields/src/Field/FieldgroupsField.php
@@ -46,7 +46,7 @@ protected function getOptions()
         $viewlevels = ArrayHelper::toInteger($user->getAuthorisedViewLevels());
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select(
             [
                 $db->quoteName('title', 'text'),
diff --git a/administrator/components/com_fields/src/Helper/FieldsHelper.php b/administrator/components/com_fields/src/Helper/FieldsHelper.php
index 96b05e66eb986..4fe03217b2b64 100644
--- a/administrator/components/com_fields/src/Helper/FieldsHelper.php
+++ b/administrator/components/com_fields/src/Helper/FieldsHelper.php
@@ -591,7 +591,7 @@ public static function getAssignedCategoriesIds($fieldId)
         }
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName('a.category_id'))
             ->from($db->quoteName('#__fields_categories', 'a'))
@@ -620,7 +620,7 @@ public static function getAssignedCategoriesTitles($fieldId)
         }
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName('c.title'))
             ->from($db->quoteName('#__fields_categories', 'a'))
@@ -643,7 +643,7 @@ public static function getAssignedCategoriesTitles($fieldId)
     public static function getFieldsPluginId()
     {
         $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'))
diff --git a/administrator/components/com_fields/src/Model/FieldModel.php b/administrator/components/com_fields/src/Model/FieldModel.php
index 626dbdfb532d5..8c59c1c849c61 100644
--- a/administrator/components/com_fields/src/Model/FieldModel.php
+++ b/administrator/components/com_fields/src/Model/FieldModel.php
@@ -202,7 +202,7 @@ public function save($data)
         }
 
         // First delete all assigned categories
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->delete('#__fields_categories')
             ->where($db->quoteName('field_id') . ' = :fieldid')
             ->bind(':fieldid', $id, ParameterType::INTEGER);
@@ -239,7 +239,7 @@ public function save($data)
                 $names = array_column((array) $newParams, 'value');
 
                 $fieldId = (int) $field->id;
-                $query   = $db->getQuery(true);
+                $query   = $db->createQuery();
                 $query->delete($db->quoteName('#__fields_values'))
                     ->where($db->quoteName('field_id') . ' = :fieldid')
                     ->bind(':fieldid', $fieldId, ParameterType::INTEGER);
@@ -407,7 +407,7 @@ public function getItem($pk = null)
             }
 
             $db      = $this->getDatabase();
-            $query   = $db->getQuery(true);
+            $query   = $db->createQuery();
             $fieldId = (int) $result->id;
             $query->select($db->quoteName('category_id'))
                 ->from($db->quoteName('#__fields_categories'))
@@ -491,7 +491,7 @@ public function delete(&$pks)
 
             if (!empty($pks)) {
                 // Delete Values
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
 
                 $query->delete($db->quoteName('#__fields_values'))
                     ->whereIn($db->quoteName('field_id'), $pks);
@@ -499,7 +499,7 @@ public function delete(&$pks)
                 $db->setQuery($query)->execute();
 
                 // Delete Assigned Categories
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
 
                 $query->delete($db->quoteName('#__fields_categories'))
                     ->whereIn($db->quoteName('field_id'), $pks);
@@ -643,7 +643,7 @@ public function setFieldValue($fieldId, $itemId, $value)
 
             // Deleting the existing record as it is a reset
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             $query->delete($db->quoteName('#__fields_values'))
                 ->where($db->quoteName('field_id') . ' = :fieldid')
@@ -727,7 +727,7 @@ public function getFieldValues(array $fieldIds, $itemId)
         if (!\array_key_exists($key, $this->valueCache)) {
             // Create the query
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             $query->select($db->quoteName(['field_id', 'value']))
                 ->from($db->quoteName('#__fields_values'))
@@ -782,12 +782,12 @@ public function cleanupValues($context, $itemId)
     {
         // Delete with inner join is not possible so we need to do a subquery
         $db          = $this->getDatabase();
-        $fieldsQuery = $db->getQuery(true);
+        $fieldsQuery = $db->createQuery();
         $fieldsQuery->select($db->quoteName('id'))
             ->from($db->quoteName('#__fields'))
             ->where($db->quoteName('context') . ' = :context');
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->delete($db->quoteName('#__fields_values'))
             ->where($db->quoteName('field_id') . ' IN (' . $fieldsQuery . ')')
@@ -1162,7 +1162,7 @@ protected function batchCopy($value, $pks, $contexts)
             if ($user->authorise('core.create', $component . '.fieldgroup.' . $value)) {
                 // Find all assigned categories to this field
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
 
                 $query->select($db->quoteName('category_id'))
                     ->from($db->quoteName('#__fields_categories'))
diff --git a/administrator/components/com_fields/src/Model/FieldsModel.php b/administrator/components/com_fields/src/Model/FieldsModel.php
index 4993a1cfd1ca0..665c8ac44503c 100644
--- a/administrator/components/com_fields/src/Model/FieldsModel.php
+++ b/administrator/components/com_fields/src/Model/FieldsModel.php
@@ -140,7 +140,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $user  = $this->getCurrentUser();
         $app   = Factory::getApplication();
 
@@ -444,7 +444,7 @@ public function getGroups()
         $context    = $this->state->get('filter.context');
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select(
             [
                 $db->quoteName('title', 'text'),
diff --git a/administrator/components/com_fields/src/Model/GroupsModel.php b/administrator/components/com_fields/src/Model/GroupsModel.php
index 5ad10277f1c23..e5b270899e020 100644
--- a/administrator/components/com_fields/src/Model/GroupsModel.php
+++ b/administrator/components/com_fields/src/Model/GroupsModel.php
@@ -128,7 +128,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $user  = $this->getCurrentUser();
 
         // Select the required fields from the table.
diff --git a/administrator/components/com_fields/src/Table/FieldTable.php b/administrator/components/com_fields/src/Table/FieldTable.php
index de2620c2fc057..3277fa04b7967 100644
--- a/administrator/components/com_fields/src/Table/FieldTable.php
+++ b/administrator/components/com_fields/src/Table/FieldTable.php
@@ -299,7 +299,7 @@ protected function _getAssetParentId(?Table $table = null, $id = null)
     private function getAssetId($name)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__assets'))
             ->where($db->quoteName('name') . ' = :name')
diff --git a/administrator/components/com_fields/src/Table/GroupTable.php b/administrator/components/com_fields/src/Table/GroupTable.php
index 2e9eb93ffc324..aecbecf4f2ea5 100644
--- a/administrator/components/com_fields/src/Table/GroupTable.php
+++ b/administrator/components/com_fields/src/Table/GroupTable.php
@@ -204,7 +204,7 @@ protected function _getAssetParentId(?Table $table = null, $id = null)
     {
         $component = explode('.', $this->context);
         $db        = $this->getDatabase();
-        $query     = $db->getQuery(true)
+        $query     = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__assets'))
             ->where($db->quoteName('name') . ' = :name')
diff --git a/administrator/components/com_finder/src/Field/ContentmapField.php b/administrator/components/com_finder/src/Field/ContentmapField.php
index ea005dc8e581d..d38fc8cb48cf2 100644
--- a/administrator/components/com_finder/src/Field/ContentmapField.php
+++ b/administrator/components/com_finder/src/Field/ContentmapField.php
@@ -50,7 +50,7 @@ protected function getGroups()
         $db = $this->getDatabase();
 
         // Main query.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('a.title', 'text'))
             ->select($db->quoteName('a.id', 'value'))
             ->select($db->quoteName('a.parent_id'))
diff --git a/administrator/components/com_finder/src/Field/ContenttypesField.php b/administrator/components/com_finder/src/Field/ContenttypesField.php
index 45d78df38e5be..5e0eedc3afce7 100644
--- a/administrator/components/com_finder/src/Field/ContenttypesField.php
+++ b/administrator/components/com_finder/src/Field/ContenttypesField.php
@@ -49,7 +49,7 @@ public function getOptions()
         $options = [];
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id', 'value'))
             ->select($db->quoteName('title', 'text'))
             ->from($db->quoteName('#__finder_types'));
diff --git a/administrator/components/com_finder/src/Field/SearchfilterField.php b/administrator/components/com_finder/src/Field/SearchfilterField.php
index 7925b42e01ab9..e22ec7ddf9b47 100644
--- a/administrator/components/com_finder/src/Field/SearchfilterField.php
+++ b/administrator/components/com_finder/src/Field/SearchfilterField.php
@@ -44,7 +44,7 @@ public function getOptions()
     {
         // Build the query.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('f.title AS text, f.filter_id AS value')
             ->from($db->quoteName('#__finder_filters') . ' AS f')
             ->where('f.state = 1')
diff --git a/administrator/components/com_finder/src/Indexer/Adapter.php b/administrator/components/com_finder/src/Indexer/Adapter.php
index 0f25a148d22d7..48de309632dc5 100644
--- a/administrator/components/com_finder/src/Indexer/Adapter.php
+++ b/administrator/components/com_finder/src/Indexer/Adapter.php
@@ -292,8 +292,8 @@ public function onFinderGarbageCollection()
         $db      = $this->db;
         $type_id = $this->getTypeId();
 
-        $query    = $db->getQuery(true);
-        $subquery = $db->getQuery(true);
+        $query    = $db->createQuery();
+        $subquery = $db->createQuery();
         $subquery->select('CONCAT(' . $db->quote($this->getUrl('', $this->extension, $this->layout)) . ', id)')
             ->from($db->quoteName($this->table));
         $query->select($db->quoteName('l.link_id'))
@@ -336,7 +336,7 @@ protected function change($id, $property, $value)
         $item = $this->db->quote($this->getUrl($id, $this->extension, $this->layout));
 
         // Update the content items.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->update($this->db->quoteName('#__finder_links'))
             ->set($this->db->quoteName($property) . ' = ' . (int) $value)
             ->where($this->db->quoteName('url') . ' = ' . $item);
@@ -399,7 +399,7 @@ protected function remove($id, $removeTaxonomies = true)
         $url = $this->db->quote($this->getUrl($id, $this->extension, $this->layout));
 
         // Get the link ids for the content items.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('link_id'))
             ->from($this->db->quoteName('#__finder_links'))
             ->where($this->db->quoteName('url') . ' = ' . $url);
@@ -506,7 +506,7 @@ protected function categoryStateChange($pks, $value)
      */
     protected function checkCategoryAccess($row)
     {
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('access'))
             ->from($this->db->quoteName('#__categories'))
             ->where($this->db->quoteName('id') . ' = ' . (int) $row->id);
@@ -527,7 +527,7 @@ protected function checkCategoryAccess($row)
      */
     protected function checkItemAccess($row)
     {
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('access'))
             ->from($this->db->quoteName($this->table))
             ->where($this->db->quoteName('id') . ' = ' . (int) $row->id);
@@ -649,7 +649,7 @@ protected function getItems($offset, $limit, $query = null)
     protected function getListQuery($query = null)
     {
         // Check if we can use the supplied SQL query.
-        return $query instanceof QueryInterface ? $query : $this->db->getQuery(true);
+        return $query instanceof QueryInterface ? $query : $this->db->createQuery();
     }
 
     /**
@@ -664,7 +664,7 @@ protected function getListQuery($query = null)
     protected function getPluginType($id)
     {
         // Prepare the query
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('element'))
             ->from($this->db->quoteName('#__extensions'))
             ->where($this->db->quoteName('folder') . ' = ' . $this->db->quote('finder'))
@@ -684,7 +684,7 @@ protected function getPluginType($id)
      */
     protected function getStateQuery()
     {
-        $query = $this->db->getQuery(true);
+        $query = $this->db->createQuery();
 
         // Item ID
         $query->select('a.id');
@@ -712,7 +712,7 @@ protected function getStateQuery()
     protected function getUpdateQueryByTime($time)
     {
         // Build an SQL query based on the modified time.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->where('a.modified >= ' . $this->db->quote($time));
 
         return $query;
@@ -730,7 +730,7 @@ protected function getUpdateQueryByTime($time)
     protected function getUpdateQueryByIds($ids)
     {
         // Build an SQL query based on the item ids.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->where('a.id IN(' . implode(',', $ids) . ')');
 
         return $query;
@@ -747,7 +747,7 @@ protected function getUpdateQueryByIds($ids)
     protected function getTypeId()
     {
         // Get the type id from the database.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('id'))
             ->from($this->db->quoteName('#__finder_types'))
             ->where($this->db->quoteName('title') . ' = ' . $this->db->quote($this->type_title));
@@ -793,7 +793,7 @@ protected function getItemMenuTitle($url)
         $groups = implode(',', $user->getAuthorisedViewLevels());
 
         // Build a query to get the menu params.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('params'))
             ->from($this->db->quoteName('#__menu'))
             ->where($this->db->quoteName('link') . ' = ' . $this->db->quote($url))
diff --git a/administrator/components/com_finder/src/Indexer/DebugAdapter.php b/administrator/components/com_finder/src/Indexer/DebugAdapter.php
index 11f5ea49d0f7d..c28b64c2da835 100644
--- a/administrator/components/com_finder/src/Indexer/DebugAdapter.php
+++ b/administrator/components/com_finder/src/Indexer/DebugAdapter.php
@@ -284,8 +284,8 @@ public function onFinderGarbageCollection()
         $db      = $this->db;
         $type_id = $this->getTypeId();
 
-        $query    = $db->getQuery(true);
-        $subquery = $db->getQuery(true);
+        $query    = $db->createQuery();
+        $subquery = $db->createQuery();
         $subquery->select('CONCAT(' . $db->quote($this->getUrl('', $this->extension, $this->layout)) . ', id)')
             ->from($db->quoteName($this->table));
         $query->select($db->quoteName('l.link_id'))
@@ -328,7 +328,7 @@ protected function change($id, $property, $value)
         $item = $this->db->quote($this->getUrl($id, $this->extension, $this->layout));
 
         // Update the content items.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->update($this->db->quoteName('#__finder_links'))
             ->set($this->db->quoteName($property) . ' = ' . (int) $value)
             ->where($this->db->quoteName('url') . ' = ' . $item);
@@ -394,7 +394,7 @@ protected function remove($id, $removeTaxonomies = true)
         $url = $this->db->quote($this->getUrl($id, $this->extension, $this->layout));
 
         // Get the link ids for the content items.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('link_id'))
             ->from($this->db->quoteName('#__finder_links'))
             ->where($this->db->quoteName('url') . ' = ' . $url);
@@ -501,7 +501,7 @@ protected function categoryStateChange($pks, $value)
      */
     protected function checkCategoryAccess($row)
     {
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('access'))
             ->from($this->db->quoteName('#__categories'))
             ->where($this->db->quoteName('id') . ' = ' . (int) $row->id);
@@ -522,7 +522,7 @@ protected function checkCategoryAccess($row)
      */
     protected function checkItemAccess($row)
     {
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('access'))
             ->from($this->db->quoteName($this->table))
             ->where($this->db->quoteName('id') . ' = ' . (int) $row->id);
@@ -644,7 +644,7 @@ protected function getItems($offset, $limit, $query = null)
     protected function getListQuery($query = null)
     {
         // Check if we can use the supplied SQL query.
-        return $query instanceof QueryInterface ? $query : $this->db->getQuery(true);
+        return $query instanceof QueryInterface ? $query : $this->db->createQuery();
     }
 
     /**
@@ -659,7 +659,7 @@ protected function getListQuery($query = null)
     protected function getPluginType($id)
     {
         // Prepare the query
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('element'))
             ->from($this->db->quoteName('#__extensions'))
             ->where($this->db->quoteName('extension_id') . ' = ' . (int) $id);
@@ -678,7 +678,7 @@ protected function getPluginType($id)
      */
     protected function getStateQuery()
     {
-        $query = $this->db->getQuery(true);
+        $query = $this->db->createQuery();
 
         // Item ID
         $query->select('a.id');
@@ -706,7 +706,7 @@ protected function getStateQuery()
     protected function getUpdateQueryByTime($time)
     {
         // Build an SQL query based on the modified time.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->where('a.modified >= ' . $this->db->quote($time));
 
         return $query;
@@ -724,7 +724,7 @@ protected function getUpdateQueryByTime($time)
     protected function getUpdateQueryByIds($ids)
     {
         // Build an SQL query based on the item ids.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->where('a.id IN(' . implode(',', $ids) . ')');
 
         return $query;
@@ -741,7 +741,7 @@ protected function getUpdateQueryByIds($ids)
     protected function getTypeId()
     {
         // Get the type id from the database.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('id'))
             ->from($this->db->quoteName('#__finder_types'))
             ->where($this->db->quoteName('title') . ' = ' . $this->db->quote($this->type_title));
@@ -787,7 +787,7 @@ protected function getItemMenuTitle($url)
         $groups = implode(',', $user->getAuthorisedViewLevels());
 
         // Build a query to get the menu params.
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('params'))
             ->from($this->db->quoteName('#__menu'))
             ->where($this->db->quoteName('link') . ' = ' . $this->db->quote($url))
diff --git a/administrator/components/com_finder/src/Indexer/Helper.php b/administrator/components/com_finder/src/Indexer/Helper.php
index 936a8b0d15928..b0795e1cb0e7a 100644
--- a/administrator/components/com_finder/src/Indexer/Helper.php
+++ b/administrator/components/com_finder/src/Indexer/Helper.php
@@ -228,7 +228,7 @@ public static function addContentType($title, $mime = null)
         static $types;
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Check if the types are loaded.
         if (empty($types)) {
@@ -321,7 +321,7 @@ public static function getCommonWords($lang)
         $db = Factory::getDbo();
 
         // Create the query to load all the common terms for the language.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('term'))
             ->from($db->quoteName('#__finder_terms_common'))
             ->where($db->quoteName('language') . ' = ' . $db->quote($lang));
diff --git a/administrator/components/com_finder/src/Indexer/Indexer.php b/administrator/components/com_finder/src/Indexer/Indexer.php
index 236d8844e54fa..3b73bb0715dd3 100644
--- a/administrator/components/com_finder/src/Indexer/Indexer.php
+++ b/administrator/components/com_finder/src/Indexer/Indexer.php
@@ -128,7 +128,7 @@ public function __construct(?DatabaseInterface $db = null)
         $this->db = $db;
 
         // Set up query template for addTokensToDb
-        $this->addTokensToDbQueryTemplate = $db->getQuery(true)->insert($db->quoteName('#__finder_tokens'))
+        $this->addTokensToDbQueryTemplate = $db->createQuery()->insert($db->quoteName('#__finder_tokens'))
             ->columns(
                 [
                     $db->quoteName('term'),
@@ -284,7 +284,7 @@ public function index($item, $format = 'html')
         $serverType = strtolower($db->getServerType());
 
         // Check if the item is in the database.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('link_id') . ', ' . $db->quoteName('md5sum'))
             ->from($db->quoteName('#__finder_links'))
             ->where($db->quoteName('url') . ' = ' . $db->quote($item->url));
@@ -540,7 +540,7 @@ public function index($item, $format = 'html')
          * so we need to go back and update the aggregate table with all the
          * new term ids.
          */
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__finder_tokens_aggregate', 'ta'))
             ->innerJoin($db->quoteName('#__finder_terms', 't'), 't.term = ta.term AND t.language = ta.language')
             ->where('ta.term_id = 0');
@@ -650,7 +650,7 @@ public function index($item, $format = 'html')
     public function remove($linkId, $removeTaxonomies = true)
     {
         $db     = $this->db;
-        $query  = $db->getQuery(true);
+        $query  = $db->createQuery();
         $linkId = (int) $linkId;
 
         // Update the link counts for the terms.
@@ -712,25 +712,25 @@ public function optimize()
         $serverType = strtolower($db->getServerType());
 
         // Delete all broken links. (Links missing the object)
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete('#__finder_links')
             ->where($db->quoteName('object') . ' = ' . $db->quote(''));
         $db->setQuery($query);
         $db->execute();
 
         // Delete all orphaned mappings of terms to links
-        $query2 = $db->getQuery(true)
+        $query2 = $db->createQuery()
             ->select($db->quoteName('link_id'))
             ->from($db->quoteName('#__finder_links'));
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__finder_links_terms'))
             ->where($db->quoteName('link_id') . ' NOT IN (' . $query2 . ')');
         $db->setQuery($query);
         $db->execute();
 
         // Update count of links in terms table
-        $query  = $db->getQuery(true);
-        $query2 = $db->getQuery(true);
+        $query  = $db->createQuery();
+        $query2 = $db->createQuery();
         $query2->select('COUNT(lt.link_id)')
             ->from($db->quoteName('#__finder_links_terms', 'lt'))
             ->where($db->quoteName('lt.term_id') . ' = ' . $db->quoteName('t.term_id'));
@@ -740,7 +740,7 @@ public function optimize()
         $db->execute();
 
         // Delete all orphaned terms.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->delete($db->quoteName('#__finder_terms'))
             ->where($db->quoteName('links') . ' <= 0');
         $db->setQuery($query);
@@ -748,10 +748,10 @@ public function optimize()
 
 
         // Delete all orphaned terms
-        $query2 = $db->getQuery(true)
+        $query2 = $db->createQuery()
             ->select($db->quoteName('term_id'))
             ->from($db->quoteName('#__finder_links_terms'));
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__finder_terms'))
             ->where($db->quoteName('term_id') . ' NOT IN (' . $query2 . ')');
         $db->setQuery($query);
diff --git a/administrator/components/com_finder/src/Indexer/Query.php b/administrator/components/com_finder/src/Indexer/Query.php
index 76c4503e4af4d..69f64ec84bfe6 100644
--- a/administrator/components/com_finder/src/Indexer/Query.php
+++ b/administrator/components/com_finder/src/Indexer/Query.php
@@ -505,7 +505,7 @@ protected function processStaticTaxonomy($filterId)
         $groups = implode(',', Factory::getUser()->getAuthorisedViewLevels());
 
         // Load the predefined filter.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('f.data, f.params')
             ->from($db->quoteName('#__finder_filters') . ' AS f')
             ->where('f.filter_id = ' . (int) $filterId);
@@ -609,7 +609,7 @@ protected function processDynamicTaxonomy($filters)
         // Get the database object.
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         /*
          * Create the query to get filters from the database. We do this for
@@ -1242,7 +1242,7 @@ protected function getTokenData($token)
         $db = $this->getDatabase();
 
         // Create a database query to build match the token.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('t.term, t.term_id')
             ->from('#__finder_terms AS t');
 
diff --git a/administrator/components/com_finder/src/Indexer/Taxonomy.php b/administrator/components/com_finder/src/Indexer/Taxonomy.php
index 28414eeef34bc..5091a21b92d4a 100644
--- a/administrator/components/com_finder/src/Indexer/Taxonomy.php
+++ b/administrator/components/com_finder/src/Indexer/Taxonomy.php
@@ -174,7 +174,7 @@ protected static function storeNode($node, $parentId)
 
         // Check to see if the node is in the table.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__finder_taxonomy'))
             ->where($db->quoteName('parent_id') . ' = ' . $db->quote($parentId))
@@ -277,7 +277,7 @@ public static function addMap($linkId, $nodeId)
         // Insert the map.
         $db = Factory::getDbo();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('link_id'))
             ->from($db->quoteName('#__finder_taxonomy_map'))
             ->where($db->quoteName('link_id') . ' = ' . (int) $linkId)
@@ -315,7 +315,7 @@ public static function getBranchTitles()
             $groups = implode(',', Factory::getUser()->getAuthorisedViewLevels());
 
             // Create a query to get the taxonomy branch titles.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('title'))
                 ->from($db->quoteName('#__finder_taxonomy'))
                 ->where($db->quoteName('parent_id') . ' = 1')
@@ -350,7 +350,7 @@ public static function getNodeByTitle($branch, $title)
         $groups = implode(',', Factory::getUser()->getAuthorisedViewLevels());
 
         // Create a query to get the node.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('t1.*')
             ->from($db->quoteName('#__finder_taxonomy') . ' AS t1')
             ->join('INNER', $db->quoteName('#__finder_taxonomy') . ' AS t2 ON t2.id = t1.parent_id')
@@ -382,7 +382,7 @@ public static function removeMaps($linkId)
     {
         // Delete the maps.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__finder_taxonomy_map'))
             ->where($db->quoteName('link_id') . ' = ' . (int) $linkId);
         $db->setQuery($query);
@@ -403,10 +403,10 @@ public static function removeOrphanMaps()
     {
         // Delete all orphaned maps
         $db     = Factory::getDbo();
-        $query2 = $db->getQuery(true)
+        $query2 = $db->createQuery()
             ->select($db->quoteName('link_id'))
             ->from($db->quoteName('#__finder_links'));
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__finder_taxonomy_map'))
             ->where($db->quoteName('link_id') . ' NOT IN (' . $query2 . ')');
         $db->setQuery($query);
@@ -430,8 +430,8 @@ public static function removeOrphanNodes()
         $affectedRows = 0;
         $db           = Factory::getDbo();
         $nodeTable    = new MapTable($db);
-        $query        = $db->getQuery(true);
-        $query2       = $db->getQuery(true);
+        $query        = $db->createQuery();
+        $query2       = $db->createQuery();
 
         $query->select($db->quoteName('t.id'))
             ->from($db->quoteName('#__finder_taxonomy', 't'))
@@ -473,7 +473,7 @@ public static function getTaxonomy($id = 0)
     {
         if (!\count(self::$taxonomies)) {
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             $query->select(['id','parent_id','lft','rgt','level','path','title','alias','state','access','language'])
                 ->from($db->quoteName('#__finder_taxonomy'))
diff --git a/administrator/components/com_finder/src/Model/FilterModel.php b/administrator/components/com_finder/src/Model/FilterModel.php
index da0644231c5d2..7b50fc0316f8f 100644
--- a/administrator/components/com_finder/src/Model/FilterModel.php
+++ b/administrator/components/com_finder/src/Model/FilterModel.php
@@ -143,7 +143,7 @@ protected function loadFormData()
     public function getTotal()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('MAX(link_id)')
             ->from('#__finder_links');
 
diff --git a/administrator/components/com_finder/src/Model/FiltersModel.php b/administrator/components/com_finder/src/Model/FiltersModel.php
index ec05f535ba67e..23d98fbf8a932 100644
--- a/administrator/components/com_finder/src/Model/FiltersModel.php
+++ b/administrator/components/com_finder/src/Model/FiltersModel.php
@@ -61,7 +61,7 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
     protected function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select all fields from the table.
         $query->select('a.*')
diff --git a/administrator/components/com_finder/src/Model/IndexModel.php b/administrator/components/com_finder/src/Model/IndexModel.php
index b8cb0f99e005c..a292e08ba1c8d 100644
--- a/administrator/components/com_finder/src/Model/IndexModel.php
+++ b/administrator/components/com_finder/src/Model/IndexModel.php
@@ -182,7 +182,7 @@ public function delete(&$pks)
     protected function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('l.*')
             ->select($db->quoteName('t.title', 't_title'))
             ->from($db->quoteName('#__finder_links', 'l'))
@@ -259,7 +259,7 @@ protected function getListQuery()
     public function getPluginState()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('name, enabled')
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
@@ -304,7 +304,7 @@ protected function getStoreId($id = '')
     public function getTotalIndexed()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(link_id)')
             ->from($db->quoteName('#__finder_links'));
         $db->setQuery($query);
diff --git a/administrator/components/com_finder/src/Model/ItemModel.php b/administrator/components/com_finder/src/Model/ItemModel.php
index fdb9b268bc054..cdeaf3b1a44be 100644
--- a/administrator/components/com_finder/src/Model/ItemModel.php
+++ b/administrator/components/com_finder/src/Model/ItemModel.php
@@ -46,7 +46,7 @@ public function getItem()
     {
         $link_id = (int) $this->getState('item.link_id');
         $db      = $this->getDatabase();
-        $query   = $db->getQuery(true)
+        $query   = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__finder_links', 'l'))
             ->where($db->quoteName('l.link_id') . ' = :link_id')
@@ -68,7 +68,7 @@ public function getTerms()
     {
         $link_id = (int) $this->getState('item.link_id');
         $db      = $this->getDatabase();
-        $query   = $db->getQuery(true)
+        $query   = $db->createQuery()
             ->select('t.*, l.*')
             ->from($db->quoteName('#__finder_links_terms', 'l'))
             ->leftJoin($db->quoteName('#__finder_terms', 't') . ' ON ' . $db->quoteName('t.term_id') . ' = ' . $db->quoteName('l.term_id'))
@@ -92,7 +92,7 @@ public function getTaxonomies()
     {
         $link_id = (int) $this->getState('item.link_id');
         $db      = $this->getDatabase();
-        $query   = $db->getQuery(true)
+        $query   = $db->createQuery()
             ->select('t.*, m.*')
             ->from($db->quoteName('#__finder_taxonomy_map', 'm'))
             ->leftJoin($db->quoteName('#__finder_taxonomy', 't') . ' ON ' . $db->quoteName('t.id') . ' = ' . $db->quoteName('m.node_id'))
diff --git a/administrator/components/com_finder/src/Model/MapsModel.php b/administrator/components/com_finder/src/Model/MapsModel.php
index 98231c4d188bf..08032b8fcd1aa 100644
--- a/administrator/components/com_finder/src/Model/MapsModel.php
+++ b/administrator/components/com_finder/src/Model/MapsModel.php
@@ -165,7 +165,7 @@ protected function getListQuery()
         $db = $this->getDatabase();
 
         // Select all fields from the table.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('a.id, a.parent_id, a.lft, a.rgt, a.level, a.path, a.title, a.alias, a.state, a.access, a.language')
             ->from($db->quoteName('#__finder_taxonomy', 'a'))
             ->where('a.parent_id != 0');
@@ -175,7 +175,7 @@ protected function getListQuery()
             ->leftJoin($db->quoteName('#__finder_taxonomy', 'b') . ' ON b.level = 1 AND b.lft <= a.lft AND a.rgt <= b.rgt');
 
         // Join to get the map links.
-        $stateQuery = $db->getQuery(true)
+        $stateQuery = $db->createQuery()
             ->select('m.node_id')
             ->select('COUNT(NULLIF(l.published, 0)) AS count_published')
             ->select('COUNT(NULLIF(l.published, 1)) AS count_unpublished')
@@ -363,7 +363,7 @@ public function publish(&$pks, $value = 1)
     public function purge()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__finder_taxonomy'))
             ->where($db->quoteName('parent_id') . ' > 1');
         $db->setQuery($query);
diff --git a/administrator/components/com_finder/src/Model/SearchesModel.php b/administrator/components/com_finder/src/Model/SearchesModel.php
index 5cdff1385b1c2..6ae77a2022e39 100644
--- a/administrator/components/com_finder/src/Model/SearchesModel.php
+++ b/administrator/components/com_finder/src/Model/SearchesModel.php
@@ -105,7 +105,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(
diff --git a/administrator/components/com_finder/src/Model/StatisticsModel.php b/administrator/components/com_finder/src/Model/StatisticsModel.php
index 04847c14d4e9b..2d066e0cca76c 100644
--- a/administrator/components/com_finder/src/Model/StatisticsModel.php
+++ b/administrator/components/com_finder/src/Model/StatisticsModel.php
@@ -36,7 +36,7 @@ public function getData()
     {
         // Initialise
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $data  = new \stdClass();
 
         $query->select('COUNT(term_id)')
diff --git a/administrator/components/com_finder/src/Service/HTML/Filter.php b/administrator/components/com_finder/src/Service/HTML/Filter.php
index 0d238cca30ad3..cf26d73e15dcb 100644
--- a/administrator/components/com_finder/src/Service/HTML/Filter.php
+++ b/administrator/components/com_finder/src/Service/HTML/Filter.php
@@ -47,7 +47,7 @@ class Filter
     public function slider($options = [])
     {
         $db     = $this->getDatabase();
-        $query  = $db->getQuery(true);
+        $query  = $db->createQuery();
         $user   = Factory::getUser();
         $groups = implode(',', $user->getAuthorisedViewLevels());
         $html   = '';
@@ -225,7 +225,7 @@ public function select($idxQuery, $options)
             $branches = $cache->get($cacheId);
         } else {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // Load the predefined filter if specified.
             if (!empty($idxQuery->filter)) {
diff --git a/administrator/components/com_finder/src/Service/HTML/Finder.php b/administrator/components/com_finder/src/Service/HTML/Finder.php
index fa62a601879e0..fad16340e01f7 100644
--- a/administrator/components/com_finder/src/Service/HTML/Finder.php
+++ b/administrator/components/com_finder/src/Service/HTML/Finder.php
@@ -41,7 +41,7 @@ public function typeslist()
     {
         // Load the finder types.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT t.title AS text, t.id AS value')
             ->from($db->quoteName('#__finder_types') . ' AS t')
             ->join('LEFT', $db->quoteName('#__finder_links') . ' AS l ON l.type_id = t.id')
@@ -78,7 +78,7 @@ public function mapslist()
     {
         // Load the finder types.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('title', 'text'))
             ->select($db->quoteName('id', 'value'))
             ->from($db->quoteName('#__finder_taxonomy'))
diff --git a/administrator/components/com_guidedtours/src/Model/StepModel.php b/administrator/components/com_guidedtours/src/Model/StepModel.php
index e78e4a221ef0b..6a45bbe30b45b 100644
--- a/administrator/components/com_guidedtours/src/Model/StepModel.php
+++ b/administrator/components/com_guidedtours/src/Model/StepModel.php
@@ -129,7 +129,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(ordering)')
                     ->from($db->quoteName('#__guidedtour_steps'));
                 $db->setQuery($query);
diff --git a/administrator/components/com_guidedtours/src/Model/StepsModel.php b/administrator/components/com_guidedtours/src/Model/StepsModel.php
index d3daaa4685b81..1a6886b56c6f5 100644
--- a/administrator/components/com_guidedtours/src/Model/StepsModel.php
+++ b/administrator/components/com_guidedtours/src/Model/StepsModel.php
@@ -148,7 +148,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(
diff --git a/administrator/components/com_guidedtours/src/Model/TourModel.php b/administrator/components/com_guidedtours/src/Model/TourModel.php
index 88ac89b70f6a6..c6b652d6da6aa 100644
--- a/administrator/components/com_guidedtours/src/Model/TourModel.php
+++ b/administrator/components/com_guidedtours/src/Model/TourModel.php
@@ -104,7 +104,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(ordering)')
                     ->from($db->quoteName('#__guidedtours'));
                 $db->setQuery($query);
@@ -283,7 +283,7 @@ public function delete(&$pks)
 
                     // Delete of the tour has been successful, now delete the steps
                     $db    = $this->getDatabase();
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->delete($db->quoteName('#__guidedtour_steps'))
                         ->where($db->quoteName('tour_id') . '=' . $tourId);
                     $db->setQuery($query);
@@ -355,7 +355,7 @@ public function duplicate(&$pks)
 
                 $pk = (int) $pk;
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select(
                         $db->quoteName(
                             [
@@ -385,7 +385,7 @@ public function duplicate(&$pks)
                 $rows = $db->loadObjectList();
 
                 if ($rows) {
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->insert($db->quoteName('#__guidedtour_steps'))
                         ->columns(
                             [
@@ -494,7 +494,7 @@ protected function setStepsLanguage(int $id, string $language = '*'): bool
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__guidedtour_steps'))
             ->set($db->quoteName('language') . ' = :language')
             ->where($db->quoteName('tour_id') . ' = :tourId')
@@ -517,7 +517,7 @@ public function setAutostart($id, $autostart)
     {
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__guidedtours'))
             ->set($db->quoteName('autostart') . ' = :autostart')
             ->where($db->quoteName('id') . ' = :tourId')
@@ -541,7 +541,7 @@ public function isAutostart($pk): bool
     {
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('autostart'))
             ->from($db->quoteName('#__guidedtours'))
             ->where($db->quoteName('published') . ' = 1');
@@ -586,7 +586,7 @@ public function saveTourUserState($id, $state = ''): bool
         $profileKey = 'guidedtour.id.' . $id;
 
         // Check if the profile key already exists.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('profile_value'))
             ->from($db->quoteName('#__user_profiles'))
             ->where($db->quoteName('user_id') . ' = :user_id')
diff --git a/administrator/components/com_guidedtours/src/Model/ToursModel.php b/administrator/components/com_guidedtours/src/Model/ToursModel.php
index 3179b7d79f91c..6f0358dcb0735 100644
--- a/administrator/components/com_guidedtours/src/Model/ToursModel.php
+++ b/administrator/components/com_guidedtours/src/Model/ToursModel.php
@@ -113,7 +113,7 @@ public 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(
@@ -123,7 +123,7 @@ public function getListQuery()
             )
         );
 
-        $subQuery = $db->getQuery(true)
+        $subQuery = $db->createQuery()
             ->select('COUNT(' . $db->quoteName('s.id') . ')')
             ->from($db->quoteName('#__guidedtour_steps', 's'))
             ->where(
diff --git a/administrator/components/com_installer/src/Helper/InstallerHelper.php b/administrator/components/com_installer/src/Helper/InstallerHelper.php
index 2054f5b3e2231..51d178bec9455 100644
--- a/administrator/components/com_installer/src/Helper/InstallerHelper.php
+++ b/administrator/components/com_installer/src/Helper/InstallerHelper.php
@@ -37,7 +37,7 @@ class InstallerHelper
     public static function getExtensionTypes()
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT ' . $db->quoteName('type'))
             ->from($db->quoteName('#__extensions'));
         $db->setQuery($query);
@@ -63,7 +63,7 @@ public static function getExtensionGroups()
     {
         $nofolder = '';
         $db       = Factory::getDbo();
-        $query    = $db->getQuery(true)
+        $query    = $db->createQuery()
             ->select('DISTINCT ' . $db->quoteName('folder'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('folder') . ' != :folder')
@@ -130,7 +130,7 @@ public static function getPackageOptions(): array
 
         /** @var DatabaseInterface $db The application's database driver object */
         $db         = Factory::getContainer()->get(DatabaseInterface::class);
-        $query      = $db->getQuery(true)
+        $query      = $db->createQuery()
             ->select(
                 $db->quoteName(
                     [
@@ -309,7 +309,7 @@ public static function getExtensionDownloadKey(
         }
 
         // Try to retrieve the extension information
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('type') . ' = :type')
@@ -426,7 +426,7 @@ protected static function getUpdateSitesInformation(bool $onlyEnabled): array
             return [];
         }
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 $db->quoteName(
                     [
diff --git a/administrator/components/com_installer/src/Model/DatabaseModel.php b/administrator/components/com_installer/src/Model/DatabaseModel.php
index 03b8ad4487f8d..135cc28befac9 100644
--- a/administrator/components/com_installer/src/Model/DatabaseModel.php
+++ b/administrator/components/com_installer/src/Model/DatabaseModel.php
@@ -322,7 +322,7 @@ public function getItems()
     protected function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 $db->quoteName(
                     [
@@ -427,7 +427,7 @@ public function getSchemaVersion($extensionId)
     {
         $db          = $this->getDatabase();
         $extensionId = (int) $extensionId;
-        $query       = $db->getQuery(true)
+        $query       = $db->createQuery()
             ->select($db->quoteName('version_id'))
             ->from($db->quoteName('#__schemas'))
             ->where($db->quoteName('extension_id') . ' = :extensionid')
@@ -462,7 +462,7 @@ public function fixSchemaVersion($changeSet, $extensionId)
         // Delete old row.
         $extensionId = (int) $extensionId;
         $db          = $this->getDatabase();
-        $query       = $db->getQuery(true)
+        $query       = $db->createQuery()
             ->delete($db->quoteName('#__schemas'))
             ->where($db->quoteName('extension_id') . ' = :extensionid')
             ->bind(':extensionid', $extensionId, ParameterType::INTEGER);
diff --git a/administrator/components/com_installer/src/Model/DiscoverModel.php b/administrator/components/com_installer/src/Model/DiscoverModel.php
index 52e24afc3d801..1536c7f4d2f23 100644
--- a/administrator/components/com_installer/src/Model/DiscoverModel.php
+++ b/administrator/components/com_installer/src/Model/DiscoverModel.php
@@ -90,7 +90,7 @@ protected function populateState($ordering = 'name', $direction = 'asc')
     protected function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('state') . ' = -1');
@@ -150,7 +150,7 @@ public function discover()
 
         // Get all templates, including discovered ones
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['extension_id', 'element', 'folder', 'client_id', 'type']))
             ->from($db->quoteName('#__extensions'));
         $db->setQuery($query);
@@ -253,7 +253,7 @@ public function discover_install()
     public function purge()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__extensions'))
             ->where($db->quoteName('state') . ' = -1');
         $db->setQuery($query);
@@ -297,7 +297,7 @@ protected function getEmptyStateQuery()
     public function checkExtensions()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('state') . ' = -1');
diff --git a/administrator/components/com_installer/src/Model/LanguagesModel.php b/administrator/components/com_installer/src/Model/LanguagesModel.php
index 874f130765595..2c39a64831aba 100644
--- a/administrator/components/com_installer/src/Model/LanguagesModel.php
+++ b/administrator/components/com_installer/src/Model/LanguagesModel.php
@@ -66,7 +66,7 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
     private function getUpdateSite()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('us.location'))
             ->from($db->quoteName('#__extensions', 'e'))
             ->where($db->quoteName('e.type') . ' = ' . $db->quote('package'))
diff --git a/administrator/components/com_installer/src/Model/ManageModel.php b/administrator/components/com_installer/src/Model/ManageModel.php
index 2756887df1b77..1a4ef51a165a7 100644
--- a/administrator/components/com_installer/src/Model/ManageModel.php
+++ b/administrator/components/com_installer/src/Model/ManageModel.php
@@ -306,7 +306,7 @@ public function remove($eid = [])
     protected function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->select('2*protected+(1-protected)*enabled AS status')
             ->from('#__extensions')
@@ -395,7 +395,7 @@ public function loadChangelog($eid, $source)
         // Get the changelog URL
         $eid   = (int) $eid;
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 $db->quoteName(
                     [
diff --git a/administrator/components/com_installer/src/Model/UpdateModel.php b/administrator/components/com_installer/src/Model/UpdateModel.php
index df23cd1fcc6d2..017493bc597e9 100644
--- a/administrator/components/com_installer/src/Model/UpdateModel.php
+++ b/administrator/components/com_installer/src/Model/UpdateModel.php
@@ -96,7 +96,7 @@ protected function getListQuery()
         $db = $this->getDatabase();
 
         // Grab updates ignoring new installs
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('u.*')
             ->select($db->quoteName('e.manifest_cache'))
             ->from($db->quoteName('#__updates', 'u'))
@@ -244,7 +244,7 @@ public function getDisabledUpdateSites()
     {
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__update_sites'))
             ->where($db->quoteName('enabled') . ' = 0');
@@ -292,7 +292,7 @@ public function purge()
         }
 
         // Reset the last update check timestamp
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__update_sites'))
             ->set($db->quoteName('last_check_timestamp') . ' = ' . $db->quote(0));
         $db->setQuery($query);
@@ -333,7 +333,7 @@ public function update($uids, $minimumStability = Updater::STABILITY_STABLE)
 
             $app   = Factory::getApplication();
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('type')
                 ->from('#__update_sites')
                 ->where($db->quoteName('update_site_id') . ' = :id')
diff --git a/administrator/components/com_installer/src/Model/UpdatesiteModel.php b/administrator/components/com_installer/src/Model/UpdatesiteModel.php
index 4b6d024ff9ea8..8a0ac7b104f14 100644
--- a/administrator/components/com_installer/src/Model/UpdatesiteModel.php
+++ b/administrator/components/com_installer/src/Model/UpdatesiteModel.php
@@ -87,7 +87,7 @@ public function getItem($pk = null)
 
         $db           = $this->getDatabase();
         $updateSiteId = (int) $item->update_site_id ?? 0;
-        $query        = $db->getQuery(true)
+        $query        = $db->createQuery()
             ->select(
                 $db->quoteName(
                     [
@@ -153,7 +153,7 @@ public function save($data): bool
 
         // Delete update records forcing Joomla to fetch them again, applying the new extra_query.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__updates'))
             ->where($db->quoteName('update_site_id') . ' = :updateSiteId');
         $query->bind(':updateSiteId', $data['update_site_id'], ParameterType::INTEGER);
diff --git a/administrator/components/com_installer/src/Model/UpdatesitesModel.php b/administrator/components/com_installer/src/Model/UpdatesitesModel.php
index b2a581fd31f3f..74101de0904b4 100644
--- a/administrator/components/com_installer/src/Model/UpdatesitesModel.php
+++ b/administrator/components/com_installer/src/Model/UpdatesitesModel.php
@@ -135,7 +135,7 @@ public function delete($ids = [])
         $count = 0;
 
         // Gets the update site names.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['update_site_id', 'name']))
             ->from($db->quoteName('#__update_sites'))
             ->whereIn($db->quoteName('update_site_id'), $ids);
@@ -156,21 +156,21 @@ public function delete($ids = [])
             // Delete the update site from all tables.
             try {
                 $id    = (int) $id;
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->delete($db->quoteName('#__update_sites'))
                     ->where($db->quoteName('update_site_id') . ' = :id')
                     ->bind(':id', $id, ParameterType::INTEGER);
                 $db->setQuery($query);
                 $db->execute();
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->delete($db->quoteName('#__update_sites_extensions'))
                     ->where($db->quoteName('update_site_id') . ' = :id')
                     ->bind(':id', $id, ParameterType::INTEGER);
                 $db->setQuery($query);
                 $db->execute();
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->delete($db->quoteName('#__updates'))
                     ->where($db->quoteName('update_site_id') . ' = :id')
                     ->bind(':id', $id, ParameterType::INTEGER);
@@ -209,7 +209,7 @@ protected function getJoomlaUpdateSitesIds($column = 0)
         $db = $this->getDatabase();
 
         // Fetch the Joomla core update sites ids and their extension ids. We search for all except the core joomla extension with update sites.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['use.update_site_id', 'e.extension_id']))
             ->from($db->quoteName('#__update_sites_extensions', 'use'))
             ->join(
@@ -255,7 +255,7 @@ public function rebuild(): void
 
         // Check if Joomla Extension plugin is enabled.
         if (!PluginHelper::isEnabled('extension', 'joomla')) {
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('extension_id'))
                 ->from($db->quoteName('#__extensions'))
                 ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
@@ -304,26 +304,26 @@ public function rebuild(): void
         $joomlaUpdateSitesIds = $this->getJoomlaUpdateSitesIds(0);
 
         // First backup any custom extra_query for the sites
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('TRIM(' . $db->quoteName('location') . ') AS ' . $db->quoteName('location') . ', ' . $db->quoteName('extra_query'))
             ->from($db->quoteName('#__update_sites'));
         $db->setQuery($query);
         $backupExtraQuerys = $db->loadAssocList('location');
 
         // Delete from all tables (except joomla core update sites).
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__update_sites'))
             ->whereNotIn($db->quoteName('update_site_id'), $joomlaUpdateSitesIds);
         $db->setQuery($query);
         $db->execute();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__update_sites_extensions'))
             ->whereNotIn($db->quoteName('update_site_id'), $joomlaUpdateSitesIds);
         $db->setQuery($query);
         $db->execute();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__updates'))
             ->whereNotIn($db->quoteName('update_site_id'), $joomlaUpdateSitesIds);
         $db->setQuery($query);
@@ -365,7 +365,7 @@ public function rebuild(): void
                         $pkgName = (string) $manifest->packagename;
                         $type    = (string) $manifest['type'];
 
-                        $query = $db->getQuery(true)
+                        $query = $db->createQuery()
                             ->select($db->quoteName('extension_id'))
                             ->from($db->quoteName('#__extensions'))
                             ->where(
@@ -489,7 +489,7 @@ protected function getStoreId($id = '')
     protected function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 $db->quoteName(
                     [
diff --git a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
index ef8c9edcbeed7..cfe61aa29642b 100644
--- a/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
+++ b/administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
@@ -129,7 +129,7 @@ public function applyUpdateSite(?string $updateSource = null, ?string $updateURL
 
         $id    = ExtensionHelper::getExtensionRecord('joomla', 'file')->extension_id;
         $db    = version_compare(JVERSION, '4.2.0', 'lt') ? $this->getDbo() : $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('us') . '.*')
             ->from($db->quoteName('#__update_sites_extensions', 'map'))
             ->join(
@@ -203,7 +203,7 @@ public function getCheckForSelfUpdate()
     {
         $db = version_compare(JVERSION, '4.2.0', 'lt') ? $this->getDbo() : $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('element') . ' = ' . $db->quote('com_joomlaupdate'));
@@ -227,7 +227,7 @@ public function getCheckForSelfUpdate()
             $updater->findUpdates($joomlaUpdateComponentId, $cache_timeout, Updater::STABILITY_STABLE);
 
             // Fetch the update information from the database.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('*')
                 ->from($db->quoteName('#__updates'))
                 ->where($db->quoteName('extension_id') . ' = :id')
@@ -273,7 +273,7 @@ public function getUpdateInformation()
         // Fetch the update information from the database.
         $id    = ExtensionHelper::getExtensionRecord('joomla', 'file')->extension_id;
         $db    = version_compare(JVERSION, '4.2.0', 'lt') ? $this->getDbo() : $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__updates'))
             ->where($db->quoteName('extension_id') . ' = :id')
@@ -353,7 +353,7 @@ public function purge()
         $update_site->update_site_id       = 1;
         $db->updateObject('#__update_sites', $update_site, 'update_site_id');
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__updates'))
             ->where($db->quoteName('update_site_id') . ' = 1');
         $db->setQuery($query);
@@ -986,7 +986,7 @@ public function finaliseUpgrade()
          * we can assume that it was (badly) uninstalled.
          * If it isn't, add an entry to extensions.
          */
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('type') . ' = ' . $db->quote('file'))
@@ -1674,7 +1674,7 @@ private function getDatabaseSchemaCheck(): bool
     public function getNonCoreExtensions()
     {
         $db    = version_compare(JVERSION, '4.2.0', 'lt') ? $this->getDbo() : $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select(
             [
@@ -1722,7 +1722,7 @@ public function getNonCoreExtensions()
     public function getNonCorePlugins($folderFilter = ['system', 'user', 'authentication', 'actionlog', 'multifactorauth'])
     {
         $db    = version_compare(JVERSION, '4.2.0', 'lt') ? $this->getDbo() : $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select(
             $db->quoteName('ex.name') . ', ' .
@@ -1821,7 +1821,7 @@ private function getUpdateSitesInfo($extensionID)
     {
         $id    = (int) $extensionID;
         $db    = version_compare(JVERSION, '4.2.0', 'lt') ? $this->getDbo() : $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select(
             [
@@ -2006,7 +2006,7 @@ protected function translateExtensionName(&$item)
     public function isTemplateActive($template)
     {
         $db    = version_compare(JVERSION, '4.2.0', 'lt') ? $this->getDbo() : $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select(
             $db->quoteName(
@@ -2035,7 +2035,7 @@ function ($value) {
         $menu = false;
 
         if (\count($ids)) {
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             $query->select(
                 'COUNT(*)'
@@ -2343,7 +2343,7 @@ public function resetUpdateSource()
 
         $params = $params->toString();
         $db     = $this->getDatabase();
-        $query  = $db->getQuery(true)
+        $query  = $db->createQuery()
             ->update($db->quoteName('#__extensions'))
             ->set($db->quoteName('params') . ' = :params')
             ->where($db->quoteName('type') . ' = ' . $db->quote('component'))
diff --git a/administrator/components/com_languages/src/Helper/MultilangstatusHelper.php b/administrator/components/com_languages/src/Helper/MultilangstatusHelper.php
index 1923d723313de..b06b599f480d7 100644
--- a/administrator/components/com_languages/src/Helper/MultilangstatusHelper.php
+++ b/administrator/components/com_languages/src/Helper/MultilangstatusHelper.php
@@ -36,7 +36,7 @@ public static function getHomes()
     {
         // Check for multiple Home pages.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__menu'))
             ->where(
@@ -61,7 +61,7 @@ public static function getLangswitchers()
     {
         // Check if switcher is published.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__modules'))
             ->where(
@@ -86,7 +86,7 @@ public static function getContentlangs()
     {
         // Check for published Content Languages.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('lang_code'),
@@ -110,7 +110,7 @@ public static function getStatus()
     {
         // Check for combined status.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select all fields from the languages table.
         $query->select(
@@ -156,7 +156,7 @@ public static function getContacts()
         $languages = \count(LanguageHelper::getLanguages());
 
         // Get the number of contact with all as language
-        $alang = $db->getQuery(true)
+        $alang = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__contact_details', 'cd'))
             ->where(
@@ -168,7 +168,7 @@ public static function getContacts()
             );
 
         // Get the number of languages for the contact
-        $slang = $db->getQuery(true)
+        $slang = $db->createQuery()
             ->select('COUNT(DISTINCT ' . $db->quoteName('l.lang_code') . ')')
             ->from($db->quoteName('#__languages', 'l'))
             ->join('LEFT', $db->quoteName('#__contact_details', 'cd'), $db->quoteName('cd.language') . ' = ' . $db->quoteName('l.lang_code'))
@@ -181,7 +181,7 @@ public static function getContacts()
             );
 
         // Get the number of multiple contact/language
-        $mlang = $db->getQuery(true)
+        $mlang = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__languages', 'l'))
             ->join('LEFT', $db->quoteName('#__contact_details', 'cd'), $db->quoteName('cd.language') . ' = ' . $db->quoteName('l.lang_code'))
@@ -196,12 +196,12 @@ public static function getContacts()
             ->having('COUNT(*) > 1');
 
         // Get the contacts
-        $subQuery = $db->getQuery(true)
+        $subQuery = $db->createQuery()
             ->select('1')
             ->from($db->quoteName('#__content', 'c'))
             ->where($db->quoteName('c.created_by') . ' = ' . $db->quoteName('u.id'));
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('u.name'),
@@ -251,7 +251,7 @@ public static function getDefaultHomeModule()
     {
         // Find Default Home menutype.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('menutype'))
             ->from($db->quoteName('#__menu'))
             ->where(
@@ -311,7 +311,7 @@ public static function getModule($moduleName, $instanceTitle = null)
     {
         $db = Factory::getDbo();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('id'),
diff --git a/administrator/components/com_languages/src/Model/LanguagesModel.php b/administrator/components/com_languages/src/Model/LanguagesModel.php
index fe30a7e34a932..8793360280deb 100644
--- a/administrator/components/com_languages/src/Model/LanguagesModel.php
+++ b/administrator/components/com_languages/src/Model/LanguagesModel.php
@@ -113,7 +113,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select all fields from the languages table.
         $query->select(
diff --git a/administrator/components/com_languages/src/Model/StringsModel.php b/administrator/components/com_languages/src/Model/StringsModel.php
index 0ffbd2de50420..06fb9df16ba91 100644
--- a/administrator/components/com_languages/src/Model/StringsModel.php
+++ b/administrator/components/com_languages/src/Model/StringsModel.php
@@ -51,7 +51,7 @@ public function refresh()
         }
 
         // Create the insert query.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->insert($db->quoteName('#__overrider'))
             ->columns(
                 [
@@ -142,7 +142,7 @@ public function search()
             $searchstring = '%' . $filter->clean($searchTerm, 'TRIM') . '%';
 
             // Create the search query.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('constant'),
diff --git a/administrator/components/com_login/src/Model/LoginModel.php b/administrator/components/com_login/src/Model/LoginModel.php
index 3ee47f7e6810e..6b67eff495238 100644
--- a/administrator/components/com_login/src/Model/LoginModel.php
+++ b/administrator/components/com_login/src/Model/LoginModel.php
@@ -139,7 +139,7 @@ protected static function _load($module)
         $loader = function () use ($app, $lang, $module) {
             $db = Factory::getDbo();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     $db->quoteName(
                         [
diff --git a/administrator/components/com_mails/src/Field/MailtemplateLayoutField.php b/administrator/components/com_mails/src/Field/MailtemplateLayoutField.php
index 4d43928dcba33..3a351d257d86c 100644
--- a/administrator/components/com_mails/src/Field/MailtemplateLayoutField.php
+++ b/administrator/components/com_mails/src/Field/MailtemplateLayoutField.php
@@ -50,7 +50,7 @@ protected function getInput()
 
         // Get the database object and a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Build the query.
         $query->select('element, name')
diff --git a/administrator/components/com_mails/src/Model/TemplatesModel.php b/administrator/components/com_mails/src/Model/TemplatesModel.php
index ac28287c4483b..1fddea2c6f5c0 100644
--- a/administrator/components/com_mails/src/Model/TemplatesModel.php
+++ b/administrator/components/com_mails/src/Model/TemplatesModel.php
@@ -91,7 +91,7 @@ public function getItems()
         $id    = '';
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('language'))
             ->from($db->quoteName('#__mail_templates'))
             ->where($db->quoteName('template_id') . ' = :id')
@@ -119,7 +119,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(
@@ -155,7 +155,7 @@ protected function getListQuery()
                 ->bind(':extension', $extension);
         } else {
             // Only show mail template from enabled extensions
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select($db->quoteName('name'))
                 ->from($db->quoteName('#__extensions'))
                 ->where($db->quoteName('enabled') . ' = 1');
@@ -193,12 +193,12 @@ protected function getListQuery()
     public function getExtensions()
     {
         $db       = $this->getDatabase();
-        $subQuery = $db->getQuery(true)
+        $subQuery = $db->createQuery()
             ->select($db->quoteName('name'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('enabled') . ' = 1');
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT ' . $db->quoteName('extension'))
             ->from($db->quoteName('#__mail_templates'))
             ->where($db->quoteName('extension') . ' IN (' . $subQuery . ')');
diff --git a/administrator/components/com_menus/src/Field/MenuItemByComponentField.php b/administrator/components/com_menus/src/Field/MenuItemByComponentField.php
index 929a5cf40c714..53068e1c67648 100644
--- a/administrator/components/com_menus/src/Field/MenuItemByComponentField.php
+++ b/administrator/components/com_menus/src/Field/MenuItemByComponentField.php
@@ -43,7 +43,7 @@ protected function getOptions()
         $db      = $this->getDatabase();
         $options = [];
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select('DISTINCT ' . $db->quoteName('extensions.element'))
             ->from($db->quoteName('#__menu', 'menu'))
             ->join(
diff --git a/administrator/components/com_menus/src/Field/MenuItemByTypeField.php b/administrator/components/com_menus/src/Field/MenuItemByTypeField.php
index b61f54500888f..7399a0de3fb12 100644
--- a/administrator/components/com_menus/src/Field/MenuItemByTypeField.php
+++ b/administrator/components/com_menus/src/Field/MenuItemByTypeField.php
@@ -188,7 +188,7 @@ protected function getGroups()
         if ($menuType) {
             // If the menutype is empty, group the items by menutype.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('title'))
                 ->from($db->quoteName('#__menu_types'))
                 ->where($db->quoteName('menutype') . ' = :menuType')
diff --git a/administrator/components/com_menus/src/Field/MenuOrderingField.php b/administrator/components/com_menus/src/Field/MenuOrderingField.php
index 63009de9eaadb..c3af813e96a58 100644
--- a/administrator/components/com_menus/src/Field/MenuOrderingField.php
+++ b/administrator/components/com_menus/src/Field/MenuOrderingField.php
@@ -54,7 +54,7 @@ protected function getOptions()
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('a.id', 'value'),
diff --git a/administrator/components/com_menus/src/Field/MenuParentField.php b/administrator/components/com_menus/src/Field/MenuParentField.php
index 432293e6c6970..4bd84e2a93fab 100644
--- a/administrator/components/com_menus/src/Field/MenuParentField.php
+++ b/administrator/components/com_menus/src/Field/MenuParentField.php
@@ -46,7 +46,7 @@ protected function getOptions()
         $options = [];
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     'DISTINCT ' . $db->quoteName('a.id', 'value'),
diff --git a/administrator/components/com_menus/src/Field/Modal/MenuField.php b/administrator/components/com_menus/src/Field/Modal/MenuField.php
index 683583a150444..f86ce5e4364b1 100644
--- a/administrator/components/com_menus/src/Field/Modal/MenuField.php
+++ b/administrator/components/com_menus/src/Field/Modal/MenuField.php
@@ -241,7 +241,7 @@ protected function getValueTitle()
         if ($value) {
             try {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('title'))
                     ->from($db->quoteName('#__menu'))
                     ->where($db->quoteName('id') . ' = :id')
diff --git a/administrator/components/com_menus/src/Helper/MenusHelper.php b/administrator/components/com_menus/src/Helper/MenusHelper.php
index ba94797c22e69..01063a402a9fa 100644
--- a/administrator/components/com_menus/src/Helper/MenusHelper.php
+++ b/administrator/components/com_menus/src/Helper/MenusHelper.php
@@ -106,7 +106,7 @@ public static function getLinkKey($request)
     public static function getMenuTypes($clientId = 0)
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('a.menutype'))
             ->from($db->quoteName('#__menu_types', 'a'))
             ->order($db->quoteName('ordering'));
@@ -143,7 +143,7 @@ public static function getMenuLinks($menuType = null, $parentId = 0, $mode = 0,
         $clientId    = (int) $clientId;
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     'DISTINCT ' . $db->quoteName('a.id', 'value'),
@@ -218,7 +218,7 @@ public static function getMenuLinks($menuType = null, $parentId = 0, $mode = 0,
 
         if (empty($menuType)) {
             // If the menutype is empty, group the items by menutype.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('*')
                 ->from($db->quoteName('#__menu_types'))
                 ->where($db->quoteName('menutype') . ' <> ' . $db->quote(''))
@@ -303,7 +303,7 @@ public static function getMenuItems($menutype, $enabledOnly = false, $exclude =
     {
         $root  = new AdministratorMenuItem();
         $db    = Factory::getContainer()->get(DatabaseInterface::class);
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Prepare the query.
         $query->select($db->quoteName('m') . '.*')
@@ -429,7 +429,7 @@ public static function installPreset($preset, $menutype)
     protected static function installPresetItems($node, $menutype)
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $items = $node->getChildren();
 
         static $components = [];
@@ -509,7 +509,7 @@ protected static function installPresetItems($node, $menutype)
                     }
                 }
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('id'))
                     ->from($db->quoteName('#__menu'))
                     ->whereIn($db->quoteName('component_id'), $hideitems);
@@ -697,7 +697,7 @@ public static function resolveAlias(&$item)
             $aliasTo = (int) $obj->getParams()->get('aliasoptions');
 
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
             $query->select(
                 [
                     $db->quoteName('a.id'),
@@ -790,7 +790,7 @@ protected static function loadXml($elements, $parent, $replace = [])
                 $iJoin  = (string) $element['sql_innerjoin'];
 
                 $db    = Factory::getDbo();
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
                 $query->select($select)->from($from);
 
                 if ($where) {
diff --git a/administrator/components/com_menus/src/Model/ItemModel.php b/administrator/components/com_menus/src/Model/ItemModel.php
index ce6497bfc2e2a..85da394860016 100644
--- a/administrator/components/com_menus/src/Model/ItemModel.php
+++ b/administrator/components/com_menus/src/Model/ItemModel.php
@@ -157,7 +157,7 @@ protected function batchCopy($value, $pks, $contexts)
 
         $table  = $this->getTable();
         $db     = $this->getDatabase();
-        $query  = $db->getQuery(true);
+        $query  = $db->createQuery();
         $newIds = [];
 
         // Check that the parent exists
@@ -234,7 +234,7 @@ protected function batchCopy($value, $pks, $contexts)
             }
 
             // Copy is a bit tricky, because we also need to copy the children
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__menu'))
                 ->where(
@@ -409,7 +409,7 @@ protected function batchMove($value, $pks, $contexts)
             // Check if we are moving to a different menu
             if ($menuType != $table->menutype) {
                 // Add the child node ids to the children array.
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('id'))
                     ->from($db->quoteName('#__menu'))
                     ->where($db->quoteName('lft') . ' BETWEEN :lft AND :rgt')
@@ -448,7 +448,7 @@ protected function batchMove($value, $pks, $contexts)
             $children = ArrayHelper::toInteger($children);
 
             // Update the menutype field in all nodes where necessary.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName('#__menu'))
                 ->set($db->quoteName('menutype') . ' = :menuType')
                 ->whereIn($db->quoteName('id'), $children)
@@ -784,7 +784,7 @@ public function getModules()
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         /**
          * Join on the module-to-menu mapping table.
@@ -808,7 +808,7 @@ public function getModules()
                     . ' AND ' . $db->quoteName('map.menuid') . ' IN (' . implode(',', $query->bindArray([0, $id, -$id])) . ')'
             );
 
-        $subQuery = $db->getQuery(true)
+        $subQuery = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__modules_menu'))
             ->where(
@@ -860,7 +860,7 @@ public function getModules()
     public function getViewLevels()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Get all the available view levels
         $query->select($db->quoteName('id'))
@@ -1232,7 +1232,7 @@ public function rebuild()
     {
         // Initialise variables.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $table = $this->getTable();
 
         try {
@@ -1272,7 +1272,7 @@ public function rebuild()
             return false;
         }
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__menu'))
             ->set($db->quoteName('params') . ' = :params')
             ->where($db->quoteName('id') . ' = :id')
@@ -1314,7 +1314,7 @@ public function save($data)
         $pk      = $data['id'] ?? (int) $this->getState('item.id');
         $isNew   = true;
         $db      = $this->getDatabase();
-        $query   = $db->getQuery(true);
+        $query   = $db->createQuery();
         $table   = $this->getTable();
         $context = $this->option . '.' . $this->name;
 
@@ -1434,7 +1434,7 @@ public function save($data)
             $children = ArrayHelper::toInteger($children);
 
             // Update the menutype field in all nodes where necessary.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName('#__menu'))
                 ->set($db->quoteName('menutype') . ' = :menutype')
                 ->whereIn($db->quoteName('id'), $children)
@@ -1476,7 +1476,7 @@ public function save($data)
 
             // Get associationskey for edited item
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('key'))
                 ->from($db->quoteName('#__associations'))
                 ->where(
@@ -1493,7 +1493,7 @@ public function save($data)
             if ($associations || $oldKey !== null) {
                 // Deleting old associations for the associated items
                 $where = [];
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->delete($db->quoteName('#__associations'))
                     ->where($db->quoteName('context') . ' = :context')
                     ->bind(':context', $this->associationsContext);
@@ -1527,7 +1527,7 @@ public function save($data)
             if (\count($associations) > 1) {
                 // Adding new association for these items
                 $key   = md5(json_encode($associations));
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->insert($db->quoteName('#__associations'))
                     ->columns(
                         [
diff --git a/administrator/components/com_menus/src/Model/ItemsModel.php b/administrator/components/com_menus/src/Model/ItemsModel.php
index 3219906dac393..4426754ffca0b 100644
--- a/administrator/components/com_menus/src/Model/ItemsModel.php
+++ b/administrator/components/com_menus/src/Model/ItemsModel.php
@@ -225,7 +225,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db       = $this->getDatabase();
-        $query    = $db->getQuery(true);
+        $query    = $db->createQuery();
         $user     = $this->getCurrentUser();
         $clientId = (int) $this->getState('filter.client_id');
 
@@ -302,7 +302,7 @@ protected function getListQuery()
 
         // Join over the associations.
         if (Associations::isEnabled()) {
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select('COUNT(' . $db->quoteName('asso1.id') . ') > 1')
                 ->from($db->quoteName('#__associations', 'asso1'))
                 ->join('INNER', $db->quoteName('#__associations', 'asso2'), $db->quoteName('asso1.key') . ' = ' . $db->quoteName('asso2.key'))
@@ -368,7 +368,7 @@ protected function getListQuery()
 
         if ($parentId) {
             // Create a subquery for the sub-items list
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select($db->quoteName('sub.id'))
                 ->from($db->quoteName('#__menu', 'sub'))
                 ->join(
@@ -406,7 +406,7 @@ protected function getListQuery()
         // A value "" means all
         if ($menuType == '') {
             // Load all menu types we have manage access
-            $query2 = $db->getQuery(true)
+            $query2 = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('id'),
@@ -518,7 +518,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
     protected function getMenu($menuType, $check = false)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName('a') . '.*')
             ->from($db->quoteName('#__menu_types', 'a'))
diff --git a/administrator/components/com_menus/src/Model/MenuModel.php b/administrator/components/com_menus/src/Model/MenuModel.php
index ddf02e9571032..7a774898f188f 100644
--- a/administrator/components/com_menus/src/Model/MenuModel.php
+++ b/administrator/components/com_menus/src/Model/MenuModel.php
@@ -341,7 +341,7 @@ public function &getModules()
     {
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('a.id'),
@@ -387,7 +387,7 @@ public function &getModules()
     public function getExtensionElementsForMenuItems(array $itemIds): array
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query
             ->select($db->quoteName('e.element'))
diff --git a/administrator/components/com_menus/src/Model/MenusModel.php b/administrator/components/com_menus/src/Model/MenusModel.php
index 374ab7f42a4a5..a6e66f3f77ab4 100644
--- a/administrator/components/com_menus/src/Model/MenusModel.php
+++ b/administrator/components/com_menus/src/Model/MenusModel.php
@@ -84,7 +84,7 @@ public function getItems()
         $db        = $this->getDatabase();
         $menuTypes = array_column((array) $items, 'menutype');
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('m.menutype'),
@@ -153,7 +153,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db       = $this->getDatabase();
-        $query    = $db->getQuery(true);
+        $query    = $db->createQuery();
         $clientId = (int) $this->getState('client_id');
 
         // Select all fields from the table.
@@ -231,7 +231,7 @@ public function getModMenuId()
     {
         $clientId = (int) $this->getState('client_id');
         $db       = $this->getDatabase();
-        $query    = $db->getQuery(true)
+        $query    = $db->createQuery()
             ->select($db->quoteName('e.extension_id'))
             ->from($db->quoteName('#__extensions', 'e'))
             ->where(
@@ -287,7 +287,7 @@ public function getMissingModuleLanguages(): array
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName('m.language'))
             ->from($db->quoteName('#__modules', 'm'))
diff --git a/administrator/components/com_menus/src/Model/MenutypesModel.php b/administrator/components/com_menus/src/Model/MenutypesModel.php
index 45965cf0c75b6..1f3acec65a872 100644
--- a/administrator/components/com_menus/src/Model/MenutypesModel.php
+++ b/administrator/components/com_menus/src/Model/MenutypesModel.php
@@ -86,7 +86,7 @@ public function getTypeOptions()
 
         // Get the list of components.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('name'),
diff --git a/administrator/components/com_menus/src/Service/HTML/Menus.php b/administrator/components/com_menus/src/Service/HTML/Menus.php
index 081f6bce55368..4aa3fe7fe9308 100644
--- a/administrator/components/com_menus/src/Service/HTML/Menus.php
+++ b/administrator/components/com_menus/src/Service/HTML/Menus.php
@@ -52,7 +52,7 @@ public function association($itemid)
         if ($associations = MenusHelper::getAssociations($itemid)) {
             // Get the associated menu items
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('m.id'),
diff --git a/administrator/components/com_menus/src/Table/MenuTable.php b/administrator/components/com_menus/src/Table/MenuTable.php
index 8d4153e514fb2..2056d07e03694 100644
--- a/administrator/components/com_menus/src/Table/MenuTable.php
+++ b/administrator/components/com_menus/src/Table/MenuTable.php
@@ -42,7 +42,7 @@ public function delete($pk = null, $children = false)
         if ($return) {
             // Delete key from the #__modules_menu table
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__modules_menu'))
                 ->where($db->quoteName('menuid') . ' = :pk')
                 ->bind(':pk', $pk, ParameterType::INTEGER);
diff --git a/administrator/components/com_messages/src/Field/UserMessagesField.php b/administrator/components/com_messages/src/Field/UserMessagesField.php
index 939460035fdcb..2f34f01f5f29e 100644
--- a/administrator/components/com_messages/src/Field/UserMessagesField.php
+++ b/administrator/components/com_messages/src/Field/UserMessagesField.php
@@ -44,7 +44,7 @@ protected function getGroups()
     {
         // Compute usergroups
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('id')
             ->from('#__usergroups');
         $db->setQuery($query);
diff --git a/administrator/components/com_messages/src/Model/ConfigModel.php b/administrator/components/com_messages/src/Model/ConfigModel.php
index bb4289891d0ab..d820d61d3bea7 100644
--- a/administrator/components/com_messages/src/Model/ConfigModel.php
+++ b/administrator/components/com_messages/src/Model/ConfigModel.php
@@ -63,7 +63,7 @@ public function getItem()
         $userid = (int) $this->getState('user.id');
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select(
             [
                 $db->quoteName('cfg_name'),
@@ -130,7 +130,7 @@ public function save($data)
         $db = $this->getDatabase();
 
         if ($userId = (int) $this->getState('user.id')) {
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__messages_cfg'))
                 ->where($db->quoteName('user_id') . ' = :userid')
                 ->bind(':userid', $userId, ParameterType::INTEGER);
@@ -145,7 +145,7 @@ public function save($data)
             }
 
             if (\count($data)) {
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->insert($db->quoteName('#__messages_cfg'))
                     ->columns(
                         [
diff --git a/administrator/components/com_messages/src/Model/MessageModel.php b/administrator/components/com_messages/src/Model/MessageModel.php
index c199b6fe3af8c..c93b257696673 100644
--- a/administrator/components/com_messages/src/Model/MessageModel.php
+++ b/administrator/components/com_messages/src/Model/MessageModel.php
@@ -143,7 +143,7 @@ public function getItem($pk = null)
                     if ($replyId = (int) $this->getState('reply.id')) {
                         // If replying to a message, preload some data.
                         $db    = $this->getDatabase();
-                        $query = $db->getQuery(true)
+                        $query = $db->createQuery()
                             ->select($db->quoteName(['subject', 'user_id_from', 'user_id_to']))
                             ->from($db->quoteName('#__messages'))
                             ->where($db->quoteName('message_id') . ' = :messageid')
@@ -178,7 +178,7 @@ public function getItem($pk = null)
                 } else {
                     // Mark message read
                     $db    = $this->getDatabase();
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->update($db->quoteName('#__messages'))
                         ->set($db->quoteName('state') . ' = 1')
                         ->where($db->quoteName('message_id') . ' = :messageid')
@@ -457,7 +457,7 @@ public function notifySuperUsers($subject, $message, $fromUser = null)
                 return false;
             }
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('map.user_id'))
                 ->from($db->quoteName('#__user_usergroup_map', 'map'))
                 ->join(
diff --git a/administrator/components/com_messages/src/Model/MessagesModel.php b/administrator/components/com_messages/src/Model/MessagesModel.php
index 76dacc7e90503..2479d3497d13b 100644
--- a/administrator/components/com_messages/src/Model/MessagesModel.php
+++ b/administrator/components/com_messages/src/Model/MessagesModel.php
@@ -108,7 +108,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $user  = $this->getCurrentUser();
         $id    = (int) $user->id;
 
@@ -179,7 +179,7 @@ protected function getListQuery()
     public function purge(int $userId): void
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['cfg_name', 'cfg_value']))
             ->from($db->quoteName('#__messages_cfg'))
             ->where(
@@ -206,7 +206,7 @@ public function purge(int $userId): void
             // Purge old messages at day set in message configuration
             $past = Factory::getDate(time() - $purge * 86400)->toSql();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__messages'))
                 ->where(
                     [
diff --git a/administrator/components/com_modules/src/Helper/ModulesHelper.php b/administrator/components/com_modules/src/Helper/ModulesHelper.php
index fac753b736857..8a32dda43bfac 100644
--- a/administrator/components/com_modules/src/Helper/ModulesHelper.php
+++ b/administrator/components/com_modules/src/Helper/ModulesHelper.php
@@ -71,7 +71,7 @@ public static function getPositions($clientId, $editPositions = false)
     {
         $db       = Factory::getDbo();
         $clientId = (int) $clientId;
-        $query    = $db->getQuery(true)
+        $query    = $db->createQuery()
             ->select('DISTINCT ' . $db->quoteName('position'))
             ->from($db->quoteName('#__modules'))
             ->where($db->quoteName('client_id') . ' = :clientid')
@@ -120,7 +120,7 @@ public static function getTemplates($clientId = 0, $state = '', $template = '')
         $clientId = (int) $clientId;
 
         // Get the database object and a new query object.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Build the query.
         $query->select($db->quoteName(['element', 'name', 'enabled']))
@@ -157,7 +157,7 @@ public static function getTemplates($clientId = 0, $state = '', $template = '')
     public static function getModules($clientId)
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('element AS value, name AS text')
             ->from('#__extensions as e')
             ->where('e.client_id = ' . (int) $clientId)
diff --git a/administrator/components/com_modules/src/Model/ModuleModel.php b/administrator/components/com_modules/src/Model/ModuleModel.php
index 972156ac7ba44..2d2d16d131e42 100644
--- a/administrator/components/com_modules/src/Model/ModuleModel.php
+++ b/administrator/components/com_modules/src/Model/ModuleModel.php
@@ -201,7 +201,7 @@ protected function batchCopy($value, $pks, $contexts)
 
                 // Now we need to handle the module assignments
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('menuid'))
                     ->from($db->quoteName('#__modules_menu'))
                     ->where($db->quoteName('moduleid') . ' = :moduleid')
@@ -355,7 +355,7 @@ public function delete(&$pks)
                 // Delete the menu assignments
                 $pk    = (int) $pk;
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->delete($db->quoteName('#__modules_menu'))
                     ->where($db->quoteName('moduleid') . ' = :moduleid')
                     ->bind(':moduleid', $pk, ParameterType::INTEGER);
@@ -425,7 +425,7 @@ public function duplicate(&$pks)
                 }
 
                 $pk    = (int) $pk;
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('menuid'))
                     ->from($db->quoteName('#__modules_menu'))
                     ->where($db->quoteName('moduleid') . ' = :moduleid')
@@ -444,7 +444,7 @@ public function duplicate(&$pks)
 
         if (!empty($tuples)) {
             // Module-Menu Mapping: Do it in one query
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->insert($db->quoteName('#__modules_menu'))
                 ->columns($db->quoteName(['moduleid', 'menuid']))
                 ->values($tuples);
@@ -651,7 +651,7 @@ public function getItem($pk = null)
             // Check if we are creating a new extension.
             if (empty($pk)) {
                 if ($extensionId = (int) $this->getState('extension.id')) {
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->select($db->quoteName(['element', 'client_id']))
                         ->from($db->quoteName('#__extensions'))
                         ->where($db->quoteName('extension_id') . ' = :extensionid')
@@ -692,7 +692,7 @@ public function getItem($pk = null)
             $this->_cache[$pk]->params = $registry->toArray();
 
             // Determine the page assignment mode.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('menuid'))
                 ->from($db->quoteName('#__modules_menu'))
                 ->where($db->quoteName('moduleid') . ' = :moduleid')
@@ -965,7 +965,7 @@ public function save($data)
 
         // Delete old module to menu item associations
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__modules_menu'))
             ->where($db->quoteName('moduleid') . ' = :moduleid')
             ->bind(':moduleid', $table->id, ParameterType::INTEGER);
diff --git a/administrator/components/com_modules/src/Model/ModulesModel.php b/administrator/components/com_modules/src/Model/ModulesModel.php
index 2ad18918777d0..1c193f541ca3e 100644
--- a/administrator/components/com_modules/src/Model/ModulesModel.php
+++ b/administrator/components/com_modules/src/Model/ModulesModel.php
@@ -249,7 +249,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields.
         $query->select(
@@ -346,7 +346,7 @@ protected function getListQuery()
             } else {
                 // If user selected the modules assigned to some particular page (menu item).
                 // Modules in "All" pages.
-                $subQuery1 = $db->getQuery(true);
+                $subQuery1 = $db->createQuery();
                 $subQuery1->select('MIN(' . $db->quoteName('menuid') . ')')
                     ->from($db->quoteName('#__modules_menu'))
                     ->where($db->quoteName('moduleid') . ' = ' . $db->quoteName('a.id'));
@@ -354,13 +354,13 @@ protected function getListQuery()
                 // Modules in "Selected" pages that have the chosen menu item id.
                 $menuItemId      = (int) $menuItemId;
                 $minusMenuItemId = $menuItemId * -1;
-                $subQuery2       = $db->getQuery(true);
+                $subQuery2       = $db->createQuery();
                 $subQuery2->select($db->quoteName('moduleid'))
                     ->from($db->quoteName('#__modules_menu'))
                     ->where($db->quoteName('menuid') . ' = :menuitemid2');
 
                 // Modules in "All except selected" pages that doesn't have the chosen menu item id.
-                $subQuery3 = $db->getQuery(true);
+                $subQuery3 = $db->createQuery();
                 $subQuery3->select($db->quoteName('moduleid'))
                     ->from($db->quoteName('#__modules_menu'))
                     ->where($db->quoteName('menuid') . ' = :menuitemid3');
diff --git a/administrator/components/com_modules/src/Model/PositionsModel.php b/administrator/components/com_modules/src/Model/PositionsModel.php
index 0351c13dc8363..3d99a58ace4e6 100644
--- a/administrator/components/com_modules/src/Model/PositionsModel.php
+++ b/administrator/components/com_modules/src/Model/PositionsModel.php
@@ -105,7 +105,7 @@ public function getItems()
 
                 // Get the database object and a new query object.
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select('DISTINCT ' . $db->quoteName('position', 'value'))
                     ->from($db->quoteName('#__modules'))
                     ->where($db->quoteName('client_id') . ' = :clientid')
diff --git a/administrator/components/com_modules/src/Model/SelectModel.php b/administrator/components/com_modules/src/Model/SelectModel.php
index 643ca24503046..9a2fb6212e44b 100644
--- a/administrator/components/com_modules/src/Model/SelectModel.php
+++ b/administrator/components/com_modules/src/Model/SelectModel.php
@@ -90,7 +90,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(
diff --git a/administrator/components/com_modules/src/Service/HTML/Modules.php b/administrator/components/com_modules/src/Service/HTML/Modules.php
index 78b02e6e90582..51aac634362fe 100644
--- a/administrator/components/com_modules/src/Service/HTML/Modules.php
+++ b/administrator/components/com_modules/src/Service/HTML/Modules.php
@@ -230,7 +230,7 @@ public function positionList($clientId = 0)
     {
         $clientId = (int) $clientId;
         $db       = Factory::getDbo();
-        $query    = $db->getQuery(true)
+        $query    = $db->createQuery()
             ->select('DISTINCT ' . $db->quoteName('position', 'value'))
             ->select($db->quoteName('position', 'text'))
             ->from($db->quoteName('#__modules'))
diff --git a/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php b/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php
index 97ed426e7ce8b..834174f3e5454 100644
--- a/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php
+++ b/administrator/components/com_newsfeeds/src/Field/Modal/NewsfeedField.php
@@ -138,7 +138,7 @@ protected function getValueTitle()
         if ($value) {
             try {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('name'))
                     ->from($db->quoteName('#__newsfeeds'))
                     ->where($db->quoteName('id') . ' = :value')
diff --git a/administrator/components/com_newsfeeds/src/Field/NewsfeedsField.php b/administrator/components/com_newsfeeds/src/Field/NewsfeedsField.php
index a4975ea91a467..d41a20203c93b 100644
--- a/administrator/components/com_newsfeeds/src/Field/NewsfeedsField.php
+++ b/administrator/components/com_newsfeeds/src/Field/NewsfeedsField.php
@@ -44,7 +44,7 @@ protected function getOptions()
         $options = [];
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('id', 'value'),
diff --git a/administrator/components/com_newsfeeds/src/Helper/NewsfeedsHelper.php b/administrator/components/com_newsfeeds/src/Helper/NewsfeedsHelper.php
index d2733fe1ddc32..febf63625bfa8 100644
--- a/administrator/components/com_newsfeeds/src/Helper/NewsfeedsHelper.php
+++ b/administrator/components/com_newsfeeds/src/Helper/NewsfeedsHelper.php
@@ -44,7 +44,7 @@ class NewsfeedsHelper extends ContentHelper
     public static function countItems(&$items)
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select(
             [
                 $db->quoteName('published', 'state'),
@@ -101,7 +101,7 @@ public static function countItems(&$items)
     public static function countTagItems(&$items, $extension)
     {
         $db        = Factory::getDbo();
-        $query     = $db->getQuery(true);
+        $query     = $db->createQuery();
         $parts     = explode('.', $extension);
         $section   = null;
 
diff --git a/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php b/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php
index e710ec0c7e5c1..724a326890276 100644
--- a/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php
+++ b/administrator/components/com_newsfeeds/src/Model/NewsfeedModel.php
@@ -311,7 +311,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('#__newsfeeds'));
                 $db->setQuery($query);
diff --git a/administrator/components/com_newsfeeds/src/Model/NewsfeedsModel.php b/administrator/components/com_newsfeeds/src/Model/NewsfeedsModel.php
index 6d806ec3a06fd..e7a62b1f7c61e 100644
--- a/administrator/components/com_newsfeeds/src/Model/NewsfeedsModel.php
+++ b/administrator/components/com_newsfeeds/src/Model/NewsfeedsModel.php
@@ -147,7 +147,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $user  = $this->getCurrentUser();
 
         // Select the required fields from the table.
@@ -191,7 +191,7 @@ protected function getListQuery()
 
         // Join over the associations.
         if (Associations::isEnabled()) {
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select('COUNT(' . $db->quoteName('asso1.id') . ') > 1')
                 ->from($db->quoteName('#__associations', 'asso1'))
                 ->join('INNER', $db->quoteName('#__associations', 'asso2'), $db->quoteName('asso1.key') . ' = ' . $db->quoteName('asso2.key'))
@@ -278,7 +278,7 @@ protected function getListQuery()
                 $includeNone = true;
             }
 
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                 ->from($db->quoteName('#__contentitem_tag_map'))
                 ->where(
@@ -295,7 +295,7 @@ protected function getListQuery()
             );
 
             if ($includeNone) {
-                $subQuery2 = $db->getQuery(true)
+                $subQuery2 = $db->createQuery()
                     ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                     ->from($db->quoteName('#__contentitem_tag_map'))
                     ->where($db->quoteName('type_alias') . ' = ' . $db->quote('com_newsfeeds.newsfeed'));
@@ -313,7 +313,7 @@ protected function getListQuery()
             $tag = (int) $tag;
 
             if ($tag === 0) {
-                $subQuery = $db->getQuery(true)
+                $subQuery = $db->createQuery()
                     ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                     ->from($db->quoteName('#__contentitem_tag_map'))
                     ->where($db->quoteName('type_alias') . ' = ' . $db->quote('com_newsfeeds.newsfeed'));
diff --git a/administrator/components/com_newsfeeds/src/Service/HTML/AdministratorService.php b/administrator/components/com_newsfeeds/src/Service/HTML/AdministratorService.php
index 1de326795b4f3..97d94dd5d12ce 100644
--- a/administrator/components/com_newsfeeds/src/Service/HTML/AdministratorService.php
+++ b/administrator/components/com_newsfeeds/src/Service/HTML/AdministratorService.php
@@ -51,7 +51,7 @@ public function association($newsfeedid)
 
             // Get the associated newsfeed items
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
             $query
                 ->select(
                     [
diff --git a/administrator/components/com_plugins/src/Field/PluginorderingField.php b/administrator/components/com_plugins/src/Field/PluginorderingField.php
index 42e8b36257efc..396a3ae2aa2c7 100644
--- a/administrator/components/com_plugins/src/Field/PluginorderingField.php
+++ b/administrator/components/com_plugins/src/Field/PluginorderingField.php
@@ -42,7 +42,7 @@ protected function getQuery()
         $folder = $this->form->getValue('folder');
 
         // Build the query for the ordering list.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('ordering', 'value'),
diff --git a/administrator/components/com_plugins/src/Helper/PluginsHelper.php b/administrator/components/com_plugins/src/Helper/PluginsHelper.php
index ed6195de211f9..5f00603036283 100644
--- a/administrator/components/com_plugins/src/Helper/PluginsHelper.php
+++ b/administrator/components/com_plugins/src/Helper/PluginsHelper.php
@@ -51,7 +51,7 @@ public static function publishedOptions()
     public static function folderOptions()
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT(folder) AS value, folder AS text')
             ->from('#__extensions')
             ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
@@ -76,7 +76,7 @@ public static function folderOptions()
     public static function elementOptions()
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT(element) AS value, element AS text')
             ->from('#__extensions')
             ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
diff --git a/administrator/components/com_plugins/src/Model/PluginModel.php b/administrator/components/com_plugins/src/Model/PluginModel.php
index e7d528f7eb8cb..2aae139e0dcfd 100644
--- a/administrator/components/com_plugins/src/Model/PluginModel.php
+++ b/administrator/components/com_plugins/src/Model/PluginModel.php
@@ -253,7 +253,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
 
         // Load the core and/or local language sys file(s) for the ordering field.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('element'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
diff --git a/administrator/components/com_plugins/src/Model/PluginsModel.php b/administrator/components/com_plugins/src/Model/PluginsModel.php
index 50d193fd1cb5c..a20c718ab6184 100644
--- a/administrator/components/com_plugins/src/Model/PluginsModel.php
+++ b/administrator/components/com_plugins/src/Model/PluginsModel.php
@@ -203,7 +203,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(
diff --git a/administrator/components/com_postinstall/src/Model/MessagesModel.php b/administrator/components/com_postinstall/src/Model/MessagesModel.php
index 0ae8648b5fbf9..a9ee34202fcd2 100644
--- a/administrator/components/com_postinstall/src/Model/MessagesModel.php
+++ b/administrator/components/com_postinstall/src/Model/MessagesModel.php
@@ -68,7 +68,7 @@ public function getItem($id)
         $db = $this->getDatabase();
         $id = (int) $id;
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select(
             [
                 $db->quoteName('postinstall_message_id'),
@@ -110,7 +110,7 @@ public function unpublishMessage($id)
         $db = $this->getDatabase();
         $id = (int) $id;
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query
             ->update($db->quoteName('#__postinstall_messages'))
             ->set($db->quoteName('enabled') . ' = 0')
@@ -135,7 +135,7 @@ public function archiveMessage($id)
         $db = $this->getDatabase();
         $id = (int) $id;
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query
             ->update($db->quoteName('#__postinstall_messages'))
             ->set($db->quoteName('enabled') . ' = 2')
@@ -160,7 +160,7 @@ public function republishMessage($id)
         $db = $this->getDatabase();
         $id = (int) $id;
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query
             ->update($db->quoteName('#__postinstall_messages'))
             ->set($db->quoteName('enabled') . ' = 1')
@@ -187,7 +187,7 @@ public function getItems()
         $cacheId = 'postinstall_messages.' . $eid;
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select(
             [
                 $db->quoteName('postinstall_message_id'),
@@ -244,7 +244,7 @@ public function getItems()
     public function getItemsCount()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select(
             [
                 $db->quoteName('language_extension'),
@@ -296,7 +296,7 @@ public function getExtensionName($eid)
         $db  = $this->getDatabase();
         $eid = (int) $eid;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('name'),
@@ -345,7 +345,7 @@ public function resetMessages($eid)
         $db  = $this->getDatabase();
         $eid = (int) $eid;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__postinstall_messages'))
             ->set($db->quoteName('enabled') . ' = 1')
             ->where($db->quoteName('extension_id') . ' = :eid')
@@ -372,7 +372,7 @@ public function hideMessages($eid)
         $db  = $this->getDatabase();
         $eid = (int) $eid;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__postinstall_messages'))
             ->set($db->quoteName('enabled') . ' = 0')
             ->where($db->quoteName('extension_id') . ' = :eid')
@@ -453,7 +453,7 @@ public function getComponentOptions()
     {
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__postinstall_messages'))
             ->group($db->quoteName('extension_id'));
@@ -668,7 +668,7 @@ public function addPostInstallationMessage(array $options)
         $extensionId = (int) $options['extension_id'];
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName($tableName))
             ->where(
@@ -701,7 +701,7 @@ public function addPostInstallationMessage(array $options)
             }
 
             // Otherwise it's not the same row. Remove the old row before insert a new one.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName($tableName))
                 ->where(
                     [
diff --git a/administrator/components/com_privacy/src/Helper/PrivacyHelper.php b/administrator/components/com_privacy/src/Helper/PrivacyHelper.php
index 325cfc48b3877..1d4b8250ea485 100644
--- a/administrator/components/com_privacy/src/Helper/PrivacyHelper.php
+++ b/administrator/components/com_privacy/src/Helper/PrivacyHelper.php
@@ -73,7 +73,7 @@ public static function renderDataAsXml(array $exportData)
     public static function getPrivacyConsentPluginId()
     {
         $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'))
diff --git a/administrator/components/com_privacy/src/Model/ConsentsModel.php b/administrator/components/com_privacy/src/Model/ConsentsModel.php
index ccfcbb0eec388..76617f0a97ad2 100644
--- a/administrator/components/com_privacy/src/Model/ConsentsModel.php
+++ b/administrator/components/com_privacy/src/Model/ConsentsModel.php
@@ -65,7 +65,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($this->getState('list.select', 'a.*'));
@@ -182,7 +182,7 @@ public function invalidate($pks)
 
         try {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName('#__privacy_consents'))
                 ->set($db->quoteName('state') . ' = -1')
                 ->whereIn($db->quoteName('id'), $pks)
@@ -209,7 +209,7 @@ public function invalidateAll($subject)
     {
         try {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName('#__privacy_consents'))
                 ->set($db->quoteName('state') . ' = -1')
                 ->where($db->quoteName('subject') . ' = :subject')
diff --git a/administrator/components/com_privacy/src/Model/ExportModel.php b/administrator/components/com_privacy/src/Model/ExportModel.php
index 8ae502d1d713b..4b52545761e66 100644
--- a/administrator/components/com_privacy/src/Model/ExportModel.php
+++ b/administrator/components/com_privacy/src/Model/ExportModel.php
@@ -85,7 +85,7 @@ public function collectDataForExportRequest($id = null)
         $db = $this->getDatabase();
 
         $userId = (int) $db->setQuery(
-            $db->getQuery(true)
+            $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__users'))
                 ->where('LOWER(' . $db->quoteName('email') . ') = LOWER(:email)')
@@ -179,7 +179,7 @@ public function emailDataExport($id = null)
         $db = $this->getDatabase();
 
         $userId = (int) $db->setQuery(
-            $db->getQuery(true)
+            $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__users'))
                 ->where('LOWER(' . $db->quoteName('email') . ') = LOWER(:email)')
diff --git a/administrator/components/com_privacy/src/Model/RemoveModel.php b/administrator/components/com_privacy/src/Model/RemoveModel.php
index 864e79a840455..741840031510f 100644
--- a/administrator/components/com_privacy/src/Model/RemoveModel.php
+++ b/administrator/components/com_privacy/src/Model/RemoveModel.php
@@ -81,7 +81,7 @@ public function removeDataForRequest($id = null)
         $db = $this->getDatabase();
 
         $userId = (int) $db->setQuery(
-            $db->getQuery(true)
+            $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__users'))
                 ->where('LOWER(' . $db->quoteName('email') . ') = LOWER(:email)')
diff --git a/administrator/components/com_privacy/src/Model/RequestModel.php b/administrator/components/com_privacy/src/Model/RequestModel.php
index 47b531c848b6e..fdd6886309711 100644
--- a/administrator/components/com_privacy/src/Model/RequestModel.php
+++ b/administrator/components/com_privacy/src/Model/RequestModel.php
@@ -264,7 +264,7 @@ public function notifyUserAdminCreatedRequest($id)
         $db = $this->getDatabase();
 
         $userId = (int) $db->setQuery(
-            $db->getQuery(true)
+            $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__users'))
                 ->where('LOWER(' . $db->quoteName('email') . ') = LOWER(:email)')
@@ -411,7 +411,7 @@ public function validate($form, $data, $group = null)
         // Check for an active request for this email address
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(id)')
             ->from($db->quoteName('#__privacy_requests'))
             ->where($db->quoteName('email') . ' = :email')
diff --git a/administrator/components/com_privacy/src/Model/RequestsModel.php b/administrator/components/com_privacy/src/Model/RequestsModel.php
index f28ac566aba2e..4b2724ffb377f 100644
--- a/administrator/components/com_privacy/src/Model/RequestsModel.php
+++ b/administrator/components/com_privacy/src/Model/RequestsModel.php
@@ -62,7 +62,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($this->getState('list.select', 'a.*'));
@@ -171,7 +171,7 @@ public function getNumberUrgentRequests()
         $period = '-' . $notify;
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)');
         $query->from($db->quoteName('#__privacy_requests'));
         $query->where($db->quoteName('status') . ' = 1 ');
diff --git a/administrator/components/com_redirect/src/Helper/RedirectHelper.php b/administrator/components/com_redirect/src/Helper/RedirectHelper.php
index 8cf148fd8ab85..0adc03fec439d 100644
--- a/administrator/components/com_redirect/src/Helper/RedirectHelper.php
+++ b/administrator/components/com_redirect/src/Helper/RedirectHelper.php
@@ -63,7 +63,7 @@ public static function publishedOptions()
     public static function getRedirectPluginId()
     {
         $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'))
diff --git a/administrator/components/com_redirect/src/Model/LinkModel.php b/administrator/components/com_redirect/src/Model/LinkModel.php
index 69af0758524a1..de93753d1f98c 100644
--- a/administrator/components/com_redirect/src/Model/LinkModel.php
+++ b/administrator/components/com_redirect/src/Model/LinkModel.php
@@ -145,7 +145,7 @@ public function activate(&$pks, $url, $comment = null)
 
         if (!empty($pks)) {
             // Update the link rows.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName('#__redirect_links'))
                 ->set($db->quoteName('new_url') . ' = :url')
                 ->set($db->quoteName('published') . ' = 1')
@@ -199,7 +199,7 @@ public function duplicateUrls(&$pks, $url, $comment = null)
             $date = Factory::getDate()->toSql();
 
             // Update the link rows.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName('#__redirect_links'))
                 ->set($db->quoteName('new_url') . ' = :url')
                 ->set($db->quoteName('modified_date') . ' = :date')
diff --git a/administrator/components/com_redirect/src/Model/LinksModel.php b/administrator/components/com_redirect/src/Model/LinksModel.php
index 8fde16f511534..4f7eef13414b5 100644
--- a/administrator/components/com_redirect/src/Model/LinksModel.php
+++ b/administrator/components/com_redirect/src/Model/LinksModel.php
@@ -65,7 +65,7 @@ public function purge()
     {
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->delete('#__redirect_links')->where($db->quoteName('published') . '= 0');
 
@@ -136,7 +136,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(
@@ -204,7 +204,7 @@ protected function getListQuery()
     public function batchProcess($batchUrls)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $params  = ComponentHelper::getParams('com_redirect');
         $state   = (int) $params->get('defaultImportState', 0);
diff --git a/administrator/components/com_redirect/src/Table/LinkTable.php b/administrator/components/com_redirect/src/Table/LinkTable.php
index 73f4172137d99..b75bb302fb0e2 100644
--- a/administrator/components/com_redirect/src/Table/LinkTable.php
+++ b/administrator/components/com_redirect/src/Table/LinkTable.php
@@ -99,7 +99,7 @@ public function check()
         $db = $this->getDatabase();
 
         // Check for existing name
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->select($db->quoteName('old_url'))
             ->from($db->quoteName('#__redirect_links'))
diff --git a/administrator/components/com_scheduler/src/Model/LogsModel.php b/administrator/components/com_scheduler/src/Model/LogsModel.php
index 3823e6da9a423..3da2e19fab4ad 100644
--- a/administrator/components/com_scheduler/src/Model/LogsModel.php
+++ b/administrator/components/com_scheduler/src/Model/LogsModel.php
@@ -130,7 +130,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(
diff --git a/administrator/components/com_scheduler/src/Model/TaskModel.php b/administrator/components/com_scheduler/src/Model/TaskModel.php
index ee58a19a99910..e8c6a2205c1b2 100644
--- a/administrator/components/com_scheduler/src/Model/TaskModel.php
+++ b/administrator/components/com_scheduler/src/Model/TaskModel.php
@@ -418,7 +418,7 @@ public function getTask(array $options = []): ?\stdClass
      */
     private function hasRunningTasks($db): bool
     {
-        $lockCountQuery = $db->getQuery(true)
+        $lockCountQuery = $db->createQuery()
             ->select('COUNT(id)')
             ->from($db->quoteName(self::TASK_TABLE))
             ->where($db->quoteName('locked') . ' IS NOT NULL')
@@ -448,7 +448,7 @@ private function hasRunningTasks($db): bool
      */
     private function buildLockQuery($db, $now, $options)
     {
-        $lockQuery = $db->getQuery(true)
+        $lockQuery = $db->createQuery()
             ->update($db->quoteName(self::TASK_TABLE))
             ->set($db->quoteName('locked') . ' = :now1')
             ->bind(':now1', $now);
@@ -493,7 +493,7 @@ static function (TaskOption $taskOption): string {
      */
     private function getNextTaskId($db, $now, $options)
     {
-        $idQuery = $db->getQuery(true)
+        $idQuery = $db->createQuery()
             ->from($db->quoteName(self::TASK_TABLE))
             ->select($db->quoteName('id'));
 
@@ -541,7 +541,7 @@ static function (TaskOption $taskOption): string {
      */
     private function fetchTask($db, $now): ?\stdClass
     {
-        $getQuery = $db->getQuery(true)
+        $getQuery = $db->createQuery()
             ->select('*')
             ->from($db->quoteName(self::TASK_TABLE))
             ->where($db->quoteName('locked') . ' = :now')
diff --git a/administrator/components/com_scheduler/src/Model/TasksModel.php b/administrator/components/com_scheduler/src/Model/TasksModel.php
index 96ed64bb49a90..996f8e2a9a92b 100644
--- a/administrator/components/com_scheduler/src/Model/TasksModel.php
+++ b/administrator/components/com_scheduler/src/Model/TasksModel.php
@@ -112,7 +112,7 @@ protected function getListQuery(): QueryInterface
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         /**
          * Select the required fields from the table.
@@ -484,7 +484,7 @@ public function hasDueTasks(Date $time): bool
         $db  = $this->getDatabase();
         $now = $time->toSql();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             // Count due tasks
             ->select('SUM(CASE WHEN ' . $db->quoteName('a.next_execution') . ' <= :now THEN 1 ELSE 0 END) AS due_count')
             // Count locked tasks
diff --git a/administrator/components/com_scheduler/src/Table/TaskTable.php b/administrator/components/com_scheduler/src/Table/TaskTable.php
index 19e34778e81e9..a710d8ab487d3 100644
--- a/administrator/components/com_scheduler/src/Table/TaskTable.php
+++ b/administrator/components/com_scheduler/src/Table/TaskTable.php
@@ -289,7 +289,7 @@ public function unlock(array $pks = [], ?int $userId = null): bool
 
         foreach ($pks as $pk) {
             // Update the publishing state for rows with the given primary keys.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($this->_tbl)
                 ->set($db->quoteName($lockedField) . ' = NULL');
 
diff --git a/administrator/components/com_scheduler/src/Task/Task.php b/administrator/components/com_scheduler/src/Task/Task.php
index 26817b39789ac..63cec1b318140 100644
--- a/administrator/components/com_scheduler/src/Task/Task.php
+++ b/administrator/components/com_scheduler/src/Task/Task.php
@@ -305,7 +305,7 @@ public function getContent(): array
     public function acquireLock(): bool
     {
         $db    = $this->db;
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $id    = $this->get('id');
         $now   = Factory::getDate('now', 'UTC');
 
@@ -361,7 +361,7 @@ public function acquireLock(): bool
     public function releaseLock(bool $update = true): bool
     {
         $db    = $this->db;
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $id    = $this->get('id');
 
         $query->update($db->quoteName('#__scheduler_tasks', 't'))
@@ -433,7 +433,7 @@ public function log(string $message, string $priority = 'info'): void
     public function skipExecution(): void
     {
         $db    = $this->db;
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $id       = $this->get('id');
         $nextExec = (new ExecRuleHelper($this->taskRegistry->toObject()))->nextExec(true, true);
diff --git a/administrator/components/com_tags/src/Model/TagsModel.php b/administrator/components/com_tags/src/Model/TagsModel.php
index 2dde7f9b3a5e6..e9319d0e2fe79 100644
--- a/administrator/components/com_tags/src/Model/TagsModel.php
+++ b/administrator/components/com_tags/src/Model/TagsModel.php
@@ -147,7 +147,7 @@ protected function getListQuery()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $user  = $this->getCurrentUser();
 
         // Select the required fields from the table.
@@ -183,7 +183,7 @@ protected function getListQuery()
             ->join('LEFT', $db->quoteName('#__viewlevels', 'ug'), $db->quoteName('ug.id') . ' = ' . $db->quoteName('a.access'));
 
         // Count Items
-        $subQueryCountTaggedItems = $db->getQuery(true);
+        $subQueryCountTaggedItems = $db->createQuery();
         $subQueryCountTaggedItems
             ->select('COUNT(' . $db->quoteName('tag_map.content_item_id') . ')')
             ->from($db->quoteName('#__contentitem_tag_map', 'tag_map'))
diff --git a/administrator/components/com_templates/src/Helper/TemplatesHelper.php b/administrator/components/com_templates/src/Helper/TemplatesHelper.php
index 98cabd56bf79a..ae92fd48a37ab 100644
--- a/administrator/components/com_templates/src/Helper/TemplatesHelper.php
+++ b/administrator/components/com_templates/src/Helper/TemplatesHelper.php
@@ -54,7 +54,7 @@ public static function getTemplateOptions($clientId = '*')
     {
         // Build the filter options.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName('element', 'value'))
             ->select($db->quoteName('name', 'text'))
diff --git a/administrator/components/com_templates/src/Model/StyleModel.php b/administrator/components/com_templates/src/Model/StyleModel.php
index 61eeeab358a8d..0c5eb87f863b3 100644
--- a/administrator/components/com_templates/src/Model/StyleModel.php
+++ b/administrator/components/com_templates/src/Model/StyleModel.php
@@ -465,7 +465,7 @@ public function save($data)
                 $data['assigned'] = ArrayHelper::toInteger($data['assigned']);
 
                 // Update the mapping for menu items that this style IS assigned to.
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->update($db->quoteName('#__menu'))
                     ->set($db->quoteName('template_style_id') . ' = :newtsid')
                     ->whereIn($db->quoteName('id'), $data['assigned'])
@@ -481,7 +481,7 @@ public function save($data)
 
             // Remove style mappings for menu items this style is NOT assigned to.
             // If unassigned then all existing maps will be removed.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName('#__menu'))
                 ->set($db->quoteName('template_style_id') . ' = 0');
 
@@ -550,7 +550,7 @@ public function setHome($id = 0)
         $id       = (int) $id;
 
         // Reset the home fields for the client_id.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__template_styles'))
             ->set($db->quoteName('home') . ' = ' . $db->quote('0'))
             ->where($db->quoteName('client_id') . ' = :clientid')
@@ -560,7 +560,7 @@ public function setHome($id = 0)
         $db->execute();
 
         // Set the new home style.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__template_styles'))
             ->set($db->quoteName('home') . ' = ' . $db->quote('1'))
             ->where($db->quoteName('id') . ' = :id')
@@ -596,7 +596,7 @@ public function unsetHome($id = 0)
         $id = (int) $id;
 
         // Lookup the client_id.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['client_id', 'home']))
             ->from($db->quoteName('#__template_styles'))
             ->where($db->quoteName('id') . ' = :id')
@@ -613,7 +613,7 @@ public function unsetHome($id = 0)
         }
 
         // Set the new home style.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__template_styles'))
             ->set($db->quoteName('home') . ' = ' . $db->quote('0'))
             ->where($db->quoteName('id') . ' = :id')
@@ -651,7 +651,7 @@ public function getHelp()
     public function getAdminTemplate(int $styleId): \stdClass
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['s.template', 's.params', 's.inheritable', 's.parent']))
             ->from($db->quoteName('#__template_styles', 's'))
             ->join(
@@ -696,7 +696,7 @@ public function getAdminTemplate(int $styleId): \stdClass
     public function getSiteTemplates(): array
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['id', 'home', 'template', 's.params', 'inheritable', 'parent']))
             ->from($db->quoteName('#__template_styles', 's'))
             ->where(
diff --git a/administrator/components/com_templates/src/Model/StylesModel.php b/administrator/components/com_templates/src/Model/StylesModel.php
index ea93fa73af4a2..c370e330aa040 100644
--- a/administrator/components/com_templates/src/Model/StylesModel.php
+++ b/administrator/components/com_templates/src/Model/StylesModel.php
@@ -117,7 +117,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(
@@ -201,14 +201,14 @@ protected function getListQuery()
                 // If user selected the templates styles assigned to particular pages.
                 // Subquery to get the language of the selected menu item.
                 $menuItemId               = (int) $menuItemId;
-                $menuItemLanguageSubQuery = $db->getQuery(true);
+                $menuItemLanguageSubQuery = $db->createQuery();
                 $menuItemLanguageSubQuery->select($db->quoteName('language'))
                     ->from($db->quoteName('#__menu'))
                     ->where($db->quoteName('id') . ' = :menuitemid');
                 $query->bind(':menuitemid', $menuItemId, ParameterType::INTEGER);
 
                 // Subquery to get the language of the selected menu item.
-                $templateStylesMenuItemsSubQuery = $db->getQuery(true);
+                $templateStylesMenuItemsSubQuery = $db->createQuery();
                 $templateStylesMenuItemsSubQuery->select($db->quoteName('id'))
                     ->from($db->quoteName('#__menu'))
                     ->where($db->quoteName('template_style_id') . ' = ' . $db->quoteName('a.id'));
diff --git a/administrator/components/com_templates/src/Model/TemplateModel.php b/administrator/components/com_templates/src/Model/TemplateModel.php
index 23eb1bbe12aac..820c8f5e823da 100644
--- a/administrator/components/com_templates/src/Model/TemplateModel.php
+++ b/administrator/components/com_templates/src/Model/TemplateModel.php
@@ -129,7 +129,7 @@ public function getTemplateList()
         $db = $this->getDatabase();
 
         // Create a new query object.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table
         $query->select(
@@ -169,7 +169,7 @@ public function getUpdatedList($state = false, $all = false, $cleanup = false)
         $db = $this->getDatabase();
 
         // Create a new query object.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table
         $query->select(
@@ -316,7 +316,7 @@ public function publish($ids, $value, $exid)
 
         foreach ($ids as $id) {
             if ($value === -3) {
-                $deleteQuery = $db->getQuery(true)
+                $deleteQuery = $db->createQuery()
                     ->delete($db->quoteName('#__template_overrides'))
                     ->where($db->quoteName('hash_id') . ' = :hashid')
                     ->where($db->quoteName('extension_id') . ' = :exid')
@@ -331,7 +331,7 @@ public function publish($ids, $value, $exid)
                     return $e;
                 }
             } elseif ($value === 1 || $value === 0) {
-                $updateQuery = $db->getQuery(true)
+                $updateQuery = $db->createQuery()
                     ->update($db->quoteName('#__template_overrides'))
                     ->set($db->quoteName('state') . ' = :state')
                     ->where($db->quoteName('hash_id') . ' = :hashid')
@@ -645,7 +645,7 @@ public function getTemplate()
             $app = Factory::getApplication();
 
             // Get the template information.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName(['extension_id', 'client_id', 'element', 'name', 'manifest_cache']))
                 ->from($db->quoteName('#__extensions'))
                 ->where($db->quoteName('extension_id') . ' = :pk')
@@ -691,7 +691,7 @@ public function checkNewName()
     {
         $db    = $this->getDatabase();
         $name  = $this->getState('new_name');
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('name') . ' = :name')
@@ -873,7 +873,7 @@ public function getForm($data = [], $loadData = true)
 
         // Codemirror or Editor None should be enabled
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)')
             ->from('#__extensions as a')
             ->where(
@@ -1660,7 +1660,7 @@ public function getPreview()
     {
         $app   = Factory::getApplication();
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName(['id', 'client_id']));
         $query->from($db->quoteName('#__template_styles'));
@@ -2094,7 +2094,7 @@ public function getAllTemplateStyles()
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName(['id', 'title']))
             ->from($db->quoteName('#__template_styles'))
@@ -2128,7 +2128,7 @@ public function copyStyles()
         $db = $this->getDatabase();
 
         // Create a new query object.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName(['title', 'params']))
             ->from($db->quoteName('#__template_styles'))
@@ -2145,7 +2145,7 @@ public function copyStyles()
         }
 
         foreach ($parentStyle as $style) {
-            $query     = $db->getQuery(true);
+            $query     = $db->createQuery();
             $styleName = Text::sprintf('COM_TEMPLATES_COPY_CHILD_TEMPLATE_STYLES', ucfirst($template->element . '_' . $newName), $style->title);
 
             // Insert columns and values
diff --git a/administrator/components/com_templates/src/Model/TemplatesModel.php b/administrator/components/com_templates/src/Model/TemplatesModel.php
index 13047daa92d06..450565ede5599 100644
--- a/administrator/components/com_templates/src/Model/TemplatesModel.php
+++ b/administrator/components/com_templates/src/Model/TemplatesModel.php
@@ -96,7 +96,7 @@ public function updated($exid)
         $db = $this->getDatabase();
 
         // Select the required fields from the table
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('template'))
             ->from($db->quoteName('#__template_overrides'))
             ->where($db->quoteName('extension_id') . ' = :extensionid')
@@ -127,7 +127,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(
diff --git a/administrator/components/com_templates/src/Table/StyleTable.php b/administrator/components/com_templates/src/Table/StyleTable.php
index 37dd1af4bcb26..6568a2c37b9cf 100644
--- a/administrator/components/com_templates/src/Table/StyleTable.php
+++ b/administrator/components/com_templates/src/Table/StyleTable.php
@@ -108,7 +108,7 @@ public function store($updateNulls = false)
         if ($this->home != '0') {
             $clientId = (int)$this->client_id;
             $db       = $this->getDatabase();
-            $query    = $db->getQuery(true)
+            $query    = $db->createQuery()
                 ->update($db->quoteName('#__template_styles'))
                 ->set($db->quoteName('home') . ' = ' . $db->quote('0'))
                 ->where($db->quoteName('client_id') . ' = :clientid')
@@ -139,7 +139,7 @@ public function delete($pk = null)
         if (!\is_null($pk)) {
             $clientId = (int)$this->client_id;
             $db       = $this->getDatabase();
-            $query    = $db->getQuery(true)
+            $query    = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__template_styles'))
                 ->where($db->quoteName('client_id') . ' = :clientid')
diff --git a/administrator/components/com_users/postinstall/multifactorauth.php b/administrator/components/com_users/postinstall/multifactorauth.php
index d1ca2b0f46c21..aecf8858b059c 100644
--- a/administrator/components/com_users/postinstall/multifactorauth.php
+++ b/administrator/components/com_users/postinstall/multifactorauth.php
@@ -44,7 +44,7 @@ function com_users_postinstall_mfa_action(): void
     $db             = Factory::getContainer()->get(DatabaseInterface::class);
     $coreMfaPlugins = ['email', 'totp', 'webauthn', 'yubikey'];
 
-    $query = $db->getQuery(true)
+    $query = $db->createQuery()
         ->update($db->quoteName('#__extensions'))
         ->set($db->quoteName('enabled') . ' = 1')
         ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
diff --git a/administrator/components/com_users/src/Helper/DebugHelper.php b/administrator/components/com_users/src/Helper/DebugHelper.php
index dda89bf802f11..718a70b64730b 100644
--- a/administrator/components/com_users/src/Helper/DebugHelper.php
+++ b/administrator/components/com_users/src/Helper/DebugHelper.php
@@ -38,7 +38,7 @@ public static function getComponents()
     {
         // Initialise variable.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('name AS text, element AS value')
             ->from('#__extensions')
             ->where('enabled >= 1')
diff --git a/administrator/components/com_users/src/Helper/Mfa.php b/administrator/components/com_users/src/Helper/Mfa.php
index f102a580c206d..b60d37c0d2d03 100644
--- a/administrator/components/com_users/src/Helper/Mfa.php
+++ b/administrator/components/com_users/src/Helper/Mfa.php
@@ -264,7 +264,7 @@ public static function getUserMfaRecords(?int $userId): array
 
         /** @var DatabaseInterface $db */
         $db    = Factory::getContainer()->get(DatabaseInterface::class);
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__user_mfa'))
             ->where($db->quoteName('user_id') . ' = :user_id')
diff --git a/administrator/components/com_users/src/Helper/UsersHelper.php b/administrator/components/com_users/src/Helper/UsersHelper.php
index f727cf60bec77..c3ff6a965621b 100644
--- a/administrator/components/com_users/src/Helper/UsersHelper.php
+++ b/administrator/components/com_users/src/Helper/UsersHelper.php
@@ -151,7 +151,7 @@ public static function getVisibleByGroups($rules)
         }
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('title', 'text'))
             ->from($db->quoteName('#__usergroups'))
             ->whereIn($db->quoteName('id'), $rules);
diff --git a/administrator/components/com_users/src/Model/DebuggroupModel.php b/administrator/components/com_users/src/Model/DebuggroupModel.php
index ad28a6009cce7..e458f20356b38 100644
--- a/administrator/components/com_users/src/Model/DebuggroupModel.php
+++ b/administrator/components/com_users/src/Model/DebuggroupModel.php
@@ -177,7 +177,7 @@ public function getGroup()
         $groupId = (int) $this->getState('group_id');
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['id', 'title']))
             ->from($db->quoteName('#__usergroups'))
             ->where($db->quoteName('id') . ' = :id')
@@ -207,7 +207,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(
diff --git a/administrator/components/com_users/src/Model/DebuguserModel.php b/administrator/components/com_users/src/Model/DebuguserModel.php
index 5766b292aa5aa..190b4b011a8ea 100644
--- a/administrator/components/com_users/src/Model/DebuguserModel.php
+++ b/administrator/components/com_users/src/Model/DebuguserModel.php
@@ -196,7 +196,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(
diff --git a/administrator/components/com_users/src/Model/GroupsModel.php b/administrator/components/com_users/src/Model/GroupsModel.php
index 868c02229d4d1..8606f17f644b8 100644
--- a/administrator/components/com_users/src/Model/GroupsModel.php
+++ b/administrator/components/com_users/src/Model/GroupsModel.php
@@ -140,7 +140,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(
@@ -195,7 +195,7 @@ private function populateExtraData(array $items)
         $db = $this->getDatabase();
 
         // Get total enabled users in group.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Count the objects in the user group.
         $query->select('map.group_id, COUNT(DISTINCT map.user_id) AS user_count')
diff --git a/administrator/components/com_users/src/Model/LevelModel.php b/administrator/components/com_users/src/Model/LevelModel.php
index 43d9d360b6d4d..ac35117881ce5 100644
--- a/administrator/components/com_users/src/Model/LevelModel.php
+++ b/administrator/components/com_users/src/Model/LevelModel.php
@@ -52,7 +52,7 @@ public function delete(&$pks)
             if ($table->load($pk)) {
                 // Check if the access level is being used.
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select('DISTINCT access');
 
                 // Get all tables that have the access field
diff --git a/administrator/components/com_users/src/Model/LevelsModel.php b/administrator/components/com_users/src/Model/LevelsModel.php
index bcd81577eebf9..5c8de890426da 100644
--- a/administrator/components/com_users/src/Model/LevelsModel.php
+++ b/administrator/components/com_users/src/Model/LevelsModel.php
@@ -102,7 +102,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(
diff --git a/administrator/components/com_users/src/Model/MailModel.php b/administrator/components/com_users/src/Model/MailModel.php
index b6f5d72597544..b2b039b555b17 100644
--- a/administrator/components/com_users/src/Model/MailModel.php
+++ b/administrator/components/com_users/src/Model/MailModel.php
@@ -136,7 +136,7 @@ public function send()
         } else {
             // Get all users email and group except for senders
             $uid   = (int) $user->id;
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('email'),
diff --git a/administrator/components/com_users/src/Model/MethodsModel.php b/administrator/components/com_users/src/Model/MethodsModel.php
index 0efe426b28c1c..542f77c7d66e3 100644
--- a/administrator/components/com_users/src/Model/MethodsModel.php
+++ b/administrator/components/com_users/src/Model/MethodsModel.php
@@ -97,7 +97,7 @@ public function deleteAll(?User $user = null): void
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__user_mfa'))
             ->where($db->quoteName('user_id') . ' = :user_id')
             ->bind(':user_id', $user->id, ParameterType::INTEGER);
@@ -187,7 +187,7 @@ public function setFlag(User $user, bool $flag = true): void
     {
         $db         = $this->getDatabase();
         $profileKey = 'mfa.dontshow';
-        $query      = $db->getQuery(true)
+        $query      = $db->createQuery()
             ->select($db->quoteName('profile_value'))
             ->from($db->quoteName('#__user_profiles'))
             ->where($db->quoteName('user_id') . ' = :user_id')
diff --git a/administrator/components/com_users/src/Model/NotesModel.php b/administrator/components/com_users/src/Model/NotesModel.php
index 311eed443982b..62d65740b04ef 100644
--- a/administrator/components/com_users/src/Model/NotesModel.php
+++ b/administrator/components/com_users/src/Model/NotesModel.php
@@ -69,7 +69,7 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
     protected function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the required fields from the table.
         $query->select(
diff --git a/administrator/components/com_users/src/Model/UserModel.php b/administrator/components/com_users/src/Model/UserModel.php
index 6172e0aaf5bdb..cb911ab61a7b5 100644
--- a/administrator/components/com_users/src/Model/UserModel.php
+++ b/administrator/components/com_users/src/Model/UserModel.php
@@ -714,7 +714,7 @@ public function batchReset($userIds, $action)
 
         $userIds = ArrayHelper::toInteger($userIds);
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Update the reset flag
         $query->update($db->quoteName('#__users'))
@@ -797,7 +797,7 @@ public function batchUser($groupId, $userIds, $action)
              * unless we are moving the user to a new group.
              */
             if ($doDelete === 'group') {
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
                 $query->select($db->quoteName('user_id'))
                     ->from($db->quoteName('#__user_usergroup_map'))
                     ->whereIn($db->quoteName('user_id'), $userIds);
@@ -840,7 +840,7 @@ public function batchUser($groupId, $userIds, $action)
                     ->bind(':group_id', $groupId, ParameterType::INTEGER);
                 $db->setQuery($query);
             } elseif ($doDelete === 'all') {
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
                 $query->delete($db->quoteName('#__user_usergroup_map'))
                     ->whereIn($db->quoteName('user_id'), $userIds);
             }
@@ -857,7 +857,7 @@ public function batchUser($groupId, $userIds, $action)
 
         // Assign the users to the group if requested.
         if (isset($doAssign)) {
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // First, we need to check if the user is already assigned to a group
             $query->select($db->quoteName('user_id'))
diff --git a/administrator/components/com_users/src/Model/UsersModel.php b/administrator/components/com_users/src/Model/UsersModel.php
index f1af42d2ae35d..a40c754714152 100644
--- a/administrator/components/com_users/src/Model/UsersModel.php
+++ b/administrator/components/com_users/src/Model/UsersModel.php
@@ -196,7 +196,7 @@ public function getItems()
 
             // Get the counts from the database only for the users in the list.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // Join over the group mapping table.
             $query->select('map.user_id, COUNT(map.group_id) AS group_count')
@@ -289,7 +289,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(
@@ -303,7 +303,7 @@ protected function getListQuery()
 
         // Include MFA information
         if (PluginHelper::isEnabled('multifactorauth')) {
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select(
                     [
                         'MIN(' . $db->quoteName('user_id') . ') AS ' . $db->quoteName('uid'),
@@ -597,7 +597,7 @@ private function buildDateRange($range)
     protected function getUserDisplayedGroups($userId)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('title'))
             ->from($db->quoteName('#__usergroups', 'ug'))
             ->join('LEFT', $db->quoteName('#__user_usergroup_map', 'map') . ' ON (ug.id = map.group_id)')
diff --git a/administrator/components/com_users/src/Service/HTML/Users.php b/administrator/components/com_users/src/Service/HTML/Users.php
index 83adfbc60a489..a81dd5fe98ba7 100644
--- a/administrator/components/com_users/src/Service/HTML/Users.php
+++ b/administrator/components/com_users/src/Service/HTML/Users.php
@@ -299,7 +299,7 @@ public function templatestyle($value)
         }
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('title'))
             ->from($db->quoteName('#__template_styles'))
             ->where($db->quoteName('id') . ' = :id')
@@ -403,7 +403,7 @@ public function editor($value)
 
         $db    = Factory::getDbo();
         $lang  = Factory::getLanguage();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('name'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('element') . ' = :element')
diff --git a/administrator/components/com_users/src/Table/MfaTable.php b/administrator/components/com_users/src/Table/MfaTable.php
index c6b3fd7c5c10e..bec60ee2f2203 100644
--- a/administrator/components/com_users/src/Table/MfaTable.php
+++ b/administrator/components/com_users/src/Table/MfaTable.php
@@ -314,7 +314,7 @@ private function switchDefaultRecord(): void
          * user.
          */
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__user_mfa'))
             ->set($db->quoteName('default') . ' = 0')
             ->where($db->quoteName('user_id') . ' = :user_id')
@@ -367,7 +367,7 @@ private function afterDelete($pk): void
              * the `backupcodes` because we might just be regenerating the backup codes.
              */
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__user_mfa'))
                 ->where($db->quoteName('user_id') . ' = :user_id')
                 ->bind(':user_id', $this->deleteFlags[$pk]['user_id'], ParameterType::INTEGER);
@@ -381,7 +381,7 @@ private function afterDelete($pk): void
         // This was the default record. Promote the next available record to default.
         if ($this->deleteFlags[$pk]['default']) {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__user_mfa'))
                 ->where($db->quoteName('user_id') . ' = :user_id')
@@ -394,7 +394,7 @@ private function afterDelete($pk): void
             }
 
             $id    = array_shift($ids);
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName('#__user_mfa'))
                 ->set($db->quoteName('default') . ' = 1')
                 ->where($db->quoteName('id') . ' = :id')
@@ -415,7 +415,7 @@ private function afterDelete($pk): void
     private function getNumRecords(int $userId): int
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__user_mfa'))
             ->where($db->quoteName('user_id') . ' = :user_id')
diff --git a/administrator/components/com_workflow/src/Controller/WorkflowController.php b/administrator/components/com_workflow/src/Controller/WorkflowController.php
index 077e43c0445ae..af0c52bfdfb12 100644
--- a/administrator/components/com_workflow/src/Controller/WorkflowController.php
+++ b/administrator/components/com_workflow/src/Controller/WorkflowController.php
@@ -184,7 +184,7 @@ public function postSaveHook(BaseDatabaseModel $model, $validData = [])
 
             // @todo Moves queries out of the controller.
             $db    = $model->getDbo();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             $query->select('*')
                 ->from($db->quoteName('#__workflow_stages'))
@@ -214,7 +214,7 @@ public function postSaveHook(BaseDatabaseModel $model, $validData = [])
                 $mapping[$oldID] = (int) $table->id;
             }
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('*')
                 ->from($db->quoteName('#__workflow_transitions'))
                 ->where($db->quoteName('workflow_id') . ' = :id')
diff --git a/administrator/components/com_workflow/src/Field/ComponentsWorkflowField.php b/administrator/components/com_workflow/src/Field/ComponentsWorkflowField.php
index cd4ed6361082a..8b520e005b55d 100644
--- a/administrator/components/com_workflow/src/Field/ComponentsWorkflowField.php
+++ b/administrator/components/com_workflow/src/Field/ComponentsWorkflowField.php
@@ -48,7 +48,7 @@ protected function getOptions()
         // Initialise variable.
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT a.name AS text, a.element AS value')
             ->from('#__extensions as a')
             ->where('a.enabled >= 1')
diff --git a/administrator/components/com_workflow/src/Model/StagesModel.php b/administrator/components/com_workflow/src/Model/StagesModel.php
index bd26a985bc8ea..869a8e27f1e48 100644
--- a/administrator/components/com_workflow/src/Model/StagesModel.php
+++ b/administrator/components/com_workflow/src/Model/StagesModel.php
@@ -130,7 +130,7 @@ public function getTable($type = 'Stage', $prefix = 'Administrator', $config = [
     public function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query
             ->select(
diff --git a/administrator/components/com_workflow/src/Model/TransitionsModel.php b/administrator/components/com_workflow/src/Model/TransitionsModel.php
index 7a3171c9cc6ce..28abaeffd5e89 100644
--- a/administrator/components/com_workflow/src/Model/TransitionsModel.php
+++ b/administrator/components/com_workflow/src/Model/TransitionsModel.php
@@ -131,7 +131,7 @@ protected function getReorderConditions($table)
     public function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query
             ->select(
diff --git a/administrator/components/com_workflow/src/Model/WorkflowsModel.php b/administrator/components/com_workflow/src/Model/WorkflowsModel.php
index 1a2f14a0a1585..a660ad10d12cd 100644
--- a/administrator/components/com_workflow/src/Model/WorkflowsModel.php
+++ b/administrator/components/com_workflow/src/Model/WorkflowsModel.php
@@ -165,7 +165,7 @@ protected function countItems($items)
             $item->count_transitions = 0;
         }
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select(
             [
@@ -180,7 +180,7 @@ protected function countItems($items)
 
         $status = $db->setQuery($query)->loadObjectList('workflow_id');
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select(
             [
@@ -216,7 +216,7 @@ protected function countItems($items)
     public function getListQuery()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select(
             [
diff --git a/administrator/components/com_workflow/src/Table/StageTable.php b/administrator/components/com_workflow/src/Table/StageTable.php
index 9392b80750140..f3fa0738d597d 100644
--- a/administrator/components/com_workflow/src/Table/StageTable.php
+++ b/administrator/components/com_workflow/src/Table/StageTable.php
@@ -67,7 +67,7 @@ public function delete($pk = null)
         $app = Factory::getApplication();
         $pk  = (int) $pk;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('default'))
             ->from($db->quoteName('#__workflow_stages'))
             ->where($db->quoteName('id') . ' = :id')
@@ -82,7 +82,7 @@ public function delete($pk = null)
         }
 
         try {
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__workflow_transitions'))
                 ->where(
                     [
@@ -135,7 +135,7 @@ public function check()
             }
         } else {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             $query
                 ->select($db->quoteName('id'))
diff --git a/administrator/components/com_workflow/src/Table/WorkflowTable.php b/administrator/components/com_workflow/src/Table/WorkflowTable.php
index 58d634d1b5b15..e0b269cb3bf7f 100644
--- a/administrator/components/com_workflow/src/Table/WorkflowTable.php
+++ b/administrator/components/com_workflow/src/Table/WorkflowTable.php
@@ -73,7 +73,7 @@ public function delete($pk = null)
         $pk  = (int) $pk;
 
         // Gets the workflow information that is going to be deleted.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('default'))
             ->from($db->quoteName('#__workflows'))
             ->where($db->quoteName('id') . ' = :id')
@@ -89,14 +89,14 @@ public function delete($pk = null)
 
         // Delete the workflow states, then transitions from all tables.
         try {
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__workflow_stages'))
                 ->where($db->quoteName('workflow_id') . ' = :id')
                 ->bind(':id', $pk, ParameterType::INTEGER);
 
             $db->setQuery($query)->execute();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__workflow_transitions'))
                 ->where($db->quoteName('workflow_id') . ' = :id')
                 ->bind(':id', $pk, ParameterType::INTEGER);
@@ -143,7 +143,7 @@ public function check()
             }
         } else {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             $query
                 ->select($db->quoteName('id'))
@@ -301,7 +301,7 @@ protected function _getAssetParentId(?Table $table = null, $id = null)
 
         // Build the query to get the asset id for the parent category.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__assets'))
             ->where($db->quoteName('name') . ' = :extension')
diff --git a/administrator/modules/mod_logged/src/Helper/LoggedHelper.php b/administrator/modules/mod_logged/src/Helper/LoggedHelper.php
index bcefae12b6e81..4e7af474e12de 100644
--- a/administrator/modules/mod_logged/src/Helper/LoggedHelper.php
+++ b/administrator/modules/mod_logged/src/Helper/LoggedHelper.php
@@ -44,7 +44,7 @@ class LoggedHelper
     public function getUsers(Registry $params, CMSApplication $app, DatabaseInterface $db): mixed
     {
         $user  = $app->getIdentity();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('s.time, s.client_id, u.id, u.name, u.username')
             ->from('#__session AS s')
             ->join('RIGHT', '#__users AS u ON s.userid = u.id')
diff --git a/administrator/modules/mod_privacy_dashboard/src/Helper/PrivacyDashboardHelper.php b/administrator/modules/mod_privacy_dashboard/src/Helper/PrivacyDashboardHelper.php
index 2d8e5d2f08ab5..121455ad14658 100644
--- a/administrator/modules/mod_privacy_dashboard/src/Helper/PrivacyDashboardHelper.php
+++ b/administrator/modules/mod_privacy_dashboard/src/Helper/PrivacyDashboardHelper.php
@@ -38,7 +38,7 @@ class PrivacyDashboardHelper implements DatabaseAwareInterface
     public function getPrivacyRequests(): array
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     'COUNT(*) AS count',
diff --git a/administrator/modules/mod_privacy_status/src/Helper/PrivacyStatusHelper.php b/administrator/modules/mod_privacy_status/src/Helper/PrivacyStatusHelper.php
index 75195a0828775..2d0e75331100b 100644
--- a/administrator/modules/mod_privacy_status/src/Helper/PrivacyStatusHelper.php
+++ b/administrator/modules/mod_privacy_status/src/Helper/PrivacyStatusHelper.php
@@ -86,7 +86,7 @@ public function getRequestFormMenuStatus(CMSApplicationInterface $app)
         $lang = '';
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('id'),
@@ -129,7 +129,7 @@ public function getRequestFormMenuStatus(CMSApplicationInterface $app)
                 $params              = ComponentHelper::getParams('com_languages');
                 $defaultSiteLanguage = $params->get('site');
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('id'))
                     ->from($db->quoteName('#__menu'))
                     ->where(
@@ -173,7 +173,7 @@ public function getNumberOfUrgentRequests()
         $period = '-' . $notify;
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select('COUNT(*)')
             ->from($db->quoteName('#__privacy_requests'))
             ->where(
diff --git a/administrator/modules/mod_stats_admin/src/Helper/StatsAdminHelper.php b/administrator/modules/mod_stats_admin/src/Helper/StatsAdminHelper.php
index 4ee2df3276851..3df2cc3f1585c 100644
--- a/administrator/modules/mod_stats_admin/src/Helper/StatsAdminHelper.php
+++ b/administrator/modules/mod_stats_admin/src/Helper/StatsAdminHelper.php
@@ -44,7 +44,7 @@ public function getStatsData(Registry $params, CMSApplication $app, DatabaseInte
         $user = $app->getIdentity();
 
         $rows  = [];
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $serverinfo = $params->get('serverinfo', 0);
         $siteinfo   = $params->get('siteinfo', 0);
diff --git a/components/com_banners/src/Model/BannerModel.php b/components/com_banners/src/Model/BannerModel.php
index d1f9e469d5755..61a46d84c26f0 100644
--- a/components/com_banners/src/Model/BannerModel.php
+++ b/components/com_banners/src/Model/BannerModel.php
@@ -56,7 +56,7 @@ public function click()
 
         // Update click count
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->update($db->quoteName('#__banners'))
             ->set($db->quoteName('clicks') . ' = ' . $db->quoteName('clicks') . ' + 1')
@@ -87,7 +87,7 @@ public function click()
             $trackDate = Factory::getDate()->format('Y-m-d H:00:00');
             $trackDate = Factory::getDate($trackDate)->toSql();
 
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             $query->select($db->quoteName('count'))
                 ->from($db->quoteName('#__banner_tracks'))
@@ -111,7 +111,7 @@ public function click()
 
             $count = $db->loadResult();
 
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             if ($count) {
                 // Update count
@@ -171,7 +171,7 @@ public function &getItem()
             $db = $this->getDatabase();
 
             $loader = function ($id) use ($db) {
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
 
                 $query->select(
                     [
diff --git a/components/com_banners/src/Model/BannersModel.php b/components/com_banners/src/Model/BannersModel.php
index b1d0e8b23d3c7..34aafc68cf207 100644
--- a/components/com_banners/src/Model/BannersModel.php
+++ b/components/com_banners/src/Model/BannersModel.php
@@ -65,7 +65,7 @@ protected function getStoreId($id = '')
     protected function getListQuery()
     {
         $db         = $this->getDatabase();
-        $query      = $db->getQuery(true);
+        $query      = $db->createQuery();
         $ordering   = $this->getState('filter.ordering');
         $tagSearch  = $this->getState('filter.tag_search');
         $cid        = (int) $this->getState('filter.client_id');
@@ -138,7 +138,7 @@ protected function getListQuery()
                 $levels = (int) $this->getState('filter.max_category_levels', '1');
 
                 // Create a subquery for the subcategory list
-                $subQuery = $db->getQuery(true);
+                $subQuery = $db->createQuery();
                 $subQuery->select($db->quoteName('sub.id'))
                     ->from($db->quoteName('#__categories', 'sub'))
                     ->join(
@@ -305,7 +305,7 @@ public function impress()
         }
 
         // Increment impression made
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->update($db->quoteName('#__banners'))
             ->set($db->quoteName('impmade') . ' = ' . $db->quoteName('impmade') . ' + 1')
             ->whereIn($db->quoteName('id'), $bid);
@@ -333,7 +333,7 @@ public function impress()
             if ($trackImpressions > 0) {
                 // Is track already created?
                 // Update count
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
                 $query->update($db->quoteName('#__banner_tracks'))
                     ->set($db->quoteName('count') . ' = ' . $db->quoteName('count') . ' + 1')
                     ->where(
@@ -356,7 +356,7 @@ public function impress()
 
                 if ($db->getAffectedRows() === 0) {
                     // Insert new count
-                    $query = $db->getQuery(true);
+                    $query = $db->createQuery();
                     $query->insert($db->quoteName('#__banner_tracks'))
                         ->columns(
                             [
diff --git a/components/com_config/src/Model/ModulesModel.php b/components/com_config/src/Model/ModulesModel.php
index bad8c1ed7de91..258a7fa893ec9 100644
--- a/components/com_config/src/Model/ModulesModel.php
+++ b/components/com_config/src/Model/ModulesModel.php
@@ -177,7 +177,7 @@ public function getPositions()
     public static function getActivePositions($clientId, $editPositions = false)
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT position')
             ->from($db->quoteName('#__modules'))
             ->where($db->quoteName('client_id') . ' = ' . (int) $clientId)
diff --git a/components/com_contact/src/Model/CategoryModel.php b/components/com_contact/src/Model/CategoryModel.php
index 5f978b9d9a49f..4ddfa2bdc023f 100644
--- a/components/com_contact/src/Model/CategoryModel.php
+++ b/components/com_contact/src/Model/CategoryModel.php
@@ -165,7 +165,7 @@ protected function getListQuery()
         $db = $this->getDatabase();
 
         /** @var \Joomla\Database\DatabaseQuery $query */
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($this->getState('list.select', 'a.*'))
             ->select($this->getSlugColumn($query, 'a.id', 'a.alias') . ' AS slug')
@@ -187,7 +187,7 @@ protected function getListQuery()
             $levels = (int) $this->getState('filter.max_category_levels', 1);
 
             // Create a subquery for the subcategory list
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select($db->quoteName('sub.id'))
                 ->from($db->quoteName('#__categories', 'sub'))
                 ->join(
diff --git a/components/com_contact/src/Model/ContactModel.php b/components/com_contact/src/Model/ContactModel.php
index 5aa1483f720f6..fc81a69b20a2e 100644
--- a/components/com_contact/src/Model/ContactModel.php
+++ b/components/com_contact/src/Model/ContactModel.php
@@ -180,7 +180,7 @@ public function getItem($pk = null)
         if (!isset($this->_item[$pk])) {
             try {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
 
                 $query->select($this->getState('item.select', 'a.*'))
                     ->select($this->getSlugColumn($query, 'a.id', 'a.alias') . ' AS slug')
@@ -300,7 +300,7 @@ protected function buildContactExtendedData($contact)
         $user      = $this->getCurrentUser();
         $groups    = $user->getAuthorisedViewLevels();
         $published = $this->getState('filter.published');
-        $query     = $db->getQuery(true);
+        $query     = $db->createQuery();
 
         // If we are showing a contact list, then the contact parameters take priority
         // So merge the contact parameters with the merged parameters
diff --git a/components/com_contact/src/Model/FeaturedModel.php b/components/com_contact/src/Model/FeaturedModel.php
index 9ee414bb4334d..a4f99c22caf03 100644
--- a/components/com_contact/src/Model/FeaturedModel.php
+++ b/components/com_contact/src/Model/FeaturedModel.php
@@ -89,7 +89,7 @@ protected function getListQuery()
 
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select required fields from the categories.
         $query->select($this->getState('list.select', 'a.*'))
diff --git a/components/com_contact/src/Service/Router.php b/components/com_contact/src/Service/Router.php
index f72eb1d2222f2..bc02d57c9cf51 100644
--- a/components/com_contact/src/Service/Router.php
+++ b/components/com_contact/src/Service/Router.php
@@ -253,7 +253,7 @@ public function getCategoriesId($segment, $query)
     public function getContactId($segment, $query)
     {
         if ($this->noIDs) {
-            $dbquery = $this->db->getQuery(true);
+            $dbquery = $this->db->createQuery();
             $dbquery->select($this->db->quoteName('id'))
                 ->from($this->db->quoteName('#__contact_details'))
                 ->where($this->db->quoteName('alias') . ' = :segment')
@@ -279,7 +279,7 @@ public function getContactId($segment, $query)
         $id = (int) $segment;
 
         if ($id) {
-            $dbquery = $this->db->getQuery(true);
+            $dbquery = $this->db->createQuery();
             $dbquery->select($this->db->quoteName('alias'))
                 ->from($this->db->quoteName('#__contact_details'))
                 ->where($this->db->quoteName('id') . ' = :id')
diff --git a/components/com_content/src/Helper/QueryHelper.php b/components/com_content/src/Helper/QueryHelper.php
index c62c6f48834cf..9366461af33a0 100644
--- a/components/com_content/src/Helper/QueryHelper.php
+++ b/components/com_content/src/Helper/QueryHelper.php
@@ -116,7 +116,7 @@ public static function orderbySecondary($orderby, $orderDate = 'created', ?Datab
                 break;
 
             case 'random':
-                $orderby = $db->getQuery(true)->rand();
+                $orderby = $db->createQuery()->rand();
                 break;
 
             case 'vote':
diff --git a/components/com_content/src/Model/ArchiveModel.php b/components/com_content/src/Model/ArchiveModel.php
index d08cd94041293..cc4849ed6379e 100644
--- a/components/com_content/src/Model/ArchiveModel.php
+++ b/components/com_content/src/Model/ArchiveModel.php
@@ -157,7 +157,7 @@ public function getYears()
     {
         $db        = $this->getDatabase();
         $nowDate   = Factory::getDate()->toSql();
-        $query     = $db->getQuery(true);
+        $query     = $db->createQuery();
         $queryDate = QueryHelper::getQueryDate($this->state->get('params')->get('order_date'), $db);
         $years     = $query->year($queryDate);
         $yearSort  = $this->state->get('params')->get('year_sort_order', 'ASC');
diff --git a/components/com_content/src/Model/ArticleModel.php b/components/com_content/src/Model/ArticleModel.php
index c0d536a94ee4b..10d03fe5b33e1 100644
--- a/components/com_content/src/Model/ArticleModel.php
+++ b/components/com_content/src/Model/ArticleModel.php
@@ -95,7 +95,7 @@ public function getItem($pk = null)
         if (!isset($this->_item[$pk])) {
             try {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
 
                 $query->select(
                     $this->getState(
@@ -319,7 +319,7 @@ public function storeVote($pk = 0, $rate = 0)
 
             // Initialize variables.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // Create the base select statement.
             $query->select('*')
@@ -341,7 +341,7 @@ public function storeVote($pk = 0, $rate = 0)
 
             // There are no ratings yet, so lets insert our rating
             if (!$rating) {
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
 
                 // Create the base insert statement.
                 $query->insert($db->quoteName('#__content_rating'))
@@ -370,7 +370,7 @@ public function storeVote($pk = 0, $rate = 0)
                 }
             } else {
                 if ($userIP != $rating->lastip) {
-                    $query = $db->getQuery(true);
+                    $query = $db->createQuery();
 
                     // Create the base update statement.
                     $query->update($db->quoteName('#__content_rating'))
diff --git a/components/com_content/src/Model/ArticlesModel.php b/components/com_content/src/Model/ArticlesModel.php
index a87bb7fccb44a..ab2dfab872ea4 100644
--- a/components/com_content/src/Model/ArticlesModel.php
+++ b/components/com_content/src/Model/ArticlesModel.php
@@ -195,7 +195,7 @@ protected function getListQuery()
         // Create a new query object.
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $nowDate = Factory::getDate()->toSql();
 
@@ -413,7 +413,7 @@ protected function getListQuery()
                 $levels     = (int) $this->getState('filter.max_category_levels', 1);
 
                 // Create a subquery for the subcategory list
-                $subQuery = $db->getQuery(true)
+                $subQuery = $db->createQuery()
                     ->select($db->quoteName('sub.id'))
                     ->from($db->quoteName('#__categories', 'sub'))
                     ->join(
@@ -625,7 +625,7 @@ protected function getListQuery()
             $tagId = ArrayHelper::toInteger($tagId);
 
             if ($tagId) {
-                $subQuery = $db->getQuery(true)
+                $subQuery = $db->createQuery()
                     ->select('DISTINCT ' . $db->quoteName('content_item_id'))
                     ->from($db->quoteName('#__contentitem_tag_map'))
                     ->where(
@@ -826,7 +826,7 @@ public function countItemsByMonth()
     {
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Get the list query.
         $listQuery = $this->getListQuery();
diff --git a/components/com_content/src/Model/FormModel.php b/components/com_content/src/Model/FormModel.php
index bd916c0946953..e32efa85d9f06 100644
--- a/components/com_content/src/Model/FormModel.php
+++ b/components/com_content/src/Model/FormModel.php
@@ -157,7 +157,7 @@ public function getItem($itemId = null)
             if ($value->featured) {
                 // Get featured dates.
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select(
                         [
                             $db->quoteName('featured_up'),
@@ -292,7 +292,7 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
                 $categoryId = (int) $params->get('catid');
 
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('language'))
                     ->from($db->quoteName('#__categories'))
                     ->where($db->quoteName('id') . ' = :categoryId')
diff --git a/components/com_content/src/Service/Router.php b/components/com_content/src/Service/Router.php
index d82ce68771e11..177f1d4ff091a 100644
--- a/components/com_content/src/Service/Router.php
+++ b/components/com_content/src/Service/Router.php
@@ -254,7 +254,7 @@ public function getCategoriesId($segment, $query)
     public function getArticleId($segment, $query)
     {
         if ($this->noIDs) {
-            $dbquery = $this->db->getQuery(true);
+            $dbquery = $this->db->createQuery();
             $dbquery->select($this->db->quoteName('id'))
                 ->from($this->db->quoteName('#__content'))
                 ->where($this->db->quoteName('alias') . ' = :segment')
@@ -280,7 +280,7 @@ public function getArticleId($segment, $query)
         $id = (int) $segment;
 
         if ($id) {
-            $dbquery = $this->db->getQuery(true);
+            $dbquery = $this->db->createQuery();
             $dbquery->select($this->db->quoteName('alias'))
                 ->from($this->db->quoteName('#__content'))
                 ->where($this->db->quoteName('id') . ' = :id')
diff --git a/components/com_finder/src/Helper/FinderHelper.php b/components/com_finder/src/Helper/FinderHelper.php
index 70a42092bef6f..fbc9a72a28eae 100644
--- a/components/com_finder/src/Helper/FinderHelper.php
+++ b/components/com_finder/src/Helper/FinderHelper.php
@@ -48,7 +48,7 @@ public static function logSearch(Query $searchquery, $resultCount = 0)
 
         // Initialise our variables
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Sanitise the term for the database
         $temp              = new \stdClass();
diff --git a/components/com_finder/src/Model/SearchModel.php b/components/com_finder/src/Model/SearchModel.php
index 959de428f23cf..e16cb2b98f3a0 100644
--- a/components/com_finder/src/Model/SearchModel.php
+++ b/components/com_finder/src/Model/SearchModel.php
@@ -155,7 +155,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(
@@ -302,7 +302,7 @@ protected function getListQuery()
 
         // Check if there are any excluded terms to deal with.
         if (\count($this->excludedTerms)) {
-            $query2 = $db->getQuery(true);
+            $query2 = $db->createQuery();
             $query2->select('e.link_id')
                 ->from($db->quoteName('#__finder_links_terms', 'e'))
                 ->where('e.term_id IN (' . implode(',', $this->excludedTerms) . ')');
diff --git a/components/com_finder/src/Model/SuggestionsModel.php b/components/com_finder/src/Model/SuggestionsModel.php
index d3a9e5d65e1ed..894364600b8f1 100644
--- a/components/com_finder/src/Model/SuggestionsModel.php
+++ b/components/com_finder/src/Model/SuggestionsModel.php
@@ -73,9 +73,9 @@ protected function getListQuery()
 
         // Create a new query object.
         $db          = $this->getDatabase();
-        $termIdQuery = $db->getQuery(true);
-        $termQuery   = $db->getQuery(true);
-        $aQuery      = $db->getQuery(true);
+        $termIdQuery = $db->createQuery();
+        $termQuery   = $db->createQuery();
+        $aQuery      = $db->createQuery();
 
         // Limit term count to a reasonable number of results to reduce main query join size
         $termIdQuery->select('ti.term_id')
diff --git a/components/com_newsfeeds/src/Model/CategoryModel.php b/components/com_newsfeeds/src/Model/CategoryModel.php
index edc96e06f54e7..2e4ac20f0a444 100644
--- a/components/com_newsfeeds/src/Model/CategoryModel.php
+++ b/components/com_newsfeeds/src/Model/CategoryModel.php
@@ -159,7 +159,7 @@ protected function getListQuery()
         // Create a new query object.
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select required fields from the categories.
         $query->select($this->getState('list.select', $db->quoteName('a') . '.*'))
diff --git a/components/com_newsfeeds/src/Model/NewsfeedModel.php b/components/com_newsfeeds/src/Model/NewsfeedModel.php
index ddfc24600dc5b..7e97fb84c84b1 100644
--- a/components/com_newsfeeds/src/Model/NewsfeedModel.php
+++ b/components/com_newsfeeds/src/Model/NewsfeedModel.php
@@ -87,7 +87,7 @@ public function &getItem($pk = null)
         if (!isset($this->_item[$pk])) {
             try {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select(
                         [
                             $this->getState('item.select', $db->quoteName('a') . '.*'),
diff --git a/components/com_newsfeeds/src/Service/Router.php b/components/com_newsfeeds/src/Service/Router.php
index 179a55b82e760..1cc90077c2801 100644
--- a/components/com_newsfeeds/src/Service/Router.php
+++ b/components/com_newsfeeds/src/Service/Router.php
@@ -234,7 +234,7 @@ public function getCategoriesId($segment, $query)
     public function getNewsfeedId($segment, $query)
     {
         if ($this->noIDs) {
-            $dbquery = $this->db->getQuery(true);
+            $dbquery = $this->db->createQuery();
             $dbquery->select($this->db->quoteName('id'))
                 ->from($this->db->quoteName('#__newsfeeds'))
                 ->where($this->db->quoteName('alias') . ' = :segment')
@@ -260,7 +260,7 @@ public function getNewsfeedId($segment, $query)
         $id = (int) $segment;
 
         if ($id) {
-            $dbquery = $this->db->getQuery(true);
+            $dbquery = $this->db->createQuery();
             $dbquery->select($this->db->quoteName('alias'))
                 ->from($this->db->quoteName('#__newsfeeds'))
                 ->where($this->db->quoteName('id') . ' = :id')
diff --git a/components/com_privacy/src/Model/RemindModel.php b/components/com_privacy/src/Model/RemindModel.php
index 5df7813986413..5fc4e9e553303 100644
--- a/components/com_privacy/src/Model/RemindModel.php
+++ b/components/com_privacy/src/Model/RemindModel.php
@@ -70,7 +70,7 @@ public function remindRequest($data)
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['r.id', 'r.user_id', 'r.token']));
         $query->from($db->quoteName('#__privacy_consents', 'r'));
         $query->join(
diff --git a/components/com_privacy/src/Model/RequestModel.php b/components/com_privacy/src/Model/RequestModel.php
index 3543158a30eae..0a7f8632db7b8 100644
--- a/components/com_privacy/src/Model/RequestModel.php
+++ b/components/com_privacy/src/Model/RequestModel.php
@@ -89,7 +89,7 @@ public function createRequest($data)
 
         // Search for an open information request matching the email and type
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(id)')
             ->from($db->quoteName('#__privacy_requests'))
             ->where($db->quoteName('email') . ' = :email')
diff --git a/components/com_tags/src/Model/TagsModel.php b/components/com_tags/src/Model/TagsModel.php
index 60e81d16a6e53..97b2dc1b51d81 100644
--- a/components/com_tags/src/Model/TagsModel.php
+++ b/components/com_tags/src/Model/TagsModel.php
@@ -103,7 +103,7 @@ protected function getListQuery()
 
         // Create a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select required fields from the tags.
         $query->select('a.*, u.name as created_by_user_name, u.email')
diff --git a/components/com_tags/src/Service/Router.php b/components/com_tags/src/Service/Router.php
index 213e189a5f50f..458ad65507c46 100644
--- a/components/com_tags/src/Service/Router.php
+++ b/components/com_tags/src/Service/Router.php
@@ -107,7 +107,7 @@ public function preprocess($query)
 
             foreach ($query['id'] as &$item) {
                 if (!strpos($item, ':')) {
-                    $dbquery = $this->db->getQuery(true);
+                    $dbquery = $this->db->createQuery();
                     $id      = (int) $item;
 
                     $dbquery->select($dbquery->quoteName('alias'))
@@ -399,7 +399,7 @@ protected function buildLookup()
                         continue;
                     }
 
-                    $query = $this->db->getQuery(true);
+                    $query = $this->db->createQuery();
                     $query->select($this->db->quoteName('a.id'))
                         ->from($this->db->quoteName('#__tags', 'a'))
                         ->leftJoin(
@@ -434,7 +434,7 @@ protected function fixSegment($segment)
         // Try to find tag id
         $alias = str_replace(':', '-', $segment);
 
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('id'))
             ->from($this->db->quoteName('#__tags'))
             ->where($this->db->quoteName('alias') . ' = :alias')
diff --git a/components/com_users/src/Model/LoginModel.php b/components/com_users/src/Model/LoginModel.php
index 0d9780ebc3b2b..79b3800adc987 100644
--- a/components/com_users/src/Model/LoginModel.php
+++ b/components/com_users/src/Model/LoginModel.php
@@ -137,7 +137,7 @@ public function getMenuLanguage(int $id): string
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('language'))
             ->from($db->quoteName('#__menu'))
             ->where($db->quoteName('client_id') . ' = 0')
diff --git a/components/com_users/src/Model/RegistrationModel.php b/components/com_users/src/Model/RegistrationModel.php
index 96a288feb19ac..d344c6190c58a 100644
--- a/components/com_users/src/Model/RegistrationModel.php
+++ b/components/com_users/src/Model/RegistrationModel.php
@@ -89,7 +89,7 @@ public function getUserIdFromToken($token)
         $db       = $this->getDatabase();
 
         // Get the user id based on the token.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select($db->quoteName('id'))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('activation') . ' = :activation')
@@ -159,7 +159,7 @@ public function activate($token)
 
             // Get all admin users
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName(['name', 'email', 'sendEmail', 'id']))
                 ->from($db->quoteName('#__users'))
                 ->where($db->quoteName('sendEmail') . ' = 1')
@@ -466,7 +466,7 @@ public function register($temp)
         // From this moment the user is registered, so we don't return false anymore
         $app   = Factory::getApplication();
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Compile the notification mail values.
         $data             = ArrayHelper::fromObject($user, false);
diff --git a/components/com_users/src/Model/RemindModel.php b/components/com_users/src/Model/RemindModel.php
index 937147d5402cd..38fbfa59fd32e 100644
--- a/components/com_users/src/Model/RemindModel.php
+++ b/components/com_users/src/Model/RemindModel.php
@@ -133,7 +133,7 @@ public function processRemindRequest($data)
 
         // Find the user id for the given email address.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__users'))
             ->where('LOWER(' . $db->quoteName('email') . ') = LOWER(:email)')
diff --git a/components/com_users/src/Model/ResetModel.php b/components/com_users/src/Model/ResetModel.php
index 9ee8bc51f4d9c..65cbf35865356 100644
--- a/components/com_users/src/Model/ResetModel.php
+++ b/components/com_users/src/Model/ResetModel.php
@@ -302,7 +302,7 @@ public function processResetConfirm($data)
 
         // Find the user id for the given token.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['activation', 'id', 'block']))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('username') . ' = :username')
@@ -397,7 +397,7 @@ public function processResetRequest($data)
 
         // Find the user id for the given email address.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__users'))
             ->where('LOWER(' . $db->quoteName('email') . ') = LOWER(:email)')
diff --git a/installation/src/Model/AutomatedUpdatesModel.php b/installation/src/Model/AutomatedUpdatesModel.php
index bfbe4d9ba716b..29548d4ce2c53 100644
--- a/installation/src/Model/AutomatedUpdatesModel.php
+++ b/installation/src/Model/AutomatedUpdatesModel.php
@@ -51,7 +51,7 @@ public function disable()
     {
         // Get the params of com_joomlaupdate
         $db        = $this->getDatabase();
-        $query     = $db->getQuery(true);
+        $query     = $db->createQuery();
 
         $query->select('params')
             ->from($db->quoteName('#__extensions'))
diff --git a/installation/src/Model/ConfigurationModel.php b/installation/src/Model/ConfigurationModel.php
index 915d7b469b42f..c6b7a5f12a165 100644
--- a/installation/src/Model/ConfigurationModel.php
+++ b/installation/src/Model/ConfigurationModel.php
@@ -99,7 +99,7 @@ public function setup($options)
             }
         }
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('extension_id')
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('name') . ' = ' . $db->quote('files_joomla'));
@@ -287,7 +287,7 @@ protected function updateUserIds($db)
 
         foreach ($updatesArray as $table => $fields) {
             foreach ($fields as $field) {
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->update($db->quoteName($table))
                     ->set($db->quoteName($field) . ' = ' . $db->quote($userId))
                     ->where($db->quoteName($field) . ' != 0')
@@ -509,7 +509,7 @@ private function createRootUser($options, $db)
         date_default_timezone_set('UTC');
         $installdate = date('Y-m-d H:i:s');
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('id') . ' = ' . $db->quote($userId));
@@ -570,7 +570,7 @@ private function createRootUser($options, $db)
 
             // Synch the sequence if pgsql
             if (($db->getServerType() === 'postgresql') && (!$result)) {
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select('MAX(' . $db->quoteName('id') . ') + 1 AS ' . $db->quoteName('id'))
                     ->from($db->quoteName('#__users'));
                 $db->setQuery($query);
diff --git a/installation/src/Model/LanguagesModel.php b/installation/src/Model/LanguagesModel.php
index 71386cfeb1c83..e52069ca40954 100644
--- a/installation/src/Model/LanguagesModel.php
+++ b/installation/src/Model/LanguagesModel.php
@@ -95,7 +95,7 @@ public function getItems()
     {
         // Get the extension_id of the en-GB package.
         $db        = $this->getDatabase();
-        $extQuery  = $db->getQuery(true);
+        $extQuery  = $db->createQuery();
 
         $extQuery->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__extensions'))
@@ -117,7 +117,7 @@ public function getItems()
              */
             $updater->findUpdates([$extId], 0);
 
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // Select the required fields from the updates table.
             $query->select($db->quoteName(['update_id', 'name', 'element', 'version']))
@@ -380,7 +380,7 @@ protected function getLanguageList($clientId = 1)
     {
         // Create a new db object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select field element from the extensions table.
         $query->select($db->quoteName(['element', 'name']))
diff --git a/libraries/src/Access/Access.php b/libraries/src/Access/Access.php
index f8a8ae036624f..4a62c520cbfdb 100644
--- a/libraries/src/Access/Access.php
+++ b/libraries/src/Access/Access.php
@@ -283,7 +283,7 @@ protected static function preloadPermissions($assetType, $reload = false)
         $assetKey = $extensionName . '.%';
 
         // Get a fresh query object.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['id', 'name', 'rules', 'parent_id']))
             ->from($db->quoteName('#__assets'))
             ->where(
@@ -348,7 +348,7 @@ protected static function preloadComponents()
         $db = Factory::getDbo();
 
         // Get the asset info for all assets in asset names list.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['id', 'name', 'rules', 'parent_id']))
             ->from($db->quoteName('#__assets'))
             ->whereIn($db->quoteName('name'), $components, ParameterType::STRING);
@@ -569,7 +569,7 @@ public static function getAssetRules($assetKey, $recursive = false, $recursivePa
         $db = Factory::getDbo();
 
         // Build the database query to get the rules for the asset.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName($recursive ? 'b.rules' : 'a.rules', 'rules'))
             ->from($db->quoteName('#__assets', 'a'));
 
@@ -798,7 +798,7 @@ public static function getGroupTitle($groupId)
 
         // Fetch the group title from the database
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select($db->quoteName('title'))
             ->from($db->quoteName('#__usergroups'))
             ->where($db->quoteName('id') . ' = :groupId')
@@ -840,7 +840,7 @@ public static function getGroupsByUser($userId, $recursive = true)
                 $db = Factory::getDbo();
 
                 // Build the database query to get the rules for the asset.
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName($recursive ? 'b.id' : 'a.id'));
 
                 if (empty($userId)) {
@@ -905,7 +905,7 @@ public static function getUsersByGroup($groupId, $recursive = false)
         $test = $recursive ? ' >= ' : ' = ';
 
         // First find the users contained in the group
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT(' . $db->quoteName('user_id') . ')')
             ->from($db->quoteName('#__usergroups', 'ug1'))
             ->join(
@@ -944,7 +944,7 @@ public static function getAuthorisedViewLevels($userId)
             $db = Factory::getDbo();
 
             // Build the base query.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName(['id', 'rules']))
                 ->from($db->quoteName('#__viewlevels'));
 
diff --git a/libraries/src/Application/MultiFactorAuthenticationHandler.php b/libraries/src/Application/MultiFactorAuthenticationHandler.php
index daf195510469b..84fa97c40eba0 100644
--- a/libraries/src/Application/MultiFactorAuthenticationHandler.php
+++ b/libraries/src/Application/MultiFactorAuthenticationHandler.php
@@ -348,7 +348,7 @@ private function hasRejectedMultiFactorAuthenticationSetup(): bool
         $profileKey = 'mfa.dontshow';
         /** @var DatabaseInterface $db */
         $db         = Factory::getContainer()->get(DatabaseInterface::class);
-        $query      = $db->getQuery(true)
+        $query      = $db->createQuery()
             ->select($db->quoteName('profile_value'))
             ->from($db->quoteName('#__user_profiles'))
             ->where($db->quoteName('user_id') . ' = :userId')
@@ -444,7 +444,7 @@ private function migrateFromLegacyMFA(): void
             // Delete any other record with the same user_id and Method.
             $method = 'emergencycodes';
             $userId = $user->id;
-            $query  = $db->getQuery(true)
+            $query  = $db->createQuery()
                 ->delete($db->quoteName('#__user_mfa'))
                 ->where($db->quoteName('user_id') . ' = :user_id')
                 ->where($db->quoteName('method') . ' = :method')
diff --git a/libraries/src/Categories/Categories.php b/libraries/src/Categories/Categories.php
index 24b8ee3310c26..416601fb0babd 100644
--- a/libraries/src/Categories/Categories.php
+++ b/libraries/src/Categories/Categories.php
@@ -256,7 +256,7 @@ protected function _load($id)
         // Record that has this $id has been checked
         $this->_checkedCategories[$id] = true;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('c.id'),
@@ -351,7 +351,7 @@ protected function _load($id)
 
         // Note: i for item
         if ($this->_options['countItems'] == 1) {
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select('COUNT(' . $db->quoteName($db->escape('i.' . $this->_key)) . ')')
                 ->from($db->quoteName($db->escape($this->_table), 'i'))
                 ->where($db->quoteName($db->escape('i.' . $this->_field)) . ' = ' . $db->quoteName('c.id'));
diff --git a/libraries/src/Component/ComponentHelper.php b/libraries/src/Component/ComponentHelper.php
index eb508008a035d..5a82570e40be7 100644
--- a/libraries/src/Component/ComponentHelper.php
+++ b/libraries/src/Component/ComponentHelper.php
@@ -382,7 +382,7 @@ protected static function load()
     {
         $loader = function () {
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName(['extension_id', 'element', 'params', 'enabled'], ['id', 'option', null, null]))
                 ->from($db->quoteName('#__extensions'))
                 ->where(
diff --git a/libraries/src/Component/Router/Rules/PreprocessRules.php b/libraries/src/Component/Router/Rules/PreprocessRules.php
index b75a9e42ba576..831ef15f62c58 100644
--- a/libraries/src/Component/Router/Rules/PreprocessRules.php
+++ b/libraries/src/Component/Router/Rules/PreprocessRules.php
@@ -107,7 +107,7 @@ public function preprocess(&$query)
             return;
         }
 
-        $dbquery = $this->getDatabase()->getQuery(true);
+        $dbquery = $this->getDatabase()->createQuery();
         $id      = (int) $query[$key];
 
         $dbquery->select($dbquery->quoteName('alias'))
diff --git a/libraries/src/Console/AddUserCommand.php b/libraries/src/Console/AddUserCommand.php
index 93c944641852a..578b46fa79ddf 100644
--- a/libraries/src/Console/AddUserCommand.php
+++ b/libraries/src/Console/AddUserCommand.php
@@ -189,7 +189,7 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
     protected function getGroupId($groupName)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__usergroups'))
             ->where($db->quoteName('title') . ' = :groupName')
@@ -257,7 +257,7 @@ protected function getUserGroups(): array
         }
 
         // Generate select list for user
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('title'))
             ->from($db->quoteName('#__usergroups'))
             ->order($db->quoteName('id') . 'ASC');
diff --git a/libraries/src/Console/AddUserToGroupCommand.php b/libraries/src/Console/AddUserToGroupCommand.php
index bd2bcf9fc274b..c7cf919a828c4 100644
--- a/libraries/src/Console/AddUserToGroupCommand.php
+++ b/libraries/src/Console/AddUserToGroupCommand.php
@@ -120,7 +120,7 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
         $this->userGroups = $this->getGroups($user);
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('title'))
             ->from($db->quoteName('#__usergroups'))
             ->where($db->quoteName('id') . ' = :userGroup');
@@ -182,7 +182,7 @@ protected function getGroups($user): array
         $userGroups = Access::getGroupsByUser($user->id, false);
 
         // Generate select list for user
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('title'))
             ->from($db->quoteName('#__usergroups'))
             ->whereNotIn($db->quoteName('id'), $userGroups)
@@ -218,7 +218,7 @@ protected function getGroups($user): array
     protected function getGroupId($groupName)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__usergroups'))
             ->where($db->quoteName('title') . '= :groupName')
@@ -240,7 +240,7 @@ protected function getGroupId($groupName)
     protected function getUserId($username)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('username') . '= :username')
diff --git a/libraries/src/Console/DeleteUserCommand.php b/libraries/src/Console/DeleteUserCommand.php
index 6dc7f5c8f9dd9..ac100d0bdefce 100644
--- a/libraries/src/Console/DeleteUserCommand.php
+++ b/libraries/src/Console/DeleteUserCommand.php
@@ -119,7 +119,7 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
         if ($user->block == 0) {
             foreach ($groups as $groupId) {
                 if (Access::checkGroup($groupId, 'core.admin')) {
-                    $queryUser = $db->getQuery(true);
+                    $queryUser = $db->createQuery();
                     $queryUser->select('COUNT(*)')
                         ->from($db->quoteName('#__users', 'u'))
                         ->leftJoin(
diff --git a/libraries/src/Console/ExtensionDiscoverInstallCommand.php b/libraries/src/Console/ExtensionDiscoverInstallCommand.php
index facf35dad600c..68bd8f7d55bbc 100644
--- a/libraries/src/Console/ExtensionDiscoverInstallCommand.php
+++ b/libraries/src/Console/ExtensionDiscoverInstallCommand.php
@@ -127,7 +127,7 @@ public function processDiscover($eid): int
 
         if ($eid === -1) {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName(['extension_id']))
                 ->from($db->quoteName('#__extensions'))
                 ->where($db->quoteName('state') . ' = -1');
diff --git a/libraries/src/Console/ExtensionsListCommand.php b/libraries/src/Console/ExtensionsListCommand.php
index 6015d3eb66806..faf607aeb3e2c 100644
--- a/libraries/src/Console/ExtensionsListCommand.php
+++ b/libraries/src/Console/ExtensionsListCommand.php
@@ -155,7 +155,7 @@ public function setExtensions($extensions = null): void
     private function getAllExtensionsFromDB(): array
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select('*')
             ->from('#__extensions');
         $db->setQuery($query);
diff --git a/libraries/src/Console/FinderIndexCommand.php b/libraries/src/Console/FinderIndexCommand.php
index 66d7ebed1b5dc..7805fef837214 100644
--- a/libraries/src/Console/FinderIndexCommand.php
+++ b/libraries/src/Console/FinderIndexCommand.php
@@ -274,7 +274,7 @@ private function getFilters(): void
 
         // Get the taxonomy ids used by the filters.
         $db    = $this->db;
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query
             ->select('filter_id, title, data')
             ->from($db->quoteName('#__finder_filters'));
@@ -288,7 +288,7 @@ private function getFilters(): void
             }
 
             // Get taxonomy records.
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
             $query
                 ->select('t.title, p.title AS parent')
                 ->from($db->quoteName('#__finder_taxonomy') . ' AS t')
@@ -474,7 +474,7 @@ private function putFilters()
 
             foreach ($filter as $element) {
                 // Look for the old taxonomy in the new taxonomy table.
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
                 $query
                     ->select('t.id')
                     ->from($db->quoteName('#__finder_taxonomy') . ' AS t')
@@ -496,7 +496,7 @@ private function putFilters()
             $taxonomyIds = empty($tids) ? '' : implode(',', $tids);
 
             // Update the filter with the new taxonomy ids.
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
             $query
                 ->update($db->quoteName('#__finder_filters'))
                 ->set($db->quoteName('data') . ' = ' . $db->quote($taxonomyIds))
diff --git a/libraries/src/Console/ListUserCommand.php b/libraries/src/Console/ListUserCommand.php
index a9a2d593d594f..23064f2bd142e 100644
--- a/libraries/src/Console/ListUserCommand.php
+++ b/libraries/src/Console/ListUserCommand.php
@@ -76,13 +76,13 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
         $this->configureIO($input, $output);
         $this->ioStyle->title('List Users');
 
-        $groupsQuery = $db->getQuery(true)
+        $groupsQuery = $db->createQuery()
             ->select($db->quoteName(['title', 'id']))
             ->from($db->quoteName('#__usergroups'));
 
         $groups = $db->setQuery($groupsQuery)->loadAssocList('id', 'title');
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select($db->quoteName(['u.id', 'u.username', 'u.name', 'u.email', 'u.block']))
             ->select($query->groupConcat($query->castAs('CHAR', $db->quoteName('g.group_id'))) . ' AS ' . $db->quoteName('groups'))
             ->innerJoin($db->quoteName('#__user_usergroup_map', 'g'), $db->quoteName('g.user_id') . ' = ' . $db->quoteName('u.id'))
diff --git a/libraries/src/Console/RemoveUserFromGroupCommand.php b/libraries/src/Console/RemoveUserFromGroupCommand.php
index 39f04bbb43c66..5befc9ad60dfe 100644
--- a/libraries/src/Console/RemoveUserFromGroupCommand.php
+++ b/libraries/src/Console/RemoveUserFromGroupCommand.php
@@ -119,7 +119,7 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
         $this->userGroups = $this->getGroups($user);
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('title'))
             ->from($db->quoteName('#__usergroups'))
             ->where($db->quoteName('id') . ' = :userGroup');
@@ -131,7 +131,7 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
             $result = $db->loadResult();
 
             if (Access::checkGroup($userGroup, 'core.admin')) {
-                $queryUser = $db->getQuery(true);
+                $queryUser = $db->createQuery();
                 $queryUser->select('COUNT(*)')
                     ->from($db->quoteName('#__users', 'u'))
                     ->leftJoin(
@@ -188,7 +188,7 @@ protected function getGroups($user): array
         $userGroups = Access::getGroupsByUser($user->id, false);
 
         if (!$option) {
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('title'))
                 ->from($db->quoteName('#__usergroups'))
                 ->whereIn($db->quoteName('id'), $userGroups);
@@ -242,7 +242,7 @@ protected function getGroups($user): array
     protected function getGroupId($groupName)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__usergroups'))
             ->where($db->quoteName('title') . '= :groupName')
diff --git a/libraries/src/Extension/ExtensionHelper.php b/libraries/src/Extension/ExtensionHelper.php
index d2f65e267a3d9..6618d712773b4 100644
--- a/libraries/src/Extension/ExtensionHelper.php
+++ b/libraries/src/Extension/ExtensionHelper.php
@@ -406,7 +406,7 @@ public static function getCoreExtensionIds()
         }
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__extensions'));
 
@@ -482,7 +482,7 @@ public static function getExtensionRecord(string $element, string $type, ?int $c
 
         if (!\array_key_exists($key, self::$loadedExtensions)) {
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('*')
                 ->from($db->quoteName('#__extensions'))
                 ->where(
diff --git a/libraries/src/Form/Field/AliastagField.php b/libraries/src/Form/Field/AliastagField.php
index 33893f4d2909c..aacc6d885bfd1 100644
--- a/libraries/src/Form/Field/AliastagField.php
+++ b/libraries/src/Form/Field/AliastagField.php
@@ -43,7 +43,7 @@ protected function getOptions()
     {
         // Get list of tag type alias
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     'DISTINCT ' . $db->quoteName('type_alias', 'value'),
diff --git a/libraries/src/Form/Field/AuthorField.php b/libraries/src/Form/Field/AuthorField.php
index 4a456e87bae0e..9eef053fdba28 100644
--- a/libraries/src/Form/Field/AuthorField.php
+++ b/libraries/src/Form/Field/AuthorField.php
@@ -54,7 +54,7 @@ protected function getOptions()
             $db = $this->getDatabase();
 
             // Construct the query
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('u.id', 'value'),
diff --git a/libraries/src/Form/Field/ChromestyleField.php b/libraries/src/Form/Field/ChromestyleField.php
index 0d446326f76c2..a932a46bb9e22 100644
--- a/libraries/src/Form/Field/ChromestyleField.php
+++ b/libraries/src/Form/Field/ChromestyleField.php
@@ -218,7 +218,7 @@ protected function getTemplates()
         $db = $this->getDatabase();
 
         // Get the database object and a new query object.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Build the query.
         $query->select(
diff --git a/libraries/src/Form/Field/ComponentlayoutField.php b/libraries/src/Form/Field/ComponentlayoutField.php
index 8e043cefabbb8..fb5ec948c485e 100644
--- a/libraries/src/Form/Field/ComponentlayoutField.php
+++ b/libraries/src/Form/Field/ComponentlayoutField.php
@@ -90,7 +90,7 @@ protected function getInput()
 
             // Get the database object and a new query object.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // Build the query.
             $query->select(
diff --git a/libraries/src/Form/Field/ComponentsField.php b/libraries/src/Form/Field/ComponentsField.php
index f1fea01e44a48..dea455d7cda22 100644
--- a/libraries/src/Form/Field/ComponentsField.php
+++ b/libraries/src/Form/Field/ComponentsField.php
@@ -42,7 +42,7 @@ class ComponentsField extends ListField
     protected function getOptions()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('name', 'text'),
diff --git a/libraries/src/Form/Field/ContenttypeField.php b/libraries/src/Form/Field/ContenttypeField.php
index f12cbc8973acd..7abf9ee1837de 100644
--- a/libraries/src/Form/Field/ContenttypeField.php
+++ b/libraries/src/Form/Field/ContenttypeField.php
@@ -64,7 +64,7 @@ protected function getOptions()
     {
         $lang  = Factory::getLanguage();
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('a.type_id', 'value'),
diff --git a/libraries/src/Form/Field/EditorField.php b/libraries/src/Form/Field/EditorField.php
index 647ad1de252a5..48b74a9d16976 100644
--- a/libraries/src/Form/Field/EditorField.php
+++ b/libraries/src/Form/Field/EditorField.php
@@ -283,7 +283,7 @@ protected function getEditor()
                 $db = $this->getDatabase();
 
                 // Build the query.
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('element'))
                     ->from($db->quoteName('#__extensions'))
                     ->where(
diff --git a/libraries/src/Form/Field/FrontendlanguageField.php b/libraries/src/Form/Field/FrontendlanguageField.php
index 28a8b2c456cdb..576150a877a9d 100644
--- a/libraries/src/Form/Field/FrontendlanguageField.php
+++ b/libraries/src/Form/Field/FrontendlanguageField.php
@@ -42,7 +42,7 @@ protected function getOptions()
     {
         // Get the database object and a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select('a.lang_code AS value, a.title AS text')
             ->from($db->quoteName('#__languages') . ' AS a')
diff --git a/libraries/src/Form/Field/MenuField.php b/libraries/src/Form/Field/MenuField.php
index 67b4b4e6d40e2..a0de0c3f9c27f 100644
--- a/libraries/src/Form/Field/MenuField.php
+++ b/libraries/src/Form/Field/MenuField.php
@@ -46,7 +46,7 @@ protected function getGroups()
         $showAll    = (string) $this->element['showAll'] === 'true';
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('id'),
diff --git a/libraries/src/Form/Field/MenuitemField.php b/libraries/src/Form/Field/MenuitemField.php
index 4dfc8174493a5..3affb0bdccad3 100644
--- a/libraries/src/Form/Field/MenuitemField.php
+++ b/libraries/src/Form/Field/MenuitemField.php
@@ -176,7 +176,7 @@ protected function getGroups()
         if ($menuType) {
             // If the menutype is empty, group the items by menutype.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('title'))
                 ->from($db->quoteName('#__menu_types'))
                 ->where($db->quoteName('menutype') . ' = :menuType')
diff --git a/libraries/src/Form/Field/ModalSelectField.php b/libraries/src/Form/Field/ModalSelectField.php
index 8a56938b6001a..47be5e1906d7f 100644
--- a/libraries/src/Form/Field/ModalSelectField.php
+++ b/libraries/src/Form/Field/ModalSelectField.php
@@ -272,7 +272,7 @@ protected function getValueTitle()
         if ($this->value && $this->sql_title_table && $this->sql_title_column && $this->sql_title_key) {
             try {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName($this->sql_title_column))
                     ->from($db->quoteName($this->sql_title_table))
                     ->where($db->quoteName($this->sql_title_key) . ' = :value')
diff --git a/libraries/src/Form/Field/ModulelayoutField.php b/libraries/src/Form/Field/ModulelayoutField.php
index b66d0ec53c79f..9679b181ca75c 100644
--- a/libraries/src/Form/Field/ModulelayoutField.php
+++ b/libraries/src/Form/Field/ModulelayoutField.php
@@ -88,7 +88,7 @@ protected function getInput()
 
             // Get the database object and a new query object.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // Build the query.
             $query->select(
diff --git a/libraries/src/Form/Field/OrderingField.php b/libraries/src/Form/Field/OrderingField.php
index cc9abf9987205..a02acbb771258 100644
--- a/libraries/src/Form/Field/OrderingField.php
+++ b/libraries/src/Form/Field/OrderingField.php
@@ -153,7 +153,7 @@ protected function getQuery()
     {
         $categoryId = (int) $this->form->getValue('catid');
         $db         = $this->getDatabase();
-        $query      = $db->getQuery(true)
+        $query      = $db->createQuery()
             ->select($db->quoteName('ct') . '.*')
             ->from($db->quoteName('#__content_types', 'ct'))
             ->where($db->quoteName('ct.type_alias') . ' = :alias')
@@ -171,7 +171,7 @@ protected function getQuery()
             $title    = $ucmMapCommon[0]->core_title;
         }
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select([$db->quoteName($ordering, 'value'), $db->quoteName($title, 'text')])
             ->from($db->quoteName(json_decode($ucmRow->table)->special->dbtable))
             ->where($db->quoteName('catid') . ' = :categoryId')
diff --git a/libraries/src/Form/Field/PluginsField.php b/libraries/src/Form/Field/PluginsField.php
index 9d7091c3b16da..95c9d788ddfe3 100644
--- a/libraries/src/Form/Field/PluginsField.php
+++ b/libraries/src/Form/Field/PluginsField.php
@@ -125,7 +125,7 @@ protected function getOptions()
 
         // Get list of plugins
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('element', 'value'),
diff --git a/libraries/src/Form/Field/RulesField.php b/libraries/src/Form/Field/RulesField.php
index efba2a77bc206..6cee9ed2d84e7 100644
--- a/libraries/src/Form/Field/RulesField.php
+++ b/libraries/src/Form/Field/RulesField.php
@@ -253,7 +253,7 @@ protected function getInput()
         if (empty($this->assetId)) {
             // Get the component asset id as fallback.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__assets'))
                 ->where($db->quoteName('name') . ' = :component')
@@ -276,7 +276,7 @@ protected function getInput()
             // In this case we need to get the component rules too.
             $db = $this->getDatabase();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('parent_id'))
                 ->from($db->quoteName('#__assets'))
                 ->where($db->quoteName('id') . ' = :assetId')
diff --git a/libraries/src/Form/Field/SqlField.php b/libraries/src/Form/Field/SqlField.php
index ffed770e3fd4e..3e8059e1ab240 100644
--- a/libraries/src/Form/Field/SqlField.php
+++ b/libraries/src/Form/Field/SqlField.php
@@ -208,7 +208,7 @@ protected function processQuery($conditions, $filters, $defaults)
         $db = $this->getDatabase();
 
         // Get the query object
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select fields
         $query->select($conditions['select']);
diff --git a/libraries/src/Form/Field/TagField.php b/libraries/src/Form/Field/TagField.php
index d5e6afc8be28b..b1b3e0323196a 100644
--- a/libraries/src/Form/Field/TagField.php
+++ b/libraries/src/Form/Field/TagField.php
@@ -133,7 +133,7 @@ protected function getOptions()
         $isRemoteSearch = $this->isRemoteSearch();
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('a.id', 'value'),
@@ -181,7 +181,7 @@ protected function getOptions()
         // Preload only active values and 30 most used tags or fill up
         if ($isRemoteSearch) {
             // Load the most $prefillLimit used tags
-            $topQuery = $db->getQuery(true)
+            $topQuery = $db->createQuery()
                 ->select($db->quoteName('tag_id'))
                 ->from($db->quoteName('#__contentitem_tag_map'))
                 ->group($db->quoteName('tag_id'))
diff --git a/libraries/src/Form/Field/TemplatestyleField.php b/libraries/src/Form/Field/TemplatestyleField.php
index 8a88b3214c26c..a92b9efe71432 100644
--- a/libraries/src/Form/Field/TemplatestyleField.php
+++ b/libraries/src/Form/Field/TemplatestyleField.php
@@ -142,7 +142,7 @@ protected function getGroups()
 
         // Get the database object and a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Build the query.
         $query->select(
diff --git a/libraries/src/Form/Field/TransitionField.php b/libraries/src/Form/Field/TransitionField.php
index 0ffdccec55498..4b10c86dc98bd 100644
--- a/libraries/src/Form/Field/TransitionField.php
+++ b/libraries/src/Form/Field/TransitionField.php
@@ -98,7 +98,7 @@ protected function getGroups()
         $extension     = $this->extension;
         $workflowStage = (int) $this->workflowStage;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('t.id', 'value'),
@@ -150,7 +150,7 @@ function ($item) use ($user, $component) {
         }
 
         // Get workflow stage title
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('title'))
             ->from($db->quoteName('#__workflow_stages'))
             ->where($db->quoteName('id') . ' = :stage')
diff --git a/libraries/src/Form/Field/WorkflowstageField.php b/libraries/src/Form/Field/WorkflowstageField.php
index 6145028899086..2761947243985 100644
--- a/libraries/src/Form/Field/WorkflowstageField.php
+++ b/libraries/src/Form/Field/WorkflowstageField.php
@@ -91,7 +91,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
     protected function getGroups()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select distinct stages for existing articles
         $query
diff --git a/libraries/src/Form/Rule/EmailRule.php b/libraries/src/Form/Rule/EmailRule.php
index 0d1b41ea79ffc..37b5b3599eef9 100644
--- a/libraries/src/Form/Rule/EmailRule.php
+++ b/libraries/src/Form/Rule/EmailRule.php
@@ -161,7 +161,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, ?Registr
         if ($unique && !$multiple) {
             // Get the database object and a new query object.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // Get the extra field check attribute.
             $userId = ($form instanceof Form) && $form->getValue('id')
diff --git a/libraries/src/Form/Rule/ExistsRule.php b/libraries/src/Form/Rule/ExistsRule.php
index d313c5a5a7381..78e8e8c24f51c 100644
--- a/libraries/src/Form/Rule/ExistsRule.php
+++ b/libraries/src/Form/Rule/ExistsRule.php
@@ -64,7 +64,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, ?Registr
 
         // Set and query the database.
         $exists = $db->setQuery(
-            $db->getQuery(true)
+            $db->createQuery()
                 ->select('COUNT(*)')
                 ->from($db->quoteName($existsTable))
                 ->where($db->quoteName($existsColumn) . ' = ' . $db->quote($value))
diff --git a/libraries/src/Form/Rule/UserIdRule.php b/libraries/src/Form/Rule/UserIdRule.php
index 2babb2c7811a1..6e793fe74d3e5 100644
--- a/libraries/src/Form/Rule/UserIdRule.php
+++ b/libraries/src/Form/Rule/UserIdRule.php
@@ -56,7 +56,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, ?Registr
 
         // Get the database object and a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Build the query.
         $query->select('COUNT(*)')
diff --git a/libraries/src/Form/Rule/UsernameRule.php b/libraries/src/Form/Rule/UsernameRule.php
index 304b19b7a1c79..975ddbba14af5 100644
--- a/libraries/src/Form/Rule/UsernameRule.php
+++ b/libraries/src/Form/Rule/UsernameRule.php
@@ -48,7 +48,7 @@ public function test(\SimpleXMLElement $element, $value, $group = null, ?Registr
     {
         // Get the database object and a new query object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Get the extra field check attribute.
         $userId = ($form instanceof Form) ? (int) $form->getValue('id') : 0;
diff --git a/libraries/src/HTML/Helpers/Access.php b/libraries/src/HTML/Helpers/Access.php
index 027773d755c98..aa44bd6b5f576 100644
--- a/libraries/src/HTML/Helpers/Access.php
+++ b/libraries/src/HTML/Helpers/Access.php
@@ -52,7 +52,7 @@ abstract class Access
     public static function level($name, $selected, $attribs = '', $params = true, $id = false)
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('a.id', 'value'),
@@ -241,7 +241,7 @@ public static function assetgroups()
     {
         if (empty(static::$asset_groups)) {
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('a.id', 'value'),
diff --git a/libraries/src/HTML/Helpers/Category.php b/libraries/src/HTML/Helpers/Category.php
index 9a9e98458ecee..b762ef59e8e44 100644
--- a/libraries/src/HTML/Helpers/Category.php
+++ b/libraries/src/HTML/Helpers/Category.php
@@ -54,7 +54,7 @@ public static function options($extension, $config = ['filter.published' => [0,
             $db     = Factory::getDbo();
             $user   = Factory::getUser();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('a.id'),
@@ -148,7 +148,7 @@ public static function categories($extension, $config = ['filter.published' => [
             $config = (array) $config;
             $user   = Factory::getUser();
             $db     = Factory::getDbo();
-            $query  = $db->getQuery(true)
+            $query  = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('a.id'),
diff --git a/libraries/src/HTML/Helpers/ContentLanguage.php b/libraries/src/HTML/Helpers/ContentLanguage.php
index 893b9f705e5e4..f2d75728bba17 100644
--- a/libraries/src/HTML/Helpers/ContentLanguage.php
+++ b/libraries/src/HTML/Helpers/ContentLanguage.php
@@ -47,7 +47,7 @@ public static function existing($all = false, $translate = false)
         if (empty(static::$items)) {
             // Get the database object and a new query object.
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // Build the query.
             $query->select(
diff --git a/libraries/src/HTML/Helpers/ListHelper.php b/libraries/src/HTML/Helpers/ListHelper.php
index 21940aa4c1eda..c6eaed0aeb54b 100644
--- a/libraries/src/HTML/Helpers/ListHelper.php
+++ b/libraries/src/HTML/Helpers/ListHelper.php
@@ -179,7 +179,7 @@ public static function ordering($name, $query, $attribs = null, $selected = null
     public static function users($name, $active, $nouser = 0, $javascript = null, $order = 'name')
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('u.id', 'value'),
diff --git a/libraries/src/HTML/Helpers/Menu.php b/libraries/src/HTML/Helpers/Menu.php
index 49bb196604d52..38a109996c46d 100644
--- a/libraries/src/HTML/Helpers/Menu.php
+++ b/libraries/src/HTML/Helpers/Menu.php
@@ -57,7 +57,7 @@ public static function menus($clientId = 0)
         if (!isset(static::$menus[$key])) {
             $db = Factory::getDbo();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('id'),
@@ -105,7 +105,7 @@ public static function menuItems($config = [])
             $menus    = static::menus($clientId);
 
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('a.id', 'value'),
@@ -245,7 +245,7 @@ public static function ordering(&$row, $id)
     {
         if ($id) {
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('ordering', 'value'),
@@ -293,7 +293,7 @@ public static function linkOptions($all = false, $unassigned = false, $clientId
         $db = Factory::getDbo();
 
         // Get a list of the menu items
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('m.id'),
diff --git a/libraries/src/HTML/Helpers/Tag.php b/libraries/src/HTML/Helpers/Tag.php
index 0657edcbcf8f8..cfc94903e8dc1 100644
--- a/libraries/src/HTML/Helpers/Tag.php
+++ b/libraries/src/HTML/Helpers/Tag.php
@@ -53,7 +53,7 @@ public static function options($config = ['filter.published' => [0, 1]])
         if (!isset(static::$items[$hash])) {
             $config = (array) $config;
             $db     = Factory::getDbo();
-            $query  = $db->getQuery(true)
+            $query  = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('a.id'),
@@ -117,7 +117,7 @@ public static function tags($config = ['filter.published' => [0, 1]])
         $hash   = md5(serialize($config));
         $config = (array) $config;
         $db     = Factory::getDbo();
-        $query  = $db->getQuery(true)
+        $query  = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('a.id'),
diff --git a/libraries/src/HTML/Helpers/User.php b/libraries/src/HTML/Helpers/User.php
index 0a7bb53b739b3..37ac4a988425d 100644
--- a/libraries/src/HTML/Helpers/User.php
+++ b/libraries/src/HTML/Helpers/User.php
@@ -70,7 +70,7 @@ public static function groups($includeSuperAdmin = false)
     public static function userlist()
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('a.id', 'value'),
diff --git a/libraries/src/HTML/Helpers/WorkflowStage.php b/libraries/src/HTML/Helpers/WorkflowStage.php
index 6c71b86d293c0..5ba87d01cb388 100644
--- a/libraries/src/HTML/Helpers/WorkflowStage.php
+++ b/libraries/src/HTML/Helpers/WorkflowStage.php
@@ -37,7 +37,7 @@ public static function existing($options)
     {
         // Get the database object and a new query object.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Build the query.
         $query->select(
diff --git a/libraries/src/Helper/CMSHelper.php b/libraries/src/Helper/CMSHelper.php
index cb2a8accb5418..8d96cc8a25ff7 100644
--- a/libraries/src/Helper/CMSHelper.php
+++ b/libraries/src/Helper/CMSHelper.php
@@ -79,7 +79,7 @@ public function getCurrentLanguage($detectBrowser = true)
     public function getLanguageId($langCode)
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('lang_id'))
             ->from($db->quoteName('#__languages'))
             ->where($db->quoteName('lang_code') . ' = :language')
diff --git a/libraries/src/Helper/ContentHelper.php b/libraries/src/Helper/ContentHelper.php
index bc9dda2b28183..0d703f8978121 100644
--- a/libraries/src/Helper/ContentHelper.php
+++ b/libraries/src/Helper/ContentHelper.php
@@ -92,7 +92,7 @@ public static function countRelations(&$items, $config)
             case 'tag_assigments':
                 $recid_col = 'ct.' . $config->group_col;
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->from($db->quoteName('#__contentitem_tag_map', 'ct'))
                     ->join(
                         'INNER',
@@ -106,7 +106,7 @@ public static function countRelations(&$items, $config)
             case 'category_or_group':
                 $recid_col = 'c.' . $config->group_col;
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->from($db->quoteName($related_tbl, 'c'));
                 break;
 
@@ -244,7 +244,7 @@ public static function getCurrentLanguage($detectBrowser = true)
     public static function getLanguageId($langCode)
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('lang_id'))
             ->from($db->quoteName('#__languages'))
             ->where($db->quoteName('lang_code') . ' = :language')
diff --git a/libraries/src/Helper/LibraryHelper.php b/libraries/src/Helper/LibraryHelper.php
index 6c17ed4d1bc50..dbfe55911dc89 100644
--- a/libraries/src/Helper/LibraryHelper.php
+++ b/libraries/src/Helper/LibraryHelper.php
@@ -113,7 +113,7 @@ public static function saveParams($element, $params)
             // Save params in DB
             $db           = Factory::getContainer()->get(DatabaseInterface::class);
             $paramsString = $params->toString();
-            $query        = $db->getQuery(true)
+            $query        = $db->createQuery()
                 ->update($db->quoteName('#__extensions'))
                 ->set($db->quoteName('params') . ' = :params')
                 ->where($db->quoteName('type') . ' = ' . $db->quote('library'))
@@ -148,7 +148,7 @@ protected static function loadLibrary($element)
     {
         $loader = function ($element) {
             $db    = Factory::getContainer()->get(DatabaseInterface::class);
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName(['extension_id', 'element', 'params', 'enabled'], ['id', 'option', null, null]))
                 ->from($db->quoteName('#__extensions'))
                 ->where($db->quoteName('type') . ' = ' . $db->quote('library'))
diff --git a/libraries/src/Helper/ModuleHelper.php b/libraries/src/Helper/ModuleHelper.php
index c84d3c0b28815..83e342baedc38 100644
--- a/libraries/src/Helper/ModuleHelper.php
+++ b/libraries/src/Helper/ModuleHelper.php
@@ -411,7 +411,7 @@ public static function getModuleList()
         $cacheId = implode(',', $groups) . '.' . $clientId . '.' . $itemId;
 
         $db      = Factory::getDbo();
-        $query   = $db->getQuery(true);
+        $query   = $db->createQuery();
         $nowDate = Factory::getDate()->toSql();
 
         $query->select($db->quoteName(['m.id', 'm.title', 'm.module', 'm.position', 'm.content', 'm.showtitle', 'm.params', 'mm.menuid']))
diff --git a/libraries/src/Helper/TagsHelper.php b/libraries/src/Helper/TagsHelper.php
index c2f8685a47c82..d461b60ddf266 100644
--- a/libraries/src/Helper/TagsHelper.php
+++ b/libraries/src/Helper/TagsHelper.php
@@ -101,7 +101,7 @@ public function addTagMapping($ucmId, TableInterface $table, $tags = [])
         $db     = $table->getDbo();
         $key    = $table->getKeyName();
         $item   = $table->$key;
-        $query  = $db->getQuery(true)
+        $query  = $db->createQuery()
             ->select($db->quoteName('ct') . '.type_id')
             ->from($db->quoteName('#__content_types', 'ct'))
             ->where($db->quoteName('ct.type_alias') . ' = :alias')
@@ -122,7 +122,7 @@ public function addTagMapping($ucmId, TableInterface $table, $tags = [])
             return true;
         }
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->insert('#__contentitem_tag_map');
         $query->columns(
             [
@@ -184,7 +184,7 @@ public static function convertPathsToNames($tags)
 
                 $db = Factory::getDbo();
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select(
                         [
                             $db->quoteName('alias'),
@@ -350,7 +350,7 @@ public function getItemTags($contentType, $id, $getTagData = true)
 
         // Initialize some variables.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('m.tag_id'))
             ->from($db->quoteName('#__contentitem_tag_map', 'm'))
             ->where(
@@ -411,7 +411,7 @@ public function getMultipleItemTags($contentType, array $ids, $getTagData = true
         /** @var DatabaseInterface $db */
         $db = Factory::getContainer()->get(DatabaseInterface::class);
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['m.tag_id', 'm.content_item_id']))
             ->from($db->quoteName('#__contentitem_tag_map', 'm'))
             ->where(
@@ -490,7 +490,7 @@ public function getTagIds($ids, $prefix)
         $db = Factory::getDbo();
 
         // Load the tags.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('t.id'))
             ->from($db->quoteName('#__tags', 't'))
             ->join('INNER', $db->quoteName('#__contentitem_tag_map', 'm'), $db->quoteName('m.tag_id') . ' = ' . $db->quoteName('t.id'))
@@ -536,7 +536,7 @@ public function getTagItemsQuery(
     ) {
         // Create a new query object.
         $db       = Factory::getDbo();
-        $query    = $db->getQuery(true);
+        $query    = $db->createQuery();
         $user     = Factory::getUser();
         $nullDate = $db->getNullDate();
         $nowDate  = Factory::getDate()->toSql();
@@ -714,7 +714,7 @@ public function getTagNames($tagIds)
             $tagIds = ArrayHelper::toInteger($tagIds);
 
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('title'))
                 ->from($db->quoteName('#__tags'))
                 ->whereIn($db->quoteName('id'), $tagIds)
@@ -776,7 +776,7 @@ public static function getTypes($arrayType = 'objectList', $selectTypes = null,
     {
         // Initialize some variables.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*');
 
         if (!empty($selectTypes)) {
@@ -870,7 +870,7 @@ public function postStore(TableInterface $table, array $newTags = [], bool $repl
                 $coreContentTable = new CoreContent(Factory::getDbo());
                 $db               = Factory::getDbo();
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('ct') . '.*')
                     ->from($db->quoteName('#__content_types', 'ct'))
                     ->where($db->quoteName('ct.type_alias') . ' = :alias')
@@ -909,7 +909,7 @@ public function postStore(TableInterface $table, array $newTags = [], bool $repl
                     $ucmData['special']['ucm_id'] = $ucmData['common']['ucm_id'];
                 }
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName('ucm_id'))
                     ->from($db->quoteName('#__ucm_base'))
                     ->where(
@@ -990,7 +990,7 @@ public function preStoreProcess(TableInterface $table, $newTags = [])
     public static function searchTags($filters = [])
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('a.id', 'value'),
@@ -1100,7 +1100,7 @@ public function tagDeleteInstances($tagId)
 
         // Delete the old tag maps.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__contentitem_tag_map'))
             ->where($db->quoteName('tag_id') . ' = :id')
             ->bind(':id', $tagId, ParameterType::INTEGER);
@@ -1164,7 +1164,7 @@ public function unTagItem($contentId, TableInterface $table, $tags = [])
         $key   = $table->getKeyName();
         $id    = (int) $table->$key;
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__contentitem_tag_map'))
             ->where(
                 [
@@ -1203,7 +1203,7 @@ public function getTags($tagIds)
             $tagIds = ArrayHelper::toInteger($tagIds);
 
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select([$db->quoteName('id'), $db->quoteName('title')])
                 ->from($db->quoteName('#__tags'))
                 ->whereIn($db->quoteName('id'), $tagIds)
diff --git a/libraries/src/Helper/UserGroupsHelper.php b/libraries/src/Helper/UserGroupsHelper.php
index 13693231dc7f1..421471fae2c57 100644
--- a/libraries/src/Helper/UserGroupsHelper.php
+++ b/libraries/src/Helper/UserGroupsHelper.php
@@ -198,7 +198,7 @@ public function total()
         if ($this->total === null) {
             $db = Factory::getDbo();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('COUNT(' . $db->quoteName('id') . ')')
                 ->from($db->quoteName('#__usergroups'));
 
@@ -226,7 +226,7 @@ public function load($id)
 
         $db = Factory::getDbo();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__usergroups'))
             ->where($db->quoteName('id') . ' = :id')
@@ -256,7 +256,7 @@ public function loadAll()
 
         $db = Factory::getDbo();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__usergroups'))
             ->order($db->quoteName('lft') . ' ASC');
diff --git a/libraries/src/Installer/Adapter/ComponentAdapter.php b/libraries/src/Installer/Adapter/ComponentAdapter.php
index bc656601b1bd2..e3f29700545fc 100644
--- a/libraries/src/Installer/Adapter/ComponentAdapter.php
+++ b/libraries/src/Installer/Adapter/ComponentAdapter.php
@@ -417,7 +417,7 @@ protected function finaliseUninstall(): bool
         $db = $this->getDatabase();
 
         // Remove the schema version
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__schemas'))
             ->where($db->quoteName('extension_id') . ' = :extension_id')
             ->bind(':extension_id', $extensionId, ParameterType::INTEGER);
@@ -435,7 +435,7 @@ protected function finaliseUninstall(): bool
         $extensionNameWithWildcard = $extensionName . '.%';
 
         // Remove categories for this component
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__categories'))
             ->where(
                 [
@@ -668,7 +668,7 @@ public function prepareDiscoverInstall()
             // Try to delete existing failed records before retrying
             $db = $this->getDatabase();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('extension_id'))
                 ->from($db->quoteName('#__extensions'))
                 ->where(
@@ -856,7 +856,7 @@ protected function storeExtension($deleteExisting = false)
             // Try to delete existing failed records before retrying
             $db = $this->getDatabase();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('extension_id'))
                 ->from($db->quoteName('#__extensions'))
                 ->where(
@@ -936,7 +936,7 @@ protected function _buildAdminMenus($componentId = null)
         $option = $this->element;
 
         // If a component exists with this option in the table within the protected menutype 'main' then we don't need to add menus
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('m.id'),
@@ -1149,7 +1149,7 @@ protected function _removeAdminMenus($id)
         $table = new Menu($db);
 
         // Get the ids of the menu items
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__menu'))
             ->where(
@@ -1218,7 +1218,7 @@ protected function _updateMenus($componentId, $clientId = null)
 
         // Update all menu items which contain 'index.php?option=com_extension' or 'index.php?option=com_extension&...'
         // to use the new component id.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__menu'))
             ->set($db->quoteName('component_id') . ' = :componentId')
             ->where($db->quoteName('type') . ' = ' . $db->quote('component'))
@@ -1407,7 +1407,7 @@ protected function _createAdminMenuItem(array &$data, $parentId)
             $home         = $data['home'];
 
             // The menu item already exists. Delete it and retry instead of throwing an error.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__menu'))
                 ->where(
diff --git a/libraries/src/Installer/Adapter/FileAdapter.php b/libraries/src/Installer/Adapter/FileAdapter.php
index bbab189141ca4..570f8720626af 100644
--- a/libraries/src/Installer/Adapter/FileAdapter.php
+++ b/libraries/src/Installer/Adapter/FileAdapter.php
@@ -183,7 +183,7 @@ protected function finaliseUninstall(): bool
         $db = $this->getDatabase();
 
         // Remove the schema version
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete('#__schemas')
             ->where('extension_id = :extension_id')
             ->bind(':extension_id', $extensionId, ParameterType::INTEGER);
@@ -456,7 +456,7 @@ protected function extensionExistsInSystem($extension = null)
         // Get a database connector object
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__extensions'))
             ->where($db->quoteName('type') . ' = ' . $db->quote('file'))
diff --git a/libraries/src/Installer/Adapter/LanguageAdapter.php b/libraries/src/Installer/Adapter/LanguageAdapter.php
index b4418fbf1322a..1eec06f843680 100644
--- a/libraries/src/Installer/Adapter/LanguageAdapter.php
+++ b/libraries/src/Installer/Adapter/LanguageAdapter.php
@@ -107,7 +107,7 @@ protected function finaliseUninstall(): bool
 
         // Remove the schema version
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__schemas'))
             ->where($db->quoteName('extension_id') . ' = :extension_id')
             ->bind(':extension_id', $extensionId, ParameterType::INTEGER);
@@ -479,7 +479,7 @@ protected function getSefString($itemLanguageTag)
 
         // Get the sef value of all current content languages.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('sef'))
             ->from($db->quoteName('#__languages'));
         $db->setQuery($query);
@@ -765,7 +765,7 @@ private function resetUserLanguage(): void
 
         // Setting the language of users which have this language as the default language
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     $db->quoteName('id'),
@@ -785,7 +785,7 @@ private function resetUserLanguage(): void
         $count = 0;
 
         // Prepare the query.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__users'))
             ->set($db->quoteName('params') . ' = :registry')
             ->where($db->quoteName('id') . ' = :userId')
diff --git a/libraries/src/Installer/Adapter/LibraryAdapter.php b/libraries/src/Installer/Adapter/LibraryAdapter.php
index 49f5a5fcc5183..7a39408c48b5c 100644
--- a/libraries/src/Installer/Adapter/LibraryAdapter.php
+++ b/libraries/src/Installer/Adapter/LibraryAdapter.php
@@ -168,7 +168,7 @@ protected function finaliseUninstall(): bool
         $db = $this->getDatabase();
 
         // Remove the schema version
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete('#__schemas')
             ->where('extension_id = :extension_id')
             ->bind(':extension_id', $extensionId, ParameterType::INTEGER);
diff --git a/libraries/src/Installer/Adapter/ModuleAdapter.php b/libraries/src/Installer/Adapter/ModuleAdapter.php
index 561b3a909c293..ef03cff37a975 100644
--- a/libraries/src/Installer/Adapter/ModuleAdapter.php
+++ b/libraries/src/Installer/Adapter/ModuleAdapter.php
@@ -219,7 +219,7 @@ protected function finaliseUninstall(): bool
         $retval = true;
 
         // Remove the schema version
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete('#__schemas')
             ->where('extension_id = :extension_id')
             ->bind(':extension_id', $extensionId, ParameterType::INTEGER);
@@ -251,7 +251,7 @@ protected function finaliseUninstall(): bool
             $modules = ArrayHelper::toInteger($modules);
 
             // Wipe out any items assigned to menus
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__modules_menu'))
                 ->whereIn($db->quoteName('moduleid'), $modules);
             $db->setQuery($query);
@@ -278,7 +278,7 @@ protected function finaliseUninstall(): bool
 
         // Now we will no longer need the module object, so let's delete it and free up memory
         $this->extension->delete($this->extension->extension_id);
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__modules'))
             ->where($db->quoteName('module') . ' = :element')
             ->where($db->quoteName('client_id') . ' = :client_id')
@@ -669,7 +669,7 @@ protected function _rollback_menu($arg)
         $moduleId = $arg['id'];
 
         // Remove the entry from the #__modules_menu table
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__modules_menu'))
             ->where($db->quoteName('moduleid') . ' = :module_id')
             ->bind(':module_id', $moduleId, ParameterType::INTEGER);
@@ -700,7 +700,7 @@ protected function _rollback_module($arg)
         $moduleId = $arg['id'];
 
         // Remove the entry from the #__modules table
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__modules'))
             ->where($db->quoteName('id') . ' = :module_id')
             ->bind(':module_id', $moduleId, ParameterType::INTEGER);
diff --git a/libraries/src/Installer/Adapter/PackageAdapter.php b/libraries/src/Installer/Adapter/PackageAdapter.php
index ccee1dda51d6a..97208284ba037 100644
--- a/libraries/src/Installer/Adapter/PackageAdapter.php
+++ b/libraries/src/Installer/Adapter/PackageAdapter.php
@@ -220,7 +220,7 @@ protected function finaliseInstall()
         // Set the package ID for each of the installed extensions to track the relationship
         if (!empty($this->installedIds)) {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName('#__extensions'))
                 ->set($db->quoteName('package_id') . ' = :id')
                 ->whereIn($db->quoteName('extension_id'), $this->installedIds)
@@ -307,7 +307,7 @@ protected function finaliseUninstall(): bool
         $db = $this->getDatabase();
 
         // Remove the schema version
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__schemas'))
             ->where($db->quoteName('extension_id') . ' = :extension_id')
             ->bind(':extension_id', $this->extension->extension_id, ParameterType::INTEGER);
@@ -653,7 +653,7 @@ protected function _getExtensionId($type, $id, $client, $group)
     {
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('extension_id'))
             ->from($db->quoteName('#__extensions'))
             ->where(
diff --git a/libraries/src/Installer/Adapter/PluginAdapter.php b/libraries/src/Installer/Adapter/PluginAdapter.php
index 1e1c9320efd0f..07c43f359d921 100644
--- a/libraries/src/Installer/Adapter/PluginAdapter.php
+++ b/libraries/src/Installer/Adapter/PluginAdapter.php
@@ -205,7 +205,7 @@ protected function finaliseUninstall(): bool
         $db = $this->getDatabase();
 
         // Remove the schema version
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete('#__schemas')
             ->where('extension_id = :extension_id')
             ->bind(':extension_id', $extensionId, ParameterType::INTEGER);
diff --git a/libraries/src/Installer/Adapter/TemplateAdapter.php b/libraries/src/Installer/Adapter/TemplateAdapter.php
index b1620e766c602..0af93bed7c80a 100644
--- a/libraries/src/Installer/Adapter/TemplateAdapter.php
+++ b/libraries/src/Installer/Adapter/TemplateAdapter.php
@@ -179,14 +179,14 @@ protected function finaliseInstall()
     protected function finaliseUninstall(): bool
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $element     = $this->extension->element;
         $clientId    = $this->extension->client_id;
         $extensionId = $this->extension->extension_id;
 
         // Set menu that assigned to the template back to default template
-        $subQuery = $db->getQuery(true)
+        $subQuery = $db->createQuery()
             ->select($db->quoteName('s.id'))
             ->from($db->quoteName('#__template_styles', 's'))
             ->where(
@@ -207,7 +207,7 @@ protected function finaliseUninstall(): bool
         $db->execute();
 
         // Remove the template's styles
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__template_styles'))
             ->where(
                 [
@@ -221,7 +221,7 @@ protected function finaliseUninstall(): bool
         $db->execute();
 
         // Remove the schema version
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__schemas'))
             ->where($db->quoteName('extension_id') . ' = :extension_id')
             ->bind(':extension_id', $extensionId, ParameterType::INTEGER);
@@ -229,7 +229,7 @@ protected function finaliseUninstall(): bool
         $db->execute();
 
         // Remove any overrides
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__template_overrides'))
             ->where($db->quoteName('template') . ' = :template')
             ->bind(':template', $element);
@@ -314,7 +314,7 @@ protected function parseQueries()
     {
         if (\in_array($this->route, ['install', 'discover_install'])) {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
             $lang  = Factory::getLanguage();
             $debug = $lang->setDebug(false);
 
@@ -462,7 +462,7 @@ protected function setupUninstall()
         }
 
         // Deny removing a parent template if there are children
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__template_styles'))
             ->where(
@@ -480,7 +480,7 @@ protected function setupUninstall()
         }
 
         // Deny remove default template
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__template_styles'))
             ->where(
diff --git a/libraries/src/Installer/Installer.php b/libraries/src/Installer/Installer.php
index b6f09d3f70d00..03ec8bfa2c13d 100644
--- a/libraries/src/Installer/Installer.php
+++ b/libraries/src/Installer/Installer.php
@@ -580,7 +580,7 @@ public function abort($msg = null, $type = null)
                 case 'extension':
                     // Get database connector object
                     $db     = $this->getDatabase();
-                    $query  = $db->getQuery(true);
+                    $query  = $db->createQuery();
                     $stepId = (int) $step['id'];
 
                     // Remove the entry from the #__extensions table
@@ -1186,7 +1186,7 @@ public function setSchemaVersion(\SimpleXMLElement $schema, $eid)
                     usort($files, 'version_compare');
 
                     // Update the database
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->delete('#__schemas')
                         ->where('extension_id = :extension_id')
                         ->bind(':extension_id', $eid, ParameterType::INTEGER);
@@ -1272,7 +1272,7 @@ public function parseSchemaUpdates(\SimpleXMLElement $schema, $eid)
         $files = str_replace('.sql', '', $files);
         usort($files, 'version_compare');
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('version_id')
             ->from('#__schemas')
             ->where('extension_id = :extension_id')
@@ -1401,7 +1401,7 @@ protected function updateSchemaTable(int $eid, string $version, bool $update = f
              */
             $db->transactionStart();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete('#__schemas')
                 ->where('extension_id = :extension_id')
                 ->bind(':extension_id', $eid, ParameterType::INTEGER);
@@ -2156,7 +2156,7 @@ public function generateManifestCache()
     public function cleanDiscoveredExtension($type, $element, $folder = '', $client = 0)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__extensions'))
             ->where('type = :type')
             ->where('element = :element')
diff --git a/libraries/src/Installer/InstallerScript.php b/libraries/src/Installer/InstallerScript.php
index 13083cdcac38a..c50d7ee9ca781 100644
--- a/libraries/src/Installer/InstallerScript.php
+++ b/libraries/src/Installer/InstallerScript.php
@@ -175,7 +175,7 @@ public function getInstances($isModule)
         $extension = $this->extension;
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the item(s) and retrieve the id
         if ($isModule) {
@@ -259,7 +259,7 @@ public function setParams($paramArray = null, $type = 'edit', $id = 0)
         $paramsString = json_encode($params);
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName($this->paramTable))
             ->set('params = :params')
             ->where('id = :id')
@@ -294,7 +294,7 @@ public function getItemArray($element, $table, $column, $identifier)
         $paramType = is_numeric($identifier) ? ParameterType::INTEGER : ParameterType::STRING;
 
         // Build the query
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName($element))
             ->from($db->quoteName($table))
             ->where($db->quoteName($column) . ' = :id')
diff --git a/libraries/src/Language/Associations.php b/libraries/src/Language/Associations.php
index 34e993e0422a2..bfc52027e74f3 100644
--- a/libraries/src/Language/Associations.php
+++ b/libraries/src/Language/Associations.php
@@ -66,7 +66,7 @@ public static function getAssociations(
             $multilanguageAssociations[$queryKey] = [];
 
             $db                 = Factory::getDbo();
-            $query              = $db->getQuery(true);
+            $query              = $db->createQuery();
             $categoriesExtraSql = '';
 
             if ($tablename === '#__categories') {
diff --git a/libraries/src/Language/LanguageHelper.php b/libraries/src/Language/LanguageHelper.php
index de6700e75c920..baa6ae58191f9 100644
--- a/libraries/src/Language/LanguageHelper.php
+++ b/libraries/src/Language/LanguageHelper.php
@@ -176,7 +176,7 @@ public static function getLanguages($key = 'default')
                     $languages = $cache->get('languages');
                 } else {
                     $db    = Factory::getDbo();
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->select('*')
                         ->from($db->quoteName('#__languages'))
                         ->where($db->quoteName('published') . ' = 1')
@@ -238,7 +238,7 @@ public static function getInstalledLanguages(
             } else {
                 $db ??= Factory::getContainer()->get(DatabaseInterface::class);
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select(
                         [
                             $db->quoteName('element'),
@@ -387,7 +387,7 @@ public static function getContentLanguages(
             } else {
                 $db = Factory::getDbo();
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select('*')
                     ->from($db->quoteName('#__languages'));
 
diff --git a/libraries/src/Language/Multilanguage.php b/libraries/src/Language/Multilanguage.php
index 3b2465702bf5b..eb64b744df438 100644
--- a/libraries/src/Language/Multilanguage.php
+++ b/libraries/src/Language/Multilanguage.php
@@ -67,7 +67,7 @@ public static function isEnabled(?CMSApplication $app = null, ?DatabaseInterface
         if (!$tested) {
             // Determine status of language filter plugin.
             $db    = $db ?: Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('enabled'))
                 ->from($db->quoteName('#__extensions'))
                 ->where(
@@ -103,7 +103,7 @@ public static function getSiteHomePages(?DatabaseInterface $db = null)
         if (!isset($multilangSiteHomePages)) {
             // Check for Home pages languages.
             $db    = $db ?: Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     [
                         $db->quoteName('language'),
diff --git a/libraries/src/MVC/Model/AdminModel.php b/libraries/src/MVC/Model/AdminModel.php
index e39f36a016fd4..947d1c3b16e01 100644
--- a/libraries/src/MVC/Model/AdminModel.php
+++ b/libraries/src/MVC/Model/AdminModel.php
@@ -510,7 +510,7 @@ protected function batchCopy($value, $pks, $contexts)
                 $dbType = strtolower($db->getServerType());
 
                 // Copy rules
-                $query = $db->getQuery(true);
+                $query = $db->createQuery();
                 $query->clear()
                     ->update($db->quoteName('#__assets', 't'));
 
@@ -886,7 +886,7 @@ public function delete(&$pks)
                     // Multilanguage: if associated, delete the item in the _associations table
                     if ($this->associationsContext && Associations::isEnabled()) {
                         $db    = $this->getDatabase();
-                        $query = $db->getQuery(true)
+                        $query = $db->createQuery()
                             ->select(
                                 [
                                     'COUNT(*) AS ' . $db->quoteName('count'),
@@ -909,7 +909,7 @@ public function delete(&$pks)
                         $row = $db->loadAssoc();
 
                         if (!empty($row['count'])) {
-                            $query = $db->getQuery(true)
+                            $query = $db->createQuery()
                                 ->delete($db->quoteName('#__associations'))
                                 ->where(
                                     [
@@ -1392,7 +1392,7 @@ public function save($data)
             // Get associationskey for edited item
             $db    = $this->getDatabase();
             $id    = (int) $table->$key;
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('key'))
                 ->from($db->quoteName('#__associations'))
                 ->where($db->quoteName('context') . ' = :context')
@@ -1404,7 +1404,7 @@ public function save($data)
 
             if ($associations || $oldKey !== null) {
                 // Deleting old associations for the associated items
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->delete($db->quoteName('#__associations'))
                     ->where($db->quoteName('context') . ' = :context')
                     ->bind(':context', $this->associationsContext);
@@ -1433,7 +1433,7 @@ public function save($data)
             if (\count($associations) > 1) {
                 // Adding new association for these items
                 $key   = md5(json_encode($associations));
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->insert($db->quoteName('#__associations'))
                     ->columns(
                         [
diff --git a/libraries/src/MVC/Model/BaseDatabaseModel.php b/libraries/src/MVC/Model/BaseDatabaseModel.php
index 9c03b87d60081..4f42be0d7bef0 100644
--- a/libraries/src/MVC/Model/BaseDatabaseModel.php
+++ b/libraries/src/MVC/Model/BaseDatabaseModel.php
@@ -155,7 +155,7 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)
     protected function _getList($query, $limitstart = 0, $limit = 0)
     {
         if (\is_string($query)) {
-            $query = $this->getDatabase()->getQuery(true)->setQuery($query);
+            $query = $this->getDatabase()->createQuery()->setQuery($query);
         }
 
         $query->setLimit($limit, $limitstart);
diff --git a/libraries/src/MVC/Model/ListModel.php b/libraries/src/MVC/Model/ListModel.php
index 92a475fc71733..91c3c8b0b23bc 100644
--- a/libraries/src/MVC/Model/ListModel.php
+++ b/libraries/src/MVC/Model/ListModel.php
@@ -251,7 +251,7 @@ public function getItems()
      */
     protected function getListQuery()
     {
-        return $this->getDatabase()->getQuery(true);
+        return $this->getDatabase()->createQuery();
     }
 
     /**
diff --git a/libraries/src/MVC/View/CategoryFeedView.php b/libraries/src/MVC/View/CategoryFeedView.php
index d2b15a2b93a52..7e47a124473b5 100644
--- a/libraries/src/MVC/View/CategoryFeedView.php
+++ b/libraries/src/MVC/View/CategoryFeedView.php
@@ -45,7 +45,7 @@ public function display($tpl = null)
         $contentType    = $extension . '.' . $this->viewName;
 
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('ct') . '.*')
             ->from($db->quoteName('#__content_types', 'ct'))
             ->where($db->quoteName('ct.type_alias') . ' = :alias')
diff --git a/libraries/src/Mail/MailTemplate.php b/libraries/src/Mail/MailTemplate.php
index 2961eb222d590..cd6739ca4c193 100644
--- a/libraries/src/Mail/MailTemplate.php
+++ b/libraries/src/Mail/MailTemplate.php
@@ -512,7 +512,7 @@ protected function replaceTags($text, $tags, $isHtml = false)
     public static function getTemplate($key, $language)
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select('*')
             ->from($db->quoteName('#__mail_templates'))
             ->where($db->quoteName('template_id') . ' = :key')
@@ -603,7 +603,7 @@ public static function updateTemplate($key, $subject, $body, $tags, $htmlbody =
     public static function deleteTemplate($key)
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->delete($db->quoteName('#__mail_templates'))
             ->where($db->quoteName('template_id') . ' = :key')
             ->bind(':key', $key);
diff --git a/libraries/src/Menu/SiteMenu.php b/libraries/src/Menu/SiteMenu.php
index f99f6015006e8..04027a550b5ee 100644
--- a/libraries/src/Menu/SiteMenu.php
+++ b/libraries/src/Menu/SiteMenu.php
@@ -93,7 +93,7 @@ public function load()
         $loader = function () {
             $currentDate = Factory::getDate()->toSql();
 
-            $query = $this->db->getQuery(true)
+            $query = $this->db->createQuery()
                 ->select(
                     $this->db->quoteName(
                         [
diff --git a/libraries/src/Plugin/PluginHelper.php b/libraries/src/Plugin/PluginHelper.php
index 08ac384b26d83..c2ea73d5c6d89 100644
--- a/libraries/src/Plugin/PluginHelper.php
+++ b/libraries/src/Plugin/PluginHelper.php
@@ -263,7 +263,7 @@ protected static function load()
 
         $loader = function () use ($levels) {
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select(
                     $db->quoteName(
                         [
diff --git a/libraries/src/Session/MetadataManager.php b/libraries/src/Session/MetadataManager.php
index 7accb7422423c..239962790ce8a 100644
--- a/libraries/src/Session/MetadataManager.php
+++ b/libraries/src/Session/MetadataManager.php
@@ -149,7 +149,7 @@ public function createOrUpdateRecord(SessionInterface $session, User $user)
      */
     public function deletePriorTo($time)
     {
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->delete($this->db->quoteName('#__session'))
             ->where($this->db->quoteName('time') . ' < :time')
             ->bind(':time', $time, ParameterType::INTEGER);
@@ -174,7 +174,7 @@ public function deletePriorTo($time)
      */
     private function checkSessionRecordExists(string $sessionId): int
     {
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('session_id'))
             ->from($this->db->quoteName('#__session'))
             ->where($this->db->quoteName('session_id') . ' = :session_id')
@@ -208,7 +208,7 @@ private function checkSessionRecordExists(string $sessionId): int
      */
     private function createSessionRecord(SessionInterface $session, User $user)
     {
-        $query = $this->db->getQuery(true);
+        $query = $this->db->createQuery();
 
         $time = $session->isNew() ? time() : $session->get('session.timer.start');
 
@@ -275,7 +275,7 @@ private function createSessionRecord(SessionInterface $session, User $user)
      */
     private function updateSessionRecord(SessionInterface $session, User $user)
     {
-        $query = $this->db->getQuery(true);
+        $query = $this->db->createQuery();
 
         $time = time();
 
diff --git a/libraries/src/TUF/TufFetcher.php b/libraries/src/TUF/TufFetcher.php
index 19566c801daff..c8f0b93aee2da 100644
--- a/libraries/src/TUF/TufFetcher.php
+++ b/libraries/src/TUF/TufFetcher.php
@@ -153,7 +153,7 @@ private function rollBackTufMetadata()
     {
         $db = $this->db;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__tuf_metadata'))
             ->set($db->quoteName('snapshot') . ' = NULL')
             ->set($db->quoteName('targets') . ' = NULL')
diff --git a/libraries/src/Table/Asset.php b/libraries/src/Table/Asset.php
index 6862409bff819..8fac6d715e68c 100644
--- a/libraries/src/Table/Asset.php
+++ b/libraries/src/Table/Asset.php
@@ -110,7 +110,7 @@ public function check()
         if ($this->parent_id > 0) {
             // Get the DatabaseQuery object
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('1')
                 ->from($db->quoteName($this->_tbl))
                 ->where($db->quoteName('id') . ' = ' . $this->parent_id);
@@ -155,7 +155,7 @@ public function rebuild($parentId = null, $leftId = 0, $level = 0, $path = null)
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Build the structure of the recursive query.
         if (!isset($this->_cache['rebuild.sql'])) {
diff --git a/libraries/src/Table/Category.php b/libraries/src/Table/Category.php
index 902bfb25088d8..44f8416937475 100644
--- a/libraries/src/Table/Category.php
+++ b/libraries/src/Table/Category.php
@@ -112,7 +112,7 @@ protected function _getAssetParentId(?Table $table = null, $id = null)
 
         if ($this->parent_id > 1) {
             // Build the query to get the asset id for the parent category.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('asset_id'))
                 ->from($db->quoteName('#__categories'))
                 ->where($db->quoteName('id') . ' = :parentId')
@@ -127,7 +127,7 @@ protected function _getAssetParentId(?Table $table = null, $id = null)
         } elseif ($assetId === null) {
             // This is a category that needs to parent with the extension.
             // Build the query to get the asset id for the parent category.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__assets'))
                 ->where($db->quoteName('name') . ' = :extension')
diff --git a/libraries/src/Table/Content.php b/libraries/src/Table/Content.php
index 943d291214ef9..df92b81cac7a7 100644
--- a/libraries/src/Table/Content.php
+++ b/libraries/src/Table/Content.php
@@ -112,7 +112,7 @@ protected function _getAssetParentId(?Table $table = null, $id = null)
 
             // Build the query to get the asset id for the parent category.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('asset_id'))
                 ->from($db->quoteName('#__categories'))
                 ->where($db->quoteName('id') . ' = :catid')
diff --git a/libraries/src/Table/ContentHistory.php b/libraries/src/Table/ContentHistory.php
index a042eb947df1d..a419a3a9f464a 100644
--- a/libraries/src/Table/ContentHistory.php
+++ b/libraries/src/Table/ContentHistory.php
@@ -169,7 +169,7 @@ public function getHashMatch()
         $db       = $this->getDatabase();
         $itemId   = $this->item_id;
         $sha1Hash = $this->sha1_hash;
-        $query    = $db->getQuery(true);
+        $query    = $db->createQuery();
         $query->select('*')
             ->from($db->quoteName('#__history'))
             ->where($db->quoteName('item_id') . ' = :item_id')
@@ -199,7 +199,7 @@ public function deleteOldVersions($maxVersions)
         // Get the list of version_id values we want to save
         $db        = $this->getDatabase();
         $itemId    = $this->item_id;
-        $query     = $db->getQuery(true);
+        $query     = $db->createQuery();
         $query->select($db->quoteName('version_id'))
             ->from($db->quoteName('#__history'))
             ->where($db->quoteName('item_id') . ' = :item_id')
@@ -214,7 +214,7 @@ public function deleteOldVersions($maxVersions)
         // Don't process delete query unless we have at least the maximum allowed versions
         if (\count($idsToSave) === (int) $maxVersions) {
             // Delete any rows not in our list and and not flagged to keep forever.
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
             $query->delete($db->quoteName('#__history'))
                 ->where($db->quoteName('item_id') . ' = :item_id')
                 ->whereNotIn($db->quoteName('version_id'), $idsToSave)
diff --git a/libraries/src/Table/ContentType.php b/libraries/src/Table/ContentType.php
index 2277ca9a481c5..76fbe3314f928 100644
--- a/libraries/src/Table/ContentType.php
+++ b/libraries/src/Table/ContentType.php
@@ -118,7 +118,7 @@ public function fieldmapExpand($assoc = true)
     public function getTypeId($typeAlias)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select($db->quoteName('type_id'))
             ->from($db->quoteName($this->_tbl))
             ->where($db->quoteName('type_alias') . ' = :type_alias')
diff --git a/libraries/src/Table/CoreContent.php b/libraries/src/Table/CoreContent.php
index a7142e9a50139..c4d01abbe2e9c 100644
--- a/libraries/src/Table/CoreContent.php
+++ b/libraries/src/Table/CoreContent.php
@@ -178,7 +178,7 @@ public function deleteByContentId($contentItemId = null, $typeAlias = null)
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->select($db->quoteName('core_content_id'))
             ->from($db->quoteName('#__ucm_content'))
             ->where(
@@ -264,7 +264,7 @@ protected function storeUcmBase($updateNulls = true, $isNew = false)
     {
         // Store the ucm_base row
         $db         = $this->getDatabase();
-        $query      = $db->getQuery(true);
+        $query      = $db->createQuery();
         $languageId = ContentHelper::getLanguageId($this->core_language);
 
         // Selecting "all languages" doesn't give a language id - we can't store a blank string in non mysql databases, so save 0 (the default value)
diff --git a/libraries/src/Table/Extension.php b/libraries/src/Table/Extension.php
index b4fdf9889e382..eec6be3bb2ae1 100644
--- a/libraries/src/Table/Extension.php
+++ b/libraries/src/Table/Extension.php
@@ -105,7 +105,7 @@ public function find($options = [])
     {
         // Get the DatabaseQuery object
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         foreach ($options as $col => $val) {
             $query->where($col . ' = ' . $db->quote($val));
diff --git a/libraries/src/Table/Menu.php b/libraries/src/Table/Menu.php
index 6306e5286f1d7..86cb44fa3e22e 100644
--- a/libraries/src/Table/Menu.php
+++ b/libraries/src/Table/Menu.php
@@ -215,7 +215,7 @@ public function store($updateNulls = true)
                 } elseif ($this->language === '*' && $this->id != 0) {
                     // When editing an item with All language check if there are more menu items with the same alias in any language.
                     $id    = (int) $this->id;
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->select('id')
                         ->from($db->quoteName('#__menu'))
                         ->where($db->quoteName('parent_id') . ' = 1')
diff --git a/libraries/src/Table/MenuType.php b/libraries/src/Table/MenuType.php
index 5e59f6c23389d..f57c196b99eda 100644
--- a/libraries/src/Table/MenuType.php
+++ b/libraries/src/Table/MenuType.php
@@ -78,7 +78,7 @@ public function check()
 
         // Check for unique menutype.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(id)')
             ->from($db->quoteName('#__menu_types'))
             ->where($db->quoteName('menutype') . ' = :menutype')
@@ -121,7 +121,7 @@ public function store($updateNulls = false)
             $table->load($this->id);
 
             // Verify that no items are checked out
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__menu'))
                 ->where($db->quoteName('menutype') . ' = :menutype')
@@ -214,7 +214,7 @@ public function delete($pk = null)
             $table->load($pk);
 
             // Verify that no items are checked out
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__menu'))
                 ->where($db->quoteName('menutype') . ' = :menutype')
diff --git a/libraries/src/Table/Module.php b/libraries/src/Table/Module.php
index 86c0021f99048..1a801b60711f3 100644
--- a/libraries/src/Table/Module.php
+++ b/libraries/src/Table/Module.php
@@ -96,7 +96,7 @@ protected function _getAssetParentId(?Table $table = null, $id = null)
         if ($assetId === null) {
             // Build the query to get the asset id of the parent component.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__assets'))
                 ->where($db->quoteName('name') . ' = ' . $db->quote('com_modules'));
diff --git a/libraries/src/Table/Nested.php b/libraries/src/Table/Nested.php
index 022288ae83e0f..a0e3b25481bcb 100644
--- a/libraries/src/Table/Nested.php
+++ b/libraries/src/Table/Nested.php
@@ -149,7 +149,7 @@ public function getPath($pk = null, $diagnostic = false)
 
         // Get the path from the node to the root.
         $select = ($diagnostic) ? 'p.' . $k . ', p.parent_id, p.level, p.lft, p.rgt' : 'p.*';
-        $query  = $db->getQuery(true)
+        $query  = $db->createQuery()
             ->select($select)
             ->from($this->_tbl . ' AS n, ' . $this->_tbl . ' AS p')
             ->where('n.lft BETWEEN p.lft AND p.rgt')
@@ -180,7 +180,7 @@ public function getTree($pk = null, $diagnostic = false)
 
         // Get the node and children as a tree.
         $select = ($diagnostic) ? 'n.' . $k . ', n.parent_id, n.level, n.lft, n.rgt' : 'n.*';
-        $query  = $db->getQuery(true)
+        $query  = $db->createQuery()
             ->select($select)
             ->from($this->_tbl . ' AS n, ' . $this->_tbl . ' AS p')
             ->where('n.lft BETWEEN p.lft AND p.rgt')
@@ -264,7 +264,7 @@ public function move($delta, $where = '')
         $k  = $this->_tbl_key;
         $pk = $this->$k;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($k)
             ->from($this->_tbl)
             ->where('parent_id = ' . $this->parent_id);
@@ -323,7 +323,7 @@ public function moveByReference($referenceId, $position = 'after', $pk = null, $
 
         // Get the ids of child nodes.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($k)
             ->from($this->_tbl)
             ->where('lft BETWEEN ' . (int) $node->lft . ' AND ' . (int) $node->rgt);
@@ -468,7 +468,7 @@ public function moveByReference($referenceId, $position = 'after', $pk = null, $
 
         // Set the correct parent id for the moved node if required.
         if ($node->parent_id != $repositionData->new_parent_id) {
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($this->_tbl);
 
             // Update the title and alias fields if they exist for the table.
@@ -577,7 +577,7 @@ public function delete($pk = null, $children = true)
             return false;
         }
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Should we delete all children along with the node?
         if ($children) {
@@ -695,7 +695,7 @@ public function check()
             }
 
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('1')
                 ->from($this->_tbl)
                 ->where($this->_tbl_key . ' = ' . $this->parent_id);
@@ -764,7 +764,7 @@ public function store($updateNulls = false)
 
                 if ($this->_location_id == 0) {
                     // Get the last root node as the reference node.
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->select($this->_tbl_key . ', parent_id, level, lft, rgt')
                         ->from($this->_tbl)
                         ->where('parent_id = 0')
@@ -797,7 +797,7 @@ public function store($updateNulls = false)
                 }
 
                 // Create space in the tree at the new location for the new node in left ids.
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->update($this->_tbl)
                     ->set('lft = lft + 2')
                     ->where($repositionData->left_where);
@@ -904,7 +904,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
         $k = $this->_tbl_key;
 
         $db         = $this->getDatabase();
-        $query      = $db->getQuery(true);
+        $query      = $db->createQuery();
         $table      = $db->quoteName($this->_tbl);
         $published  = $db->quoteName($this->getColumnAlias('published'));
         $checkedOut = $db->quoteName($this->getColumnAlias('checked_out'));
@@ -1051,7 +1051,7 @@ public function orderUp($pk)
         try {
             // Get the primary keys of child nodes.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($this->_tbl_key)
                 ->from($this->_tbl)
                 ->where('lft BETWEEN ' . (int) $node->lft . ' AND ' . (int) $node->rgt);
@@ -1117,7 +1117,7 @@ public function orderDown($pk)
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Get the right sibling node.
         $sibling = $this->_getNode($node->rgt + 1, 'left');
@@ -1183,7 +1183,7 @@ public function getRootId()
 
         // Test for a unique record with parent_id = 0
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($k)
             ->from($this->_tbl)
             ->where('parent_id = 0');
@@ -1261,7 +1261,7 @@ public function rebuild($parentId = null, $leftId = 0, $level = 0, $path = '')
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Build the structure of the recursive query.
         if (!isset($this->_cache['rebuild.sql'])) {
@@ -1343,7 +1343,7 @@ public function rebuildPath($pk = null)
 
         // Get the aliases for the path from the node to the root node.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('p.alias')
             ->from($this->_tbl . ' AS n, ' . $this->_tbl . ' AS p')
             ->where('n.lft BETWEEN p.lft AND p.rgt')
@@ -1407,7 +1407,7 @@ public function saveorder($idArray = null, $lftArray = null)
     {
         try {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             // Validate arguments
             if (\is_array($idArray) && \is_array($lftArray) && \count($idArray) == \count($lftArray)) {
@@ -1449,7 +1449,7 @@ public function saveorder($idArray = null, $lftArray = null)
     protected function recursiveUpdatePublishedColumn($pk, $newState = null)
     {
         $db        = $this->getDatabase();
-        $query     = $db->getQuery(true);
+        $query     = $db->createQuery();
         $table     = $db->quoteName($this->_tbl);
         $key       = $db->quoteName($this->_tbl_key);
         $published = $db->quoteName($this->getColumnAlias('published'));
@@ -1554,7 +1554,7 @@ protected function _getNode($id, $key = null)
 
         // Get the node data.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($this->_tbl_key . ', parent_id, level, lft, rgt')
             ->from($this->_tbl)
             ->where($k . ' = ' . (int) $id);
@@ -1684,7 +1684,7 @@ protected function _logtable($showData = true, $showQuery = true)
         }
 
         if ($showData) {
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($this->_tbl_key . ', parent_id, lft, rgt, level')
                 ->from($this->_tbl)
                 ->order($this->_tbl_key);
diff --git a/libraries/src/Table/Table.php b/libraries/src/Table/Table.php
index 60209db3cee9a..e1e8d0abacedf 100644
--- a/libraries/src/Table/Table.php
+++ b/libraries/src/Table/Table.php
@@ -813,7 +813,7 @@ public function load($keys = null, $reset = true)
         }
 
         // Initialise the query.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName($this->_tbl));
         $fields = array_keys($this->getProperties());
@@ -991,7 +991,7 @@ public function store($updateNulls = false)
                 // Update the asset_id field in this table.
                 $this->asset_id = (int) $asset->id;
 
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->update($db->quoteName($this->_tbl))
                     ->set('asset_id = ' . (int) $this->asset_id);
                 $this->appendPrimaryKeys($query);
@@ -1123,7 +1123,7 @@ public function delete($pk = null)
         }
 
         // Delete the row by primary key.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName($this->_tbl));
         $this->appendPrimaryKeys($query, $pk);
 
@@ -1206,7 +1206,7 @@ public function checkOut($userId, $pk = null)
         $time = Factory::getDate()->toSql();
 
         // Check the row out by primary key.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName($this->_tbl))
             ->set($db->quoteName($checkedOutField) . ' = ' . (int) $userId)
             ->set($db->quoteName($checkedOutTimeField) . ' = ' . $db->quote($time));
@@ -1289,7 +1289,7 @@ public function checkIn($pk = null)
         $nullID   = $this->_supportNullValue ? 'NULL' : '0';
 
         // Check the row in by primary key.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName($this->_tbl))
             ->set($db->quoteName($checkedOutField) . ' = ' . $nullID)
             ->set($db->quoteName($checkedOutTimeField) . ' = ' . $nullDate);
@@ -1337,7 +1337,7 @@ public function hasPrimaryKey()
                 $empty = $empty && empty($this->$key);
             }
         } else {
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('COUNT(*)')
                 ->from($db->quoteName($this->_tbl));
             $this->appendPrimaryKeys($query);
@@ -1406,7 +1406,7 @@ public function hit($pk = null)
         $hitsField = $this->getColumnAlias('hits');
 
         // Check the row in by primary key.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName($this->_tbl))
             ->set($db->quoteName($hitsField) . ' = (' . $db->quoteName($hitsField) . ' + 1)');
         $this->appendPrimaryKeys($query, $pk);
@@ -1457,7 +1457,7 @@ public function isCheckedOut($with = 0, $against = null)
         // This last check can only be relied on if tracking session metadata
         if (Factory::getApplication()->get('session_metadata', true)) {
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('COUNT(userid)')
                 ->from($db->quoteName('#__session'))
                 ->where($db->quoteName('userid') . ' = ' . (int) $against);
@@ -1494,7 +1494,7 @@ public function getNextOrder($where = '')
         }
 
         // Get the largest ordering value for a given where clause.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('MAX(' . $db->quoteName($this->getColumnAlias('ordering')) . ')')
             ->from($db->quoteName($this->_tbl));
 
@@ -1552,11 +1552,11 @@ public function reorder($where = '')
 
         $quotedOrderingField = $db->quoteName($this->getColumnAlias('ordering'));
 
-        $subquery = $db->getQuery(true)
+        $subquery = $db->createQuery()
             ->from($db->quoteName($this->_tbl))
             ->selectRowNumber($quotedOrderingField, 'new_ordering');
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName($this->_tbl))
             ->set($quotedOrderingField . ' = sq.new_ordering');
 
@@ -1640,7 +1640,7 @@ public function move($delta, $where = '')
         }
 
         $row   = null;
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the primary key and ordering values from the table.
         $query->select(implode(',', $this->_tbl_keys) . ', ' . $quotedOrderingField)
@@ -1791,7 +1791,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 
         foreach ($pks as $pk) {
             // Update the publishing state for rows with the given primary keys.
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName($this->_tbl))
                 ->set($db->quoteName($publishedField) . ' = ' . (int) $state);
 
diff --git a/libraries/src/Table/Update.php b/libraries/src/Table/Update.php
index 9c2933c9de9f3..2f23f8225cd3b 100644
--- a/libraries/src/Table/Update.php
+++ b/libraries/src/Table/Update.php
@@ -102,7 +102,7 @@ public function find($options = [])
             $where[] = $col . ' = ' . $db->quote($val);
         }
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName($this->_tbl_key))
             ->from($db->quoteName($this->_tbl))
             ->where(implode(' AND ', $where));
diff --git a/libraries/src/Table/User.php b/libraries/src/Table/User.php
index f3508ceb8fb93..74796b681cb24 100644
--- a/libraries/src/Table/User.php
+++ b/libraries/src/Table/User.php
@@ -98,7 +98,7 @@ public function load($userId = null, $reset = true)
 
         // Load the user data.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('id') . ' = :userid')
@@ -165,7 +165,7 @@ public function bind($array, $ignore = '')
 
             // Get the titles for the user groups.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->select($db->quoteName('title'))
                 ->from($db->quoteName('#__usergroups'))
@@ -256,7 +256,7 @@ public function check()
 
         // Check for existing username
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('username') . ' = :username')
@@ -356,7 +356,7 @@ public function store($updateNulls = true)
         // Reset groups to the local object.
         $this->groups = $groups;
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Store the group data if the user data was saved.
         if (\is_array($this->groups) && \count($this->groups)) {
@@ -458,7 +458,7 @@ public function delete($userId = null)
 
         // Delete the user.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName($this->_tbl))
             ->where($db->quoteName($this->_tbl_key) . ' = :key')
             ->bind(':key', $key, ParameterType::INTEGER);
@@ -533,7 +533,7 @@ public function setLastVisit($timeStamp = null, $userId = null)
 
         // Update the database row for the user.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName($this->_tbl))
             ->set($db->quoteName('lastvisitDate') . ' = :lastvisitDate')
             ->where($db->quoteName('id') . ' = :id')
diff --git a/libraries/src/Table/Usergroup.php b/libraries/src/Table/Usergroup.php
index e8b5e0b98bae0..27e2a37ef3d3a 100644
--- a/libraries/src/Table/Usergroup.php
+++ b/libraries/src/Table/Usergroup.php
@@ -76,7 +76,7 @@ public function check()
         $parentId = (int) $this->parent_id;
         $title    = trim($this->title);
         $id       = (int) $this->id;
-        $query    = $db->getQuery(true)
+        $query    = $db->createQuery()
             ->select('COUNT(title)')
             ->from($this->_tbl)
             ->where($db->quoteName('title') . ' = :title')
@@ -140,7 +140,7 @@ public function rebuild($parentId = 0, $left = 0)
     {
         // Get the database object
         $db       = $this->getDatabase();
-        $query    = $db->getQuery(true);
+        $query    = $db->createQuery();
         $parentId = (int) $parentId;
 
         // Get all children of this node
@@ -248,7 +248,7 @@ public function delete($oid = null)
         $rgt = (int) $this->rgt;
 
         // Select the usergroup ID and its children
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('c.id'))
             ->from($db->quoteName($this->_tbl, 'c'))
             ->where($db->quoteName('c.lft') . ' >= :lft')
diff --git a/libraries/src/Table/ViewLevel.php b/libraries/src/Table/ViewLevel.php
index 333fa864c3bbe..61fedc9ee7aef 100644
--- a/libraries/src/Table/ViewLevel.php
+++ b/libraries/src/Table/ViewLevel.php
@@ -88,7 +88,7 @@ public function check()
 
         // Check for a duplicate title.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(' . $db->quoteName('title') . ')')
             ->from($db->quoteName('#__viewlevels'))
             ->where($db->quoteName('title') . ' = :title')
diff --git a/libraries/src/UCM/UCMContent.php b/libraries/src/UCM/UCMContent.php
index c551315e71a28..94554e731ae5d 100644
--- a/libraries/src/UCM/UCMContent.php
+++ b/libraries/src/UCM/UCMContent.php
@@ -116,7 +116,7 @@ public function delete($pk, ?UCMType $type = null)
             $pk = explode(',', $pk);
         }
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__ucm_content'))
             ->where($db->quoteName('core_type_id') . ' = :typeId')
             ->whereIn($db->quoteName('core_content_item_id'), $pk)
@@ -225,7 +225,7 @@ protected function store($data, ?TableInterface $table = null, $primaryKey = nul
     public function getPrimaryKey($typeId, $contentItemId)
     {
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('ucm_id'))
             ->from($db->quoteName('#__ucm_base'))
             ->where(
diff --git a/libraries/src/UCM/UCMType.php b/libraries/src/UCM/UCMType.php
index 5c6948711da39..729d169f56184 100644
--- a/libraries/src/UCM/UCMType.php
+++ b/libraries/src/UCM/UCMType.php
@@ -122,7 +122,7 @@ public function getType($pk = null)
             return $this->getTypeByAlias($this->alias);
         }
 
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('ct') . '.*')
             ->from($this->db->quoteName('#__content_types', 'ct'))
             ->where($this->db->quoteName('ct.type_id') . ' = :pk')
@@ -145,7 +145,7 @@ public function getType($pk = null)
      */
     public function getTypeByAlias($typeAlias = null)
     {
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('ct') . '.*')
             ->from($this->db->quoteName('#__content_types', 'ct'))
             ->where($this->db->quoteName('ct.type_alias') . ' = :alias')
@@ -168,7 +168,7 @@ public function getTypeByAlias($typeAlias = null)
      */
     public function getTypeByTable($tableName)
     {
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('ct') . '.*')
             ->from($this->db->quoteName('#__content_types', 'ct'));
 
@@ -203,7 +203,7 @@ public function getTypeId($alias = null)
             $alias = $this->alias;
         }
 
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('ct.type_id'))
             ->from($this->db->quoteName('#__content_types', 'ct'))
             ->where($this->db->quoteName('ct.type_alias') . ' = :alias')
diff --git a/libraries/src/Updater/UpdateAdapter.php b/libraries/src/Updater/UpdateAdapter.php
index ee84ff777693b..3c699f9a1bd68 100644
--- a/libraries/src/Updater/UpdateAdapter.php
+++ b/libraries/src/Updater/UpdateAdapter.php
@@ -196,7 +196,7 @@ protected function toggleUpdateSite($updateSiteId, $enabled = true)
         }
 
         $db    = $this->db;
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__update_sites'))
             ->set($db->quoteName('enabled') . ' = :enabled')
             ->where($db->quoteName('update_site_id') . ' = :id')
@@ -227,7 +227,7 @@ protected function getUpdateSiteName($updateSiteId)
         }
 
         $db    = $this->db;
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('name'))
             ->from($db->quoteName('#__update_sites'))
             ->where($db->quoteName('update_site_id') . ' = :id')
diff --git a/libraries/src/Updater/Updater.php b/libraries/src/Updater/Updater.php
index 3370f4ef1e6de..37135575bacb6 100644
--- a/libraries/src/Updater/Updater.php
+++ b/libraries/src/Updater/Updater.php
@@ -189,7 +189,7 @@ public function findUpdates($eid = 0, $cacheTimeout = 0, $minimumStability = sel
 
             // Make sure there is no update left over in the database.
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__updates'))
                 ->where($db->quoteName('update_site_id') . ' = :id')
                 ->bind(':id', $result['update_site_id'], ParameterType::INTEGER);
@@ -258,7 +258,7 @@ public function getAvailableUpdates(int $eid, string $minimumStability = self::S
     private function getUpdateSites($eid = 0)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select(
             [
@@ -430,12 +430,12 @@ private function getSitesWithUpdates($timestamp = 0)
         $db        = $this->getDatabase();
         $timestamp = (int) $timestamp;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('DISTINCT ' . $db->quoteName('update_site_id'))
             ->from($db->quoteName('#__updates'));
 
         if ($timestamp) {
-            $subQuery = $db->getQuery(true)
+            $subQuery = $db->createQuery()
                 ->select($db->quoteName('update_site_id'))
                 ->from($db->quoteName('#__update_sites'))
                 ->where(
@@ -474,7 +474,7 @@ private function updateLastCheckTimestamp($updateSiteId)
         $db           = $this->getDatabase();
         $updateSiteId = (int) $updateSiteId;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__update_sites'))
             ->set($db->quoteName('last_check_timestamp') . ' = :timestamp')
             ->where($db->quoteName('update_site_id') . ' = :id')
diff --git a/libraries/src/User/User.php b/libraries/src/User/User.php
index b1e3e08f56eca..bb54fc1833390 100644
--- a/libraries/src/User/User.php
+++ b/libraries/src/User/User.php
@@ -430,7 +430,7 @@ public function getAuthorisedCategories($component, $action)
         // @todo: Modify the way permissions are stored in the db to allow for faster implementation and better scaling
         $db = Factory::getDbo();
 
-        $subQuery = $db->getQuery(true)
+        $subQuery = $db->createQuery()
             ->select($db->quoteName(['id', 'asset_id']))
             ->from($db->quoteName('#__categories'))
             ->where(
@@ -440,7 +440,7 @@ public function getAuthorisedCategories($component, $action)
                 ]
             );
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['c.id', 'a.name']))
             ->from('(' . $subQuery . ') AS ' . $db->quoteName('c'))
             ->join('INNER', $db->quoteName('#__assets', 'a'), $db->quoteName('c.asset_id') . ' = ' . $db->quoteName('a.id'))
diff --git a/libraries/src/User/UserFactory.php b/libraries/src/User/UserFactory.php
index 5669d560f3e38..7f00469884d70 100644
--- a/libraries/src/User/UserFactory.php
+++ b/libraries/src/User/UserFactory.php
@@ -65,7 +65,7 @@ public function loadUserById(int $id): User
     public function loadUserByUsername(string $username): User
     {
         // Initialise some variables
-        $query = $this->db->getQuery(true)
+        $query = $this->db->createQuery()
             ->select($this->db->quoteName('id'))
             ->from($this->db->quoteName('#__users'))
             ->where($this->db->quoteName('username') . ' = :username')
diff --git a/libraries/src/User/UserHelper.php b/libraries/src/User/UserHelper.php
index d11b80f78417b..0c5886a7509cd 100644
--- a/libraries/src/User/UserHelper.php
+++ b/libraries/src/User/UserHelper.php
@@ -170,7 +170,7 @@ public static function addUserToGroup($userId, $groupId)
         if (!\in_array($groupId, $user->groups)) {
             // Check whether the group exists.
             $db    = Factory::getDbo();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('id'))
                 ->from($db->quoteName('#__usergroups'))
                 ->where($db->quoteName('id') . ' = :groupId')
@@ -286,7 +286,7 @@ public static function setUserGroups($userId, $groups)
 
         // Get the titles for the user groups.
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['id', 'title']))
             ->from($db->quoteName('#__usergroups'))
             ->whereIn($db->quoteName('id'), $user->groups);
@@ -359,7 +359,7 @@ public static function activateUser($activation)
         $db       = Factory::getDbo();
 
         // Let's get the id of the user we want to activate
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('activation') . ' = :activation')
@@ -404,7 +404,7 @@ public static function getUserId($username)
     {
         // Initialise some variables
         $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('username') . ' = :username')
@@ -602,7 +602,7 @@ public static function destroyUserSessions($userId, $keepCurrent = false, $clien
         try {
             $userId = (int) $userId;
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('session_id'))
                 ->from($db->quoteName('#__session'))
                 ->where($db->quoteName('userid') . ' = :userid')
@@ -643,7 +643,7 @@ public static function destroyUserSessions($userId, $keepCurrent = false, $clien
 
         try {
             $db->setQuery(
-                $db->getQuery(true)
+                $db->createQuery()
                     ->delete($db->quoteName('#__session'))
                     ->whereIn($db->quoteName('session_id'), $sessionIds, ParameterType::LARGE_OBJECT)
             )->execute();
diff --git a/libraries/src/Versioning/Versioning.php b/libraries/src/Versioning/Versioning.php
index 9cfa49ad035ad..ce2e4205f555a 100644
--- a/libraries/src/Versioning/Versioning.php
+++ b/libraries/src/Versioning/Versioning.php
@@ -46,7 +46,7 @@ public static function get($typeAlias, $id)
     {
         $db     = Factory::getDbo();
         $itemid = $typeAlias . '.' . $id;
-        $query  = $db->getQuery(true);
+        $query  = $db->createQuery();
         $query->select($db->quoteName('h.version_note') . ',' . $db->quoteName('h.save_date') . ',' . $db->quoteName('u.name'))
             ->from($db->quoteName('#__history', 'h'))
             ->leftJoin($db->quoteName('#__users', 'u'), $db->quoteName('u.id') . ' = ' . $db->quoteName('h.editor_user_id'))
@@ -72,7 +72,7 @@ public static function delete($typeAlias, $id)
     {
         $db     = Factory::getDbo();
         $itemid = $typeAlias . '.' . $id;
-        $query  = $db->getQuery(true);
+        $query  = $db->createQuery();
         $query->delete($db->quoteName('#__history'))
             ->where($db->quoteName('item_id') . ' = :item_id')
             ->bind(':item_id', $itemid, ParameterType::STRING);
diff --git a/libraries/src/Workflow/Workflow.php b/libraries/src/Workflow/Workflow.php
index f57f19e61189f..f120a94f026b8 100644
--- a/libraries/src/Workflow/Workflow.php
+++ b/libraries/src/Workflow/Workflow.php
@@ -204,7 +204,7 @@ public function getDefaultStageByCategory($catId = 0)
 
         // Check if the workflow exists
         if ($workflow_id = (int) $workflow_id) {
-            $query = $this->db->getQuery(true);
+            $query = $this->db->createQuery();
 
             $query->select(
                 [
@@ -238,7 +238,7 @@ public function getDefaultStageByCategory($catId = 0)
         }
 
         // Use default workflow
-        $query  = $this->db->getQuery(true);
+        $query  = $this->db->createQuery();
 
         $query->select(
             [
@@ -290,7 +290,7 @@ public function getValidTransition(array $pks, int $transitionId)
             return null;
         }
 
-        $query = $this->db->getQuery(true);
+        $query = $this->db->createQuery();
 
         $user = $this->app->getIdentity();
 
@@ -435,7 +435,7 @@ public function executeTransition(array $pks, int $transitionId): bool
     public function createAssociation(int $pk, int $state): bool
     {
         try {
-            $query = $this->db->getQuery(true);
+            $query = $this->db->createQuery();
 
             $query->insert($this->db->quoteName('#__workflow_associations'))
                 ->columns(
@@ -473,7 +473,7 @@ public function updateAssociations(array $pks, int $state): bool
         $pks = ArrayHelper::toInteger($pks);
 
         try {
-            $query = $this->db->getQuery(true);
+            $query = $this->db->createQuery();
 
             $query->update($this->db->quoteName('#__workflow_associations'))
                 ->set($this->db->quoteName('stage_id') . ' = :state')
@@ -504,7 +504,7 @@ public function deleteAssociation(array $pks): bool
         $pks = ArrayHelper::toInteger($pks);
 
         try {
-            $query = $this->db->getQuery(true);
+            $query = $this->db->createQuery();
 
             $query
                 ->delete($this->db->quoteName('#__workflow_associations'))
@@ -531,7 +531,7 @@ public function deleteAssociation(array $pks): bool
      */
     public function getAssociation(int $itemId): ?\stdClass
     {
-        $query = $this->db->getQuery(true);
+        $query = $this->db->createQuery();
 
         $query->select(
             [
diff --git a/modules/mod_articles/src/Helper/ArticlesHelper.php b/modules/mod_articles/src/Helper/ArticlesHelper.php
index 4f551cffaeb74..229f7f334b53b 100644
--- a/modules/mod_articles/src/Helper/ArticlesHelper.php
+++ b/modules/mod_articles/src/Helper/ArticlesHelper.php
@@ -170,7 +170,7 @@ public function getArticles(Registry $params, SiteApplication $app)
 
         switch ($ordering) {
             case 'random':
-                $articles->setState('list.ordering', $this->getDatabase()->getQuery(true)->rand());
+                $articles->setState('list.ordering', $this->getDatabase()->createQuery()->rand());
                 break;
 
             case 'rating_count':
diff --git a/modules/mod_articles_archive/src/Helper/ArticlesArchiveHelper.php b/modules/mod_articles_archive/src/Helper/ArticlesArchiveHelper.php
index a8fd6be30f6b4..0d67db8d3d068 100644
--- a/modules/mod_articles_archive/src/Helper/ArticlesArchiveHelper.php
+++ b/modules/mod_articles_archive/src/Helper/ArticlesArchiveHelper.php
@@ -47,7 +47,7 @@ class ArticlesArchiveHelper implements DatabaseAwareInterface
     public function getArticlesByMonths(Registry $moduleParams, SiteApplication $app): array
     {
         $db        = $this->getDatabase();
-        $query     = $db->getQuery(true);
+        $query     = $db->createQuery();
 
         $query->select($query->month($db->quoteName('created')) . ' AS created_month')
             ->select('MIN(' . $db->quoteName('created') . ') AS created')
diff --git a/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php b/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php
index 87f6c57bda87d..adb90bab5008e 100644
--- a/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php
+++ b/modules/mod_articles_category/src/Helper/ArticlesCategoryHelper.php
@@ -165,7 +165,7 @@ public function getArticles(Registry $params, SiteApplication $app)
 
         switch ($ordering) {
             case 'random':
-                $articles->setState('list.ordering', $this->getDatabase()->getQuery(true)->rand());
+                $articles->setState('list.ordering', $this->getDatabase()->createQuery()->rand());
                 break;
 
             case 'rating_count':
diff --git a/modules/mod_articles_latest/src/Helper/ArticlesLatestHelper.php b/modules/mod_articles_latest/src/Helper/ArticlesLatestHelper.php
index 011e15d706e7b..d30f52edbae16 100644
--- a/modules/mod_articles_latest/src/Helper/ArticlesLatestHelper.php
+++ b/modules/mod_articles_latest/src/Helper/ArticlesLatestHelper.php
@@ -121,7 +121,7 @@ public function getArticles(Registry $params, SiteApplication $app)
             'mc_dsc' => 'a.modified',
             'c_dsc'  => 'a.created',
             'p_dsc'  => 'a.publish_up',
-            'random' => $db->getQuery(true)->rand(),
+            'random' => $db->createQuery()->rand(),
         ];
 
         $ordering = ArrayHelper::getValue($order_map, $params->get('ordering', 'p_dsc'), 'a.publish_up');
diff --git a/modules/mod_articles_news/src/Helper/ArticlesNewsHelper.php b/modules/mod_articles_news/src/Helper/ArticlesNewsHelper.php
index ec8ef68b4459b..1de32f176902f 100644
--- a/modules/mod_articles_news/src/Helper/ArticlesNewsHelper.php
+++ b/modules/mod_articles_news/src/Helper/ArticlesNewsHelper.php
@@ -107,7 +107,7 @@ public function getArticles(Registry $params, SiteApplication $app)
         $model->setState('list.ordering', $ordering);
 
         if (trim($ordering) === 'rand()') {
-            $model->setState('list.ordering', $this->getDatabase()->getQuery(true)->rand());
+            $model->setState('list.ordering', $this->getDatabase()->createQuery()->rand());
         } else {
             $direction = $params->get('direction', 1) ? 'DESC' : 'ASC';
             $model->setState('list.direction', $direction);
diff --git a/modules/mod_related_items/src/Helper/RelatedItemsHelper.php b/modules/mod_related_items/src/Helper/RelatedItemsHelper.php
index 1cb33963268c9..c748f59895089 100644
--- a/modules/mod_related_items/src/Helper/RelatedItemsHelper.php
+++ b/modules/mod_related_items/src/Helper/RelatedItemsHelper.php
@@ -74,7 +74,7 @@ public function getRelatedArticles(Registry $params, SiteApplication $app): arra
 
         $now      = Factory::getDate()->toSql();
         $related  = [];
-        $query    = $db->getQuery(true);
+        $query    = $db->createQuery();
 
         if ($id) {
             // Select the meta keywords from the item
diff --git a/modules/mod_stats/src/Helper/StatsHelper.php b/modules/mod_stats/src/Helper/StatsHelper.php
index 2abf2eb9261e7..93a9d0782860b 100644
--- a/modules/mod_stats/src/Helper/StatsHelper.php
+++ b/modules/mod_stats/src/Helper/StatsHelper.php
@@ -47,7 +47,7 @@ public function getStats(Registry &$params, CMSApplicationInterface $app)
     {
         $db         = $this->getDatabase();
         $rows       = [];
-        $query      = $db->getQuery(true);
+        $query      = $db->createQuery();
         $serverinfo = $params->get('serverinfo', 0);
         $siteinfo   = $params->get('siteinfo', 0);
         $counter    = $params->get('counter', 0);
diff --git a/modules/mod_tags_popular/src/Helper/TagsPopularHelper.php b/modules/mod_tags_popular/src/Helper/TagsPopularHelper.php
index e6673aa0d4c10..c9e45024e96b1 100644
--- a/modules/mod_tags_popular/src/Helper/TagsPopularHelper.php
+++ b/modules/mod_tags_popular/src/Helper/TagsPopularHelper.php
@@ -51,7 +51,7 @@ public function getTags(&$params)
         $nowDate     = Factory::getDate()->toSql();
         $nullDate    = $db->getNullDate();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(
                 [
                     'MAX(' . $db->quoteName('tag_id') . ') AS ' . $db->quoteName('tag_id'),
@@ -151,7 +151,7 @@ public function getTags(&$params)
                 }
 
                 $query->order($db->quoteName('count') . ' DESC');
-                $equery = $db->getQuery(true)
+                $equery = $db->createQuery()
                     ->select(
                         $db->quoteName(
                             [
diff --git a/modules/mod_tags_similar/src/Helper/TagsSimilarHelper.php b/modules/mod_tags_similar/src/Helper/TagsSimilarHelper.php
index e5bde10ae20c6..6c38d0fc293e8 100644
--- a/modules/mod_tags_similar/src/Helper/TagsSimilarHelper.php
+++ b/modules/mod_tags_similar/src/Helper/TagsSimilarHelper.php
@@ -76,7 +76,7 @@ public function getItems(&$params)
         $tagsToMatch = explode(',', $tagsToMatch);
         $tagCount    = \count($tagsToMatch);
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query
             ->select(
                 [
diff --git a/modules/mod_users_latest/src/Helper/UsersLatestHelper.php b/modules/mod_users_latest/src/Helper/UsersLatestHelper.php
index c32614d7a9598..0960182caa804 100644
--- a/modules/mod_users_latest/src/Helper/UsersLatestHelper.php
+++ b/modules/mod_users_latest/src/Helper/UsersLatestHelper.php
@@ -46,7 +46,7 @@ public function getLatestUsers(Registry $params, SiteApplication $app): array
         $db   = $this->getDatabase();
         $user = $app->getIdentity();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['a.id', 'a.name', 'a.username', 'a.registerDate']))
             ->order($db->quoteName('a.registerDate') . ' DESC')
             ->from($db->quoteName('#__users', 'a'));
diff --git a/modules/mod_whosonline/src/Helper/WhosonlineHelper.php b/modules/mod_whosonline/src/Helper/WhosonlineHelper.php
index 5747099efe282..03133eb2c57e1 100644
--- a/modules/mod_whosonline/src/Helper/WhosonlineHelper.php
+++ b/modules/mod_whosonline/src/Helper/WhosonlineHelper.php
@@ -49,7 +49,7 @@ public function getOnlineUsersCount(CMSApplicationInterface $app): array
 
         $whereCondition = $app->get('shared_session', '0') ? 'IS NULL' : '= 0';
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('guest, client_id')
             ->from('#__session')
             ->where('client_id ' . $whereCondition);
@@ -96,7 +96,7 @@ public function fetchOnlineUserNames(CMSApplicationInterface $app, Registry $par
         $whereCondition = $app->get('shared_session', '0') ? 'IS NULL' : '= 0';
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['a.username', 'a.userid', 'a.client_id']))
             ->from($db->quoteName('#__session', 'a'))
             ->where($db->quoteName('a.userid') . ' != 0')
diff --git a/plugins/actionlog/joomla/src/Extension/Joomla.php b/plugins/actionlog/joomla/src/Extension/Joomla.php
index e67ea42e671bb..65aa2a4c375ae 100644
--- a/plugins/actionlog/joomla/src/Extension/Joomla.php
+++ b/plugins/actionlog/joomla/src/Extension/Joomla.php
@@ -306,7 +306,7 @@ public function onContentChangeState(Model\AfterChangeStateEvent $event): void
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName([$params->title_holder, $params->id_holder]))
             ->from($db->quoteName($params->table_name))
             ->whereIn($db->quoteName($params->id_holder), ArrayHelper::toInteger($pks));
@@ -864,7 +864,7 @@ public function onUserLoginFailure(User\LoginFailureEvent $event): void
 
         // Get the user id for the given username
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['id', 'username']))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('username') . ' = :username')
diff --git a/plugins/api-authentication/basic/src/Extension/Basic.php b/plugins/api-authentication/basic/src/Extension/Basic.php
index 8ba09c79310be..06337e7c9c2bd 100644
--- a/plugins/api-authentication/basic/src/Extension/Basic.php
+++ b/plugins/api-authentication/basic/src/Extension/Basic.php
@@ -70,7 +70,7 @@ public function onUserAuthenticate(AuthenticationEvent $event): void
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['id', 'password']))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('username') . ' = :username')
diff --git a/plugins/api-authentication/token/src/Extension/Token.php b/plugins/api-authentication/token/src/Extension/Token.php
index 9831071472cca..b2c0325965651 100644
--- a/plugins/api-authentication/token/src/Extension/Token.php
+++ b/plugins/api-authentication/token/src/Extension/Token.php
@@ -269,7 +269,7 @@ private function getTokenSeedForUser(int $userId): ?string
     {
         try {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('profile_value'))
                 ->from($db->quoteName('#__user_profiles'))
                 ->where($db->quoteName('profile_key') . ' = :profileKey')
@@ -298,7 +298,7 @@ private function isTokenEnabledForUser(int $userId): bool
     {
         try {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('profile_value'))
                 ->from($db->quoteName('#__user_profiles'))
                 ->where($db->quoteName('profile_key') . ' = :profileKey')
diff --git a/plugins/authentication/cookie/src/Extension/Cookie.php b/plugins/authentication/cookie/src/Extension/Cookie.php
index df3e7fe29e65e..478b6ecb7a75a 100644
--- a/plugins/authentication/cookie/src/Extension/Cookie.php
+++ b/plugins/authentication/cookie/src/Extension/Cookie.php
@@ -136,7 +136,7 @@ public function onUserAuthenticate(AuthenticationEvent $event): void
 
         // Remove expired tokens
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__user_keys'))
             ->where($db->quoteName('time') . ' < :now')
             ->bind(':now', $now);
@@ -148,7 +148,7 @@ public function onUserAuthenticate(AuthenticationEvent $event): void
         }
 
         // Find the matching record if it exists.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['user_id', 'token', 'series', 'time']))
             ->from($db->quoteName('#__user_keys'))
             ->where($db->quoteName('series') . ' = :series')
@@ -188,7 +188,7 @@ public function onUserAuthenticate(AuthenticationEvent $event): void
              * Either the series was guessed correctly or a cookie was stolen and used twice (once by attacker and once by victim).
              * Delete all tokens for this user!
              */
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__user_keys'))
                 ->where($db->quoteName('user_id') . ' = :userid')
                 ->bind(':userid', $results[0]->user_id);
@@ -223,7 +223,7 @@ public function onUserAuthenticate(AuthenticationEvent $event): void
         }
 
         // Make sure there really is a user with this name and get the data for the session.
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['id', 'username', 'password']))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('username') . ' = :userid')
@@ -323,7 +323,7 @@ public function onUserAfterLogin(AfterLoginEvent $event): void
 
             do {
                 $series = UserHelper::genRandomPassword(20);
-                $query  = $db->getQuery(true)
+                $query  = $db->createQuery()
                     ->select($db->quoteName('series'))
                     ->from($db->quoteName('#__user_keys'))
                     ->where($db->quoteName('series') . ' = :series')
@@ -369,7 +369,7 @@ public function onUserAfterLogin(AfterLoginEvent $event): void
             ]
         );
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         if (!empty($options['remember'])) {
             $future = (time() + $lifetime);
@@ -443,7 +443,7 @@ public function onUserAfterLogout(AfterLogoutEvent $event): void
 
         // Remove the record from the database
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__user_keys'))
             ->where($db->quoteName('series') . ' = :series')
             ->bind(':series', $series);
diff --git a/plugins/authentication/joomla/src/Extension/Joomla.php b/plugins/authentication/joomla/src/Extension/Joomla.php
index 71975d2a40900..aa7efe40d2bd5 100644
--- a/plugins/authentication/joomla/src/Extension/Joomla.php
+++ b/plugins/authentication/joomla/src/Extension/Joomla.php
@@ -69,7 +69,7 @@ public function onUserAuthenticate(AuthenticationEvent $event): void
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['id', 'password']))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('username') . ' = :username')
diff --git a/plugins/content/confirmconsent/src/Field/ConsentBoxField.php b/plugins/content/confirmconsent/src/Field/ConsentBoxField.php
index 01e322e7667a6..3f45d7059bd34 100644
--- a/plugins/content/confirmconsent/src/Field/ConsentBoxField.php
+++ b/plugins/content/confirmconsent/src/Field/ConsentBoxField.php
@@ -242,7 +242,7 @@ private function getAssignedArticleUrl()
         $db = $this->getDatabase();
 
         // Get the info from the article
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['id', 'catid', 'language']))
             ->from($db->quoteName('#__content'))
             ->where($db->quoteName('id') . ' = ' . (int) $this->articleid);
@@ -320,7 +320,7 @@ private function getAssignedMenuItemUrl()
 
             if (Multilanguage::isEnabled()) {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName(['id', 'language']))
                     ->from($db->quoteName('#__menu'))
                     ->where($db->quoteName('id') . ' = :id')
diff --git a/plugins/content/contact/src/Extension/Contact.php b/plugins/content/contact/src/Extension/Contact.php
index 1c00ee894f9f0..f4626b0b79d3e 100644
--- a/plugins/content/contact/src/Extension/Contact.php
+++ b/plugins/content/contact/src/Extension/Contact.php
@@ -119,7 +119,7 @@ private function getContactData($userId)
         }
 
         $db     = $this->getDatabase();
-        $query  = $db->getQuery(true);
+        $query  = $db->createQuery();
         $userId = (int) $userId;
 
         $query->select($db->quoteName('contact.id', 'contactid'))
diff --git a/plugins/content/joomla/src/Extension/Joomla.php b/plugins/content/joomla/src/Extension/Joomla.php
index 11007410781e2..268ba3456e3ba 100644
--- a/plugins/content/joomla/src/Extension/Joomla.php
+++ b/plugins/content/joomla/src/Extension/Joomla.php
@@ -154,7 +154,7 @@ public function onContentAfterSave(AfterSaveEvent $event): void
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('id'))
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('sendEmail') . ' = 1')
@@ -392,7 +392,7 @@ private function injectContentSchema(string $context, Registry $schema)
                     $aContext = 'com_content.article';
 
                     // Load the schema data from the database
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->select('*')
                         ->from($db->quoteName('#__schemaorg'))
                         ->whereIn($db->quoteName('itemId'), $articleIds)
@@ -884,7 +884,7 @@ private function stageNotUsed($pk)
     private function countItemsInCategory($table, $catid)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Count the items in this category
         $query->select('COUNT(' . $db->quoteName('id') . ')')
@@ -937,7 +937,7 @@ private function countItemsInStage(array $stageIds, string $extension): bool
             return false;
         }
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select('COUNT(' . $db->quoteName('b.id') . ')')
             ->from($db->quoteName('#__workflow_associations', 'wa'))
@@ -985,7 +985,7 @@ private function countItemsInChildren($table, $catid, $data)
         // Make sure we only do the query if we have some categories to look in
         if (\count($childCategoryIds)) {
             // Count the items in this category
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('COUNT(' . $db->quoteName('id') . ')')
                 ->from($db->quoteName($table))
                 ->whereIn($db->quoteName('catid'), $childCategoryIds);
@@ -1035,7 +1035,7 @@ public function onContentChangeState(AfterChangeStateEvent $event)
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName('core_content_id'))
             ->from($db->quoteName('#__ucm_content'))
             ->where($db->quoteName('core_type_alias') . ' = :context')
diff --git a/plugins/content/pagenavigation/src/Extension/PageNavigation.php b/plugins/content/pagenavigation/src/Extension/PageNavigation.php
index 0bf7bce6abdac..b3af8719659c3 100644
--- a/plugins/content/pagenavigation/src/Extension/PageNavigation.php
+++ b/plugins/content/pagenavigation/src/Extension/PageNavigation.php
@@ -75,7 +75,7 @@ public function onContentBeforeDisplay(BeforeDisplayEvent $event)
             $user       = $app->getIdentity();
             $lang       = $app->getLanguage();
             $now        = Factory::getDate()->toSql();
-            $query      = $db->getQuery(true);
+            $query      = $db->createQuery();
             $uid        = $row->id;
             $option     = 'com_content';
             $canPublish = $user->authorise('core.edit.state', $option . '.article.' . $row->id);
diff --git a/plugins/editors/tinymce/src/PluginTraits/ActiveSiteTemplate.php b/plugins/editors/tinymce/src/PluginTraits/ActiveSiteTemplate.php
index 64f19c61a275c..340fd2a444f6d 100644
--- a/plugins/editors/tinymce/src/PluginTraits/ActiveSiteTemplate.php
+++ b/plugins/editors/tinymce/src/PluginTraits/ActiveSiteTemplate.php
@@ -33,7 +33,7 @@ trait ActiveSiteTemplate
     protected function getActiveSiteTemplate()
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__template_styles'))
             ->where(
diff --git a/plugins/extension/finder/src/Extension/Finder.php b/plugins/extension/finder/src/Extension/Finder.php
index 2b5332f6ffd86..969e49252e2eb 100644
--- a/plugins/extension/finder/src/Extension/Finder.php
+++ b/plugins/extension/finder/src/Extension/Finder.php
@@ -68,7 +68,7 @@ public function onExtensionAfterInstall(AbstractExtensionEvent $event): void
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['element', 'client_id']))
             ->from($db->quoteName('#__extensions'))
             ->where(
@@ -161,7 +161,7 @@ function ($word) {
         $words = array_filter(array_map('trim', $words));
         $words = array_unique($words);
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $lang = Helper::getPrimaryLanguage($extension->element);
 
@@ -196,7 +196,7 @@ protected function removeCommonWords($extension)
         $db   = $this->getDatabase();
         $lang = Helper::getPrimaryLanguage($extension->element);
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
         $query->delete($db->quoteName('#__finder_terms_common'))
             ->where(
                 [
diff --git a/plugins/extension/joomla/src/Extension/Joomla.php b/plugins/extension/joomla/src/Extension/Joomla.php
index 88e5fed196346..8f68d3c9dc5a8 100644
--- a/plugins/extension/joomla/src/Extension/Joomla.php
+++ b/plugins/extension/joomla/src/Extension/Joomla.php
@@ -90,7 +90,7 @@ private function addUpdateSite($name, $type, $location, $enabled, $extraQuery =
     {
         // Look if the location is used already; doesn't matter what type you can't have two types at the same address, doesn't make sense
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName('update_site_id'))
             ->from($db->quoteName('#__update_sites'))
@@ -221,7 +221,7 @@ public function onExtensionAfterUninstall(AfterUninstallEvent $event): void
         // update sites for it
         if ($eid && $removed) {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
             $eid   = (int) $eid;
 
             $query->delete($db->quoteName('#__update_sites_extensions'))
@@ -241,10 +241,10 @@ public function onExtensionAfterUninstall(AfterUninstallEvent $event): void
 
             if (\is_array($results)) {
                 // So we need to delete the update sites and their associated updates
-                $updatesite_delete = $db->getQuery(true);
+                $updatesite_delete = $db->createQuery();
                 $updatesite_delete->delete($db->quoteName('#__update_sites'));
 
-                $updatesite_query = $db->getQuery(true);
+                $updatesite_query = $db->createQuery();
                 $updatesite_query->select($db->quoteName('update_site_id'))
                     ->from($db->quoteName('#__update_sites'));
 
diff --git a/plugins/fields/sql/tmpl/sql.php b/plugins/fields/sql/tmpl/sql.php
index 4206412672262..5d9f9f0a44c0c 100644
--- a/plugins/fields/sql/tmpl/sql.php
+++ b/plugins/fields/sql/tmpl/sql.php
@@ -21,7 +21,7 @@
 
 $db    = Factory::getDbo();
 $value = (array) $value;
-$query = $db->getQuery(true);
+$query = $db->createQuery();
 $sql   = $fieldParams->get('query', '');
 
 $bindNames = $query->bindArray($value, ParameterType::STRING);
diff --git a/plugins/finder/categories/src/Extension/Categories.php b/plugins/finder/categories/src/Extension/Categories.php
index bb1af2ef2500c..390eaff481c01 100644
--- a/plugins/finder/categories/src/Extension/Categories.php
+++ b/plugins/finder/categories/src/Extension/Categories.php
@@ -393,7 +393,7 @@ protected function getListQuery($query = null)
         $db = $this->getDatabase();
 
         // Check if we can use the supplied SQL query.
-        $query = $query instanceof QueryInterface ? $query : $db->getQuery(true);
+        $query = $query instanceof QueryInterface ? $query : $db->createQuery();
 
         $query->select(
             $db->quoteName(
@@ -461,7 +461,7 @@ protected function getListQuery($query = null)
      */
     protected function getStateQuery()
     {
-        $query = $this->getDatabase()->getQuery(true);
+        $query = $this->getDatabase()->createQuery();
 
         $query->select(
             $this->getDatabase()->quoteName(
diff --git a/plugins/finder/contacts/src/Extension/Contacts.php b/plugins/finder/contacts/src/Extension/Contacts.php
index 767b0bf24c4d2..24c2d73412281 100644
--- a/plugins/finder/contacts/src/Extension/Contacts.php
+++ b/plugins/finder/contacts/src/Extension/Contacts.php
@@ -432,7 +432,7 @@ protected function getListQuery($query = null)
         $db = $this->getDatabase();
 
         // Check if we can use the supplied SQL query.
-        $query = $query instanceof QueryInterface ? $query : $db->getQuery(true)
+        $query = $query instanceof QueryInterface ? $query : $db->createQuery()
             ->select('a.id, a.name AS title, a.alias, a.con_position AS position, a.address, a.created AS start_date')
             ->select('a.created_by_alias, a.modified, a.modified_by')
             ->select('a.metakey, a.metadesc, a.metadata, a.language')
diff --git a/plugins/finder/content/src/Extension/Content.php b/plugins/finder/content/src/Extension/Content.php
index 9c2af50fa94a6..703a5f73e82e2 100644
--- a/plugins/finder/content/src/Extension/Content.php
+++ b/plugins/finder/content/src/Extension/Content.php
@@ -381,7 +381,7 @@ protected function getListQuery($query = null)
         $db = $this->getDatabase();
 
         // Check if we can use the supplied SQL query.
-        $query = $query instanceof QueryInterface ? $query : $db->getQuery(true)
+        $query = $query instanceof QueryInterface ? $query : $db->createQuery()
             ->select('a.id, a.title, a.alias, a.introtext AS summary, a.fulltext AS body')
             ->select('a.images')
             ->select('a.state, a.catid, a.created AS start_date, a.created_by')
diff --git a/plugins/finder/newsfeeds/src/Extension/Newsfeeds.php b/plugins/finder/newsfeeds/src/Extension/Newsfeeds.php
index cf4a4125aea3a..e6d66b4afe008 100644
--- a/plugins/finder/newsfeeds/src/Extension/Newsfeeds.php
+++ b/plugins/finder/newsfeeds/src/Extension/Newsfeeds.php
@@ -363,7 +363,7 @@ protected function getListQuery($query = null)
         $db = $this->getDatabase();
 
         // Check if we can use the supplied SQL query.
-        $query = $query instanceof QueryInterface ? $query : $db->getQuery(true)
+        $query = $query instanceof QueryInterface ? $query : $db->createQuery()
             ->select('a.id, a.catid, a.name AS title, a.alias, a.link AS link')
             ->select('a.published AS state, a.ordering, a.created AS start_date, a.params, a.access')
             ->select('a.publish_up AS publish_start_date, a.publish_down AS publish_end_date')
diff --git a/plugins/finder/tags/src/Extension/Tags.php b/plugins/finder/tags/src/Extension/Tags.php
index 7083e273b389e..d0df94269f3e0 100644
--- a/plugins/finder/tags/src/Extension/Tags.php
+++ b/plugins/finder/tags/src/Extension/Tags.php
@@ -321,7 +321,7 @@ protected function getListQuery($query = null)
         $db = $this->getDatabase();
 
         // Check if we can use the supplied SQL query.
-        $query = $query instanceof QueryInterface ? $query : $db->getQuery(true)
+        $query = $query instanceof QueryInterface ? $query : $db->createQuery()
             ->select('a.id, a.title, a.alias, a.description AS summary')
             ->select('a.created_time AS start_date, a.created_user_id AS created_by')
             ->select('a.metakey, a.metadesc, a.metadata, a.language, a.access')
@@ -358,7 +358,7 @@ protected function getListQuery($query = null)
      */
     protected function getStateQuery()
     {
-        $query = $this->getDatabase()->getQuery(true);
+        $query = $this->getDatabase()->createQuery();
         $query->select($this->getDatabase()->quoteName('a.id'))
             ->select($this->getDatabase()->quoteName('a.' . $this->state_field, 'state') . ', ' . $this->getDatabase()->quoteName('a.access'))
             ->select('NULL AS cat_state, NULL AS cat_access')
@@ -379,7 +379,7 @@ protected function getStateQuery()
     protected function getUpdateQueryByTime($time)
     {
         // Build an SQL query based on the modified time.
-        $query = $this->getDatabase()->getQuery(true)
+        $query = $this->getDatabase()->createQuery()
             ->where('a.date >= ' . $this->getDatabase()->quote($time));
 
         return $query;
diff --git a/plugins/installer/override/src/Extension/Override.php b/plugins/installer/override/src/Extension/Override.php
index a1ea7e6782d32..4b5afacbb7562 100644
--- a/plugins/installer/override/src/Extension/Override.php
+++ b/plugins/installer/override/src/Extension/Override.php
@@ -298,7 +298,7 @@ public function load($id, $exid)
         $db = $this->getDatabase();
 
         // Create a new query object.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query
             ->select($db->quoteName('hash_id'))
@@ -345,7 +345,7 @@ private function saveOverrides($pks)
         $db = $this->getDatabase();
 
         // Create an insert query.
-        $insertQuery = $db->getQuery(true)
+        $insertQuery = $db->createQuery()
             ->insert($db->quoteName('#__template_overrides'))
             ->columns($db->quoteName($columns));
 
@@ -360,7 +360,7 @@ private function saveOverrides($pks)
             }
 
             if ($this->load($pk->id, $pk->extension_id)) {
-                $updateQuery = $db->getQuery(true)
+                $updateQuery = $db->createQuery()
                     ->update($db->quoteName('#__template_overrides'))
                     ->set(
                         [
diff --git a/plugins/privacy/actionlogs/src/Extension/Actionlogs.php b/plugins/privacy/actionlogs/src/Extension/Actionlogs.php
index 75cee753047f8..0a98366612783 100644
--- a/plugins/privacy/actionlogs/src/Extension/Actionlogs.php
+++ b/plugins/privacy/actionlogs/src/Extension/Actionlogs.php
@@ -63,7 +63,7 @@ public function onPrivacyExportRequest(ExportRequestEvent $event): void
         $db     = $this->getDatabase();
         $userId = (int) $user->id;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select(['a.*', $db->quoteName('u.name')])
             ->from($db->quoteName('#__action_logs', 'a'))
             ->join('INNER', $db->quoteName('#__users', 'u'), $db->quoteName('a.user_id') . ' = ' . $db->quoteName('u.id'))
diff --git a/plugins/privacy/consents/src/Extension/Consents.php b/plugins/privacy/consents/src/Extension/Consents.php
index 24ed5d43d7ee6..ff6f9ac79b1db 100644
--- a/plugins/privacy/consents/src/Extension/Consents.php
+++ b/plugins/privacy/consents/src/Extension/Consents.php
@@ -62,7 +62,7 @@ public function onPrivacyExportRequest(ExportRequestEvent $event): void
         $domain = $this->createDomain('consents', 'joomla_consent_data');
         $db     = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__privacy_consents'))
             ->where($db->quoteName('user_id') . ' = :id')
diff --git a/plugins/privacy/contact/src/Extension/Contact.php b/plugins/privacy/contact/src/Extension/Contact.php
index 512f9b777cbe4..98de76a4e95d9 100644
--- a/plugins/privacy/contact/src/Extension/Contact.php
+++ b/plugins/privacy/contact/src/Extension/Contact.php
@@ -67,7 +67,7 @@ public function onPrivacyExportRequest(ExportRequestEvent $event): void
         $domains[] = $domain;
         $db        = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__contact_details'))
             ->order($db->quoteName('ordering') . ' ASC');
diff --git a/plugins/privacy/content/src/Extension/Content.php b/plugins/privacy/content/src/Extension/Content.php
index bfe0f2c47ad1f..31fa18cc182d3 100644
--- a/plugins/privacy/content/src/Extension/Content.php
+++ b/plugins/privacy/content/src/Extension/Content.php
@@ -65,7 +65,7 @@ public function onPrivacyExportRequest(ExportRequestEvent $event): void
         $domains[] = $domain;
         $db        = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__content'))
             ->where($db->quoteName('created_by') . ' = ' . (int) $user->id)
diff --git a/plugins/privacy/message/src/Extension/Message.php b/plugins/privacy/message/src/Extension/Message.php
index e1ba1339331b1..1ed17ad981f6c 100644
--- a/plugins/privacy/message/src/Extension/Message.php
+++ b/plugins/privacy/message/src/Extension/Message.php
@@ -62,7 +62,7 @@ public function onPrivacyExportRequest(ExportRequestEvent $event): void
         $domain = $this->createDomain('user_messages', 'joomla_user_messages_data');
         $db     = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__messages'))
             ->where($db->quoteName('user_id_from') . ' = :useridfrom')
diff --git a/plugins/privacy/user/src/Extension/UserPlugin.php b/plugins/privacy/user/src/Extension/UserPlugin.php
index cf627d563ff73..c50d46eccaffe 100644
--- a/plugins/privacy/user/src/Extension/UserPlugin.php
+++ b/plugins/privacy/user/src/Extension/UserPlugin.php
@@ -165,7 +165,7 @@ private function createNotesDomain(TableUser $user)
         $domain = $this->createDomain('user_notes', 'joomla_user_notes_data');
         $db     = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__user_notes'))
             ->where($db->quoteName('user_id') . ' = :userid')
@@ -199,7 +199,7 @@ private function createProfileDomain(TableUser $user)
         $domain = $this->createDomain('user_profile', 'joomla_user_profile_data');
         $db     = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__user_profiles'))
             ->where($db->quoteName('user_id') . ' = :userid')
diff --git a/plugins/quickicon/eos/src/Extension/Eos.php b/plugins/quickicon/eos/src/Extension/Eos.php
index 24d219954ae0a..ac1be95da8ac6 100644
--- a/plugins/quickicon/eos/src/Extension/Eos.php
+++ b/plugins/quickicon/eos/src/Extension/Eos.php
@@ -139,7 +139,7 @@ private function saveParams(): bool
     {
         $params = $this->params->toString('JSON');
         $db     = $this->getDatabase();
-        $query  = $db->getQuery(true)
+        $query  = $db->createQuery()
             ->update($db->quoteName('#__extensions'))
             ->set($db->quoteName('params') . ' = :params')
             ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
diff --git a/plugins/quickicon/overridecheck/src/Extension/OverrideCheck.php b/plugins/quickicon/overridecheck/src/Extension/OverrideCheck.php
index bd38f3795a174..216a84252345a 100644
--- a/plugins/quickicon/overridecheck/src/Extension/OverrideCheck.php
+++ b/plugins/quickicon/overridecheck/src/Extension/OverrideCheck.php
@@ -119,7 +119,7 @@ public function onGetIcons(QuickIconsEvent $event): void
     private function getOverridePluginId()
     {
         $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('installer'))
diff --git a/plugins/sampledata/blog/src/Extension/Blog.php b/plugins/sampledata/blog/src/Extension/Blog.php
index a16aa23af186f..e38daa8588a5f 100644
--- a/plugins/sampledata/blog/src/Extension/Blog.php
+++ b/plugins/sampledata/blog/src/Extension/Blog.php
@@ -339,7 +339,7 @@ public function onAjaxSampledataApplyStep1(AjaxEvent $event): void
             }
 
             // Get the stage Ids of the new stages
-            $query = $this->getDatabase()->getQuery(true);
+            $query = $this->getDatabase()->createQuery();
 
             $query->select([$this->getDatabase()->quoteName('title'), $this->getDatabase()->quoteName('id')])
                 ->from($this->getDatabase()->quoteName('#__workflow_stages'))
@@ -769,7 +769,7 @@ public function onAjaxSampledataApplyStep1(AjaxEvent $event): void
                 && ComponentHelper::getParams('com_content')->get('workflow_enabled')
             ) {
                 // Set the article featured in #__content_frontpage
-                $this->getDatabase()->getQuery(true);
+                $this->getDatabase()->createQuery();
 
                 $featuredItem = (object) [
                     'content_id'    => $articleModel->getItem()->id,
diff --git a/plugins/sampledata/multilang/src/Extension/MultiLanguage.php b/plugins/sampledata/multilang/src/Extension/MultiLanguage.php
index a0992a7ac4f8b..24ae01b8316df 100644
--- a/plugins/sampledata/multilang/src/Extension/MultiLanguage.php
+++ b/plugins/sampledata/multilang/src/Extension/MultiLanguage.php
@@ -517,7 +517,7 @@ private function enablePlugin($pluginName)
     {
         // Create a new db object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query
             ->update($db->quoteName('#__extensions'))
@@ -575,7 +575,7 @@ private function disableModuleMainMenu()
     {
         // Create a new db object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Disable main menu module with Home set to ALL languages.
         $query
@@ -898,7 +898,7 @@ private function addAssociations($groupedAssociations)
 
         foreach ($groupedAssociations as $context => $associations) {
             $key   = md5(json_encode($associations));
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->insert($db->quoteName('#__associations'));
 
             foreach ($associations as $language => $id) {
@@ -946,7 +946,7 @@ private function addModuleInModuleMenu($moduleId)
     {
         // Create a new db object.
         $db       = $this->getDatabase();
-        $query    = $db->getQuery(true);
+        $query    = $db->createQuery();
         $moduleId = (int) $moduleId;
 
         // Add Module in Module menus.
@@ -1115,7 +1115,7 @@ private function addArticle($itemLanguage, $categoryId)
         // Get the new item ID.
         $newId = $article->get('id');
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->insert($db->quoteName('#__content_frontpage'))
             ->values($newId . ', 0, NULL, NULL');
 
@@ -1259,7 +1259,7 @@ protected function getLanguageList($clientId = 1)
     {
         // Create a new db object.
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select field element from the extensions table.
         $query->select($db->quoteName(['element', 'name']))
@@ -1340,7 +1340,7 @@ private function getAdminId()
         }
 
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         // Select the admin user ID
         $query
diff --git a/plugins/system/actionlogs/src/Extension/ActionLogs.php b/plugins/system/actionlogs/src/Extension/ActionLogs.php
index 0ed4effdde34d..2eced72b0d5f3 100644
--- a/plugins/system/actionlogs/src/Extension/ActionLogs.php
+++ b/plugins/system/actionlogs/src/Extension/ActionLogs.php
@@ -174,7 +174,7 @@ public function onContentPrepareData(Model\PrepareDataEvent $event): void
         $db = $this->getDatabase();
         $id = (int) $data->id;
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['notify', 'extensions']))
             ->from($db->quoteName('#__action_logs_users'))
             ->where($db->quoteName('user_id') . ' = :userid')
@@ -231,7 +231,7 @@ public function onUserAfterSave(User\AfterSaveEvent $event): void
         $userid     = (int) $user['id'];
         $db         = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__action_logs_users'))
             ->where($db->quoteName('user_id') . ' = :userid')
@@ -318,7 +318,7 @@ public function onUserAfterDelete(User\AfterDeleteEvent $event): void
         $db     = $this->getDatabase();
         $userid = (int) $user['id'];
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__action_logs_users'))
             ->where($db->quoteName('user_id') . ' = :userid')
             ->bind(':userid', $userid, ParameterType::INTEGER);
@@ -393,7 +393,7 @@ public function onExtensionAfterSave(Model\AfterSaveEvent $event): void
 
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select($db->quoteName(['user_id', 'notify', 'extensions']))
             ->from($db->quoteName('#__action_logs_users'));
 
diff --git a/plugins/system/debug/src/Extension/Debug.php b/plugins/system/debug/src/Extension/Debug.php
index b15918d112ded..df589e67c5f6a 100644
--- a/plugins/system/debug/src/Extension/Debug.php
+++ b/plugins/system/debug/src/Extension/Debug.php
@@ -500,7 +500,7 @@ public function onAfterDisconnect(ConnectionEvent $event): void
 
                 if ((stripos($query, 'select') === 0) || ($dbVersion56 && ((stripos($query, 'delete') === 0) || (stripos($query, 'update') === 0)))) {
                     try {
-                        $queryInstance = $db->getQuery(true);
+                        $queryInstance = $db->createQuery();
                         $queryInstance->setQuery('EXPLAIN ' . ($dbVersion56 ? 'EXTENDED ' : '') . $query);
 
                         if ($boundParams[$k]) {
diff --git a/plugins/system/guidedtours/src/Extension/GuidedTours.php b/plugins/system/guidedtours/src/Extension/GuidedTours.php
index 5b1227a4edf22..3d2bee1837748 100644
--- a/plugins/system/guidedtours/src/Extension/GuidedTours.php
+++ b/plugins/system/guidedtours/src/Extension/GuidedTours.php
@@ -201,7 +201,7 @@ public function onBeforeCompileHead()
                     $profileKey = 'guidedtour.id.' . $tour->id;
 
                     // Check if the tour state has already been saved some time before.
-                    $query = $db->getQuery(true)
+                    $query = $db->createQuery()
                         ->select($db->quoteName('profile_value'))
                         ->from($db->quoteName('#__user_profiles'))
                         ->where($db->quoteName('user_id') . ' = :user_id')
diff --git a/plugins/system/httpheaders/postinstall/introduction.php b/plugins/system/httpheaders/postinstall/introduction.php
index e077ce1d83eff..50fb2740ec869 100644
--- a/plugins/system/httpheaders/postinstall/introduction.php
+++ b/plugins/system/httpheaders/postinstall/introduction.php
@@ -39,7 +39,7 @@ function httpheaders_postinstall_action()
     // Enable the plugin
     $db = Factory::getDbo();
 
-    $query = $db->getQuery(true)
+    $query = $db->createQuery()
         ->update($db->quoteName('#__extensions'))
         ->set($db->quoteName('enabled') . ' = 1')
         ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
@@ -48,7 +48,7 @@ function httpheaders_postinstall_action()
     $db->setQuery($query);
     $db->execute();
 
-    $query = $db->getQuery(true)
+    $query = $db->createQuery()
         ->select('extension_id')
         ->from($db->quoteName('#__extensions'))
         ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
diff --git a/plugins/system/privacyconsent/src/Extension/PrivacyConsent.php b/plugins/system/privacyconsent/src/Extension/PrivacyConsent.php
index be7a3a344562a..b9f2a537fef76 100644
--- a/plugins/system/privacyconsent/src/Extension/PrivacyConsent.php
+++ b/plugins/system/privacyconsent/src/Extension/PrivacyConsent.php
@@ -244,7 +244,7 @@ public function onUserAfterDelete(User\AfterDeleteEvent $event): void
 
         if ($userId) {
             // Remove user's consent
-            $query = $this->getDatabase()->getQuery(true)
+            $query = $this->getDatabase()->createQuery()
                 ->delete($this->getDatabase()->quoteName('#__privacy_consents'))
                 ->where($this->getDatabase()->quoteName('user_id') . ' = :userid')
                 ->bind(':userid', $userId, ParameterType::INTEGER);
@@ -348,7 +348,7 @@ public function onPrivacyCheckPrivacyPolicyPublished(CheckPrivacyPolicyPublished
         }
 
         // Check if the article exists in database and is published
-        $query = $this->getDatabase()->getQuery(true)
+        $query = $this->getDatabase()->createQuery()
             ->select($this->getDatabase()->quoteName(['id', 'state']))
             ->from($this->getDatabase()->quoteName('#__content'))
             ->where($this->getDatabase()->quoteName('id') . ' = :id')
@@ -404,7 +404,7 @@ private function isUserConsented($userId)
     {
         $userId = (int) $userId;
         $db     = $this->getDatabase();
-        $query  = $db->getQuery(true);
+        $query  = $db->createQuery();
 
         $query->select('COUNT(*)')
             ->from($db->quoteName('#__privacy_consents'))
diff --git a/plugins/system/privacyconsent/src/Field/PrivacyField.php b/plugins/system/privacyconsent/src/Field/PrivacyField.php
index 980fa37b5ced1..27eb513c84437 100644
--- a/plugins/system/privacyconsent/src/Field/PrivacyField.php
+++ b/plugins/system/privacyconsent/src/Field/PrivacyField.php
@@ -84,7 +84,7 @@ protected function getLayoutData()
 
         if ($privacyArticle && Factory::getApplication()->isClient('site')) {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName(['id', 'alias', 'catid', 'language']))
                 ->from($db->quoteName('#__content'))
                 ->where($db->quoteName('id') . ' = :id')
@@ -104,7 +104,7 @@ protected function getLayoutData()
 
             if (Multilanguage::isEnabled()) {
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select($db->quoteName(['id', 'language']))
                     ->from($db->quoteName('#__menu'))
                     ->where($db->quoteName('id') . ' = :id')
diff --git a/plugins/system/redirect/src/Extension/Redirect.php b/plugins/system/redirect/src/Extension/Redirect.php
index 8bdb1b71c102d..7b211362e1884 100644
--- a/plugins/system/redirect/src/Extension/Redirect.php
+++ b/plugins/system/redirect/src/Extension/Redirect.php
@@ -124,7 +124,7 @@ public function handleError(ErrorEvent $event)
             return;
         }
 
-        $query = $this->getDatabase()->getQuery(true);
+        $query = $this->getDatabase()->createQuery();
 
         $query->select('*')
             ->from($this->getDatabase()->quoteName('#__redirect_links'))
diff --git a/plugins/system/remember/src/Extension/Remember.php b/plugins/system/remember/src/Extension/Remember.php
index 1691654a3b3a6..16267d0e50f7c 100644
--- a/plugins/system/remember/src/Extension/Remember.php
+++ b/plugins/system/remember/src/Extension/Remember.php
@@ -132,7 +132,7 @@ public function onUserBeforeSave(BeforeSaveEvent $event): void
 
         // But now, we need to do something - Delete all tokens for this user!
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__user_keys'))
             ->where($db->quoteName('user_id') . ' = :userid')
             ->bind(':userid', $user['username']);
diff --git a/plugins/system/schemaorg/src/Extension/Schemaorg.php b/plugins/system/schemaorg/src/Extension/Schemaorg.php
index 1652c79d47025..ecc6ce1cd1a51 100644
--- a/plugins/system/schemaorg/src/Extension/Schemaorg.php
+++ b/plugins/system/schemaorg/src/Extension/Schemaorg.php
@@ -97,7 +97,7 @@ public function onContentPrepareData(Model\PrepareDataEvent $event)
         if ($itemId > 0) {
             $db = $this->getDatabase();
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('*')
                 ->from($db->quoteName('#__schemaorg'))
                 ->where($db->quoteName('itemId') . '= :itemId')
@@ -214,7 +214,7 @@ public function onContentAfterSave(Model\AfterSaveEvent $event)
             return;
         }
 
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select('*')
             ->from($db->quoteName('#__schemaorg'))
@@ -418,7 +418,7 @@ public function onBeforeCompileHead(BeforeCompileHeadApplicationEvent $event): v
         if ($itemId > 0) {
             // Load the table data from the database
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select('*')
                 ->from($db->quoteName('#__schemaorg'))
                 ->where($db->quoteName('itemId') . ' = :itemId')
@@ -589,7 +589,7 @@ public function onContentAfterDelete(Model\AfterDeleteEvent $event)
     public function deleteSchemaOrg($itemId, $context)
     {
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->delete($db->quoteName('#__schemaorg'))
             ->where($db->quoteName('itemId') . '= :itemId')
diff --git a/plugins/system/stats/src/Extension/Stats.php b/plugins/system/stats/src/Extension/Stats.php
index 70859bc57b4a3..61e36161a8474 100644
--- a/plugins/system/stats/src/Extension/Stats.php
+++ b/plugins/system/stats/src/Extension/Stats.php
@@ -477,7 +477,7 @@ private function saveParams()
         $paramsJson = $this->params->toString('JSON');
         $db         = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__extensions'))
             ->set($db->quoteName('params') . ' = :params')
             ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
@@ -603,7 +603,7 @@ private function disablePlugin()
     {
         $db = $this->getDatabase();
 
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->update($db->quoteName('#__extensions'))
             ->set($db->quoteName('enabled') . ' = 0')
             ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
diff --git a/plugins/system/tasknotification/src/Extension/TaskNotification.php b/plugins/system/tasknotification/src/Extension/TaskNotification.php
index 2fd2861e94549..adb8e3dcc34f0 100644
--- a/plugins/system/tasknotification/src/Extension/TaskNotification.php
+++ b/plugins/system/tasknotification/src/Extension/TaskNotification.php
@@ -287,7 +287,7 @@ private function sendMail(string $template, array $data, string $attachment = ''
         $db  = $this->getDatabase();
 
         // Get all users who are not blocked and have opted in for system mails.
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select('DISTINCT ' . $db->quoteName('u.id') . ', ' . $db->quoteName('u.email'))
             ->from($db->quoteName('#__users', 'u'))
diff --git a/plugins/system/webauthn/src/CredentialRepository.php b/plugins/system/webauthn/src/CredentialRepository.php
index 375b01a234d83..2ef64fb6b4b9c 100644
--- a/plugins/system/webauthn/src/CredentialRepository.php
+++ b/plugins/system/webauthn/src/CredentialRepository.php
@@ -63,7 +63,7 @@ public function findOneByCredentialId(string $publicKeyCredentialId): ?PublicKey
         /** @var DatabaseInterface $db */
         $db           = $this->getDatabase();
         $credentialId = base64_encode($publicKeyCredentialId);
-        $query        = $db->getQuery(true)
+        $query        = $db->createQuery()
             ->select($db->quoteName('credential'))
             ->from($db->quoteName('#__webauthn_credentials'))
             ->where($db->quoteName('id') . ' = :credentialId')
@@ -99,7 +99,7 @@ public function findAllForUserEntity(PublicKeyCredentialUserEntity $publicKeyCre
         /** @var DatabaseInterface $db */
         $db         = $this->getDatabase();
         $userHandle = $publicKeyCredentialUserEntity->getId();
-        $query      = $db->getQuery(true)
+        $query      = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__webauthn_credentials'))
             ->where($db->quoteName('user_id') . ' = :user_id')
@@ -200,7 +200,7 @@ public function saveCredentialSource(PublicKeyCredentialSource $publicKeyCredent
 
         // Try to find an existing record
         try {
-            $query     = $db->getQuery(true)
+            $query     = $db->createQuery()
                 ->select('*')
                 ->from($db->quoteName('#__webauthn_credentials'))
                 ->where($db->quoteName('id') . ' = :credentialId')
@@ -260,7 +260,7 @@ public function getAll(int $userId): array
         /** @var DatabaseInterface $db */
         $db         = $this->getDatabase();
         $userHandle = $this->getHandleFromUserId($userId);
-        $query      = $db->getQuery(true)
+        $query      = $db->createQuery()
             ->select('*')
             ->from($db->quoteName('#__webauthn_credentials'))
             ->where($db->quoteName('user_id') . ' = :user_id')
@@ -328,7 +328,7 @@ public function has(string $credentialId): bool
         /** @var DatabaseInterface $db */
         $db           = $this->getDatabase();
         $credentialId = base64_encode($credentialId);
-        $query        = $db->getQuery(true)
+        $query        = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__webauthn_credentials'))
             ->where($db->quoteName('id') . ' = :credentialId')
@@ -384,7 +384,7 @@ public function remove(string $credentialId): void
         /** @var DatabaseInterface $db */
         $db           = $this->getDatabase();
         $credentialId = base64_encode($credentialId);
-        $query        = $db->getQuery(true)
+        $query        = $db->createQuery()
             ->delete($db->quoteName('#__webauthn_credentials'))
             ->where($db->quoteName('id') . ' = :credentialId')
             ->bind(':credentialId', $credentialId);
@@ -466,7 +466,7 @@ public function getUserIdFromHandle(?string $userHandle): ?int
         $db = $this->getDatabase();
 
         // Check that the userHandle does exist in the database
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__webauthn_credentials'))
             ->where($db->quoteName('user_id') . ' = ' . $db->q($userHandle));
@@ -482,7 +482,7 @@ public function getUserIdFromHandle(?string $userHandle): ?int
         }
 
         // Prepare the query
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->select([$db->quoteName('id')])
             ->from($db->quoteName('#__users'))
             ->where($db->quoteName('block') . ' = 0')
diff --git a/plugins/system/webauthn/src/PluginTraits/UserDeletion.php b/plugins/system/webauthn/src/PluginTraits/UserDeletion.php
index 9a883f5157a80..6e0afa7007905 100644
--- a/plugins/system/webauthn/src/PluginTraits/UserDeletion.php
+++ b/plugins/system/webauthn/src/PluginTraits/UserDeletion.php
@@ -59,7 +59,7 @@ public function onUserAfterDelete(Event $event): void
             /** @var DatabaseInterface $db */
             $db = Factory::getContainer()->get(DatabaseInterface::class);
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__webauthn_credentials'))
                 ->where($db->quoteName('user_id') . ' = :userId')
                 ->bind(':userId', $userId);
diff --git a/plugins/task/deleteactionlogs/src/Extension/DeleteActionLogs.php b/plugins/task/deleteactionlogs/src/Extension/DeleteActionLogs.php
index 0015106b2dfe6..17b3c385f771c 100644
--- a/plugins/task/deleteactionlogs/src/Extension/DeleteActionLogs.php
+++ b/plugins/task/deleteactionlogs/src/Extension/DeleteActionLogs.php
@@ -81,7 +81,7 @@ private function deleteLogs(ExecuteTaskEvent $event): int
         $this->logTask(\sprintf('Delete Logs after %d days', $daysToDeleteAfter));
         $now               = Factory::getDate()->toSql();
         $db                = $this->getDatabase();
-        $query             = $db->getQuery(true);
+        $query             = $db->createQuery();
 
         if ($daysToDeleteAfter > 0) {
             $days = -1 * $daysToDeleteAfter;
diff --git a/plugins/task/globalcheckin/src/Extension/Globalcheckin.php b/plugins/task/globalcheckin/src/Extension/Globalcheckin.php
index 213c274f9ee18..361da5a427ce6 100644
--- a/plugins/task/globalcheckin/src/Extension/Globalcheckin.php
+++ b/plugins/task/globalcheckin/src/Extension/Globalcheckin.php
@@ -92,7 +92,7 @@ protected function makeCheckin(ExecuteTaskEvent $event): int
                 continue;
             }
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->update($db->quoteName($tn))
                 ->set($db->quoteName('checked_out') . ' = NULL')
                 ->set($db->quoteName('checked_out_time') . ' = NULL');
diff --git a/plugins/task/privacyconsent/src/Extension/PrivacyConsent.php b/plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
index 4ff194dd5d8e5..3c3ac79159dca 100644
--- a/plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
+++ b/plugins/task/privacyconsent/src/Extension/PrivacyConsent.php
@@ -122,7 +122,7 @@ private function remindExpiringConsents($expire, $remind): int
         $now      = Factory::getDate()->toSql();
         $period   = '-' . ($expire - $remind);
         $db       = $this->getDatabase();
-        $query    = $db->getQuery(true);
+        $query    = $db->createQuery();
 
         $query->select($db->quoteName(['r.id', 'r.user_id', 'u.email']))
             ->from($db->quoteName('#__privacy_consents', 'r'))
@@ -210,7 +210,7 @@ private function invalidateExpiredConsents($expire): int
         $now    = Factory::getDate()->toSql();
         $period = '-' . $expire;
         $db     = $this->getDatabase();
-        $query  = $db->getQuery(true);
+        $query  = $db->createQuery();
 
         $query->select($db->quoteName(['id', 'user_id']))
             ->from($db->quoteName('#__privacy_consents'))
@@ -237,7 +237,7 @@ private function invalidateExpiredConsents($expire): int
 
         foreach ($users as $user) {
             $userId = (int) $user->id;
-            $query  = $db->getQuery(true)
+            $query  = $db->createQuery()
                 ->update($db->quoteName('#__privacy_consents'))
                 ->set($db->quoteName('state') . ' = 0')
                 ->where($db->quoteName('id') . ' = :userid')
diff --git a/plugins/task/updatenotification/src/Extension/UpdateNotification.php b/plugins/task/updatenotification/src/Extension/UpdateNotification.php
index 512b606b48511..c6e1877b8b919 100644
--- a/plugins/task/updatenotification/src/Extension/UpdateNotification.php
+++ b/plugins/task/updatenotification/src/Extension/UpdateNotification.php
@@ -282,7 +282,7 @@ private function getSuperUsers($email = null)
 
         // Get the user IDs of users belonging to the SA groups
         try {
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('user_id'))
                 ->from($db->quoteName('#__user_usergroup_map'))
                 ->whereIn($db->quoteName('group_id'), $groups);
@@ -299,7 +299,7 @@ private function getSuperUsers($email = null)
 
         // Get the user information for the Super Administrator users
         try {
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName(['id', 'username', 'email']))
                 ->from($db->quoteName('#__users'))
                 ->whereIn($db->quoteName('id'), $userIDs)
diff --git a/plugins/user/joomla/src/Extension/Joomla.php b/plugins/user/joomla/src/Extension/Joomla.php
index 0bd4d3358bb0e..d959d8bfedc2f 100644
--- a/plugins/user/joomla/src/Extension/Joomla.php
+++ b/plugins/user/joomla/src/Extension/Joomla.php
@@ -132,7 +132,7 @@ public function onUserAfterDelete(AfterDeleteEvent $event): void
 
         try {
             $db->setQuery(
-                $db->getQuery(true)
+                $db->createQuery()
                     ->delete($db->quoteName('#__messages'))
                     ->where($db->quoteName('user_id_from') . ' = :userId')
                     ->bind(':userId', $userId, ParameterType::INTEGER)
@@ -143,7 +143,7 @@ public function onUserAfterDelete(AfterDeleteEvent $event): void
 
         // Delete Multi-factor Authentication user profile records
         $profileKey = 'mfa.%';
-        $query      = $db->getQuery(true)
+        $query      = $db->createQuery()
             ->delete($db->quoteName('#__user_profiles'))
             ->where($db->quoteName('user_id') . ' = :userId')
             ->where($db->quoteName('profile_key') . ' LIKE :profileKey')
@@ -157,7 +157,7 @@ public function onUserAfterDelete(AfterDeleteEvent $event): void
         }
 
         // Delete Multi-factor Authentication records
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__user_mfa'))
             ->where($db->quoteName('user_id') . ' = :userId')
             ->bind(':userId', $userId, ParameterType::INTEGER);
@@ -342,7 +342,7 @@ public function onUserLogin(LoginEvent $event)
         $db = $this->getDatabase();
 
         // Purge the old session
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__session'))
             ->where($db->quoteName('session_id') . ' = :sessionid')
             ->bind(':sessionid', $oldSessionId);
diff --git a/plugins/user/profile/src/Extension/Profile.php b/plugins/user/profile/src/Extension/Profile.php
index 0f42e8c13a186..ab930e0cc49c3 100644
--- a/plugins/user/profile/src/Extension/Profile.php
+++ b/plugins/user/profile/src/Extension/Profile.php
@@ -94,7 +94,7 @@ public function onContentPrepareData(PrepareDataEvent $event)
             if (!isset($data->profile) && $userId > 0) {
                 // Load the profile data from the database.
                 $db    = $this->getDatabase();
-                $query = $db->getQuery(true)
+                $query = $db->createQuery()
                     ->select(
                         [
                             $db->quoteName('profile_key'),
@@ -377,7 +377,7 @@ public function onUserAfterSave(AfterSaveEvent $event): void
                 $key = 'profile.' . $key;
             }
 
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__user_profiles'))
                 ->where($db->quoteName('user_id') . ' = :userid')
                 ->whereIn($db->quoteName('profile_key'), $keys, ParameterType::STRING)
@@ -450,7 +450,7 @@ public function onUserAfterDelete(AfterDeleteEvent $event): void
 
         if ($userId) {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__user_profiles'))
                 ->where($db->quoteName('user_id') . ' = :userid')
                 ->where($db->quoteName('profile_key') . ' LIKE ' . $db->quote('profile.%'))
diff --git a/plugins/user/profile/src/Field/TosField.php b/plugins/user/profile/src/Field/TosField.php
index b1d2a7bcf9fc9..56b458f81db52 100644
--- a/plugins/user/profile/src/Field/TosField.php
+++ b/plugins/user/profile/src/Field/TosField.php
@@ -90,7 +90,7 @@ protected function getLabel()
             $attribs['data-bs-target'] = '#tosModal';
 
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true);
+            $query = $db->createQuery();
 
             $query->select($db->quoteName(['id', 'alias', 'catid', 'language']))
                 ->from($db->quoteName('#__content'))
diff --git a/plugins/user/terms/src/Field/TermsField.php b/plugins/user/terms/src/Field/TermsField.php
index 113f3ac8c4a0d..4cf7698fb2f11 100644
--- a/plugins/user/terms/src/Field/TermsField.php
+++ b/plugins/user/terms/src/Field/TermsField.php
@@ -83,7 +83,7 @@ protected function getLayoutData()
 
         if ($termsArticle && Factory::getApplication()->isClient('site')) {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName(['id', 'alias', 'catid', 'language']))
                 ->from($db->quoteName('#__content'))
                 ->where($db->quoteName('id') . ' = :id')
diff --git a/plugins/user/token/src/Extension/Token.php b/plugins/user/token/src/Extension/Token.php
index 96591be720708..204a4a5ae2085 100644
--- a/plugins/user/token/src/Extension/Token.php
+++ b/plugins/user/token/src/Extension/Token.php
@@ -137,7 +137,7 @@ public function onContentPrepareData(PrepareDataEvent $event): void
         // Load the profile data from the database.
         try {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select([
                         $db->quoteName('profile_key'),
                         $db->quoteName('profile_value'),
@@ -352,7 +352,7 @@ public function onUserAfterSave(AfterSaveEvent $event): void
 
         // Remove existing Joomla Token user profile values
         $db    = $this->getDatabase();
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->delete($db->quoteName('#__user_profiles'))
             ->where($db->quoteName('user_id') . ' = :userId')
             ->where($db->quoteName('profile_key') . ' LIKE :profileKey');
@@ -370,7 +370,7 @@ public function onUserAfterSave(AfterSaveEvent $event): void
 
         // Save the new Joomla Token user profile values
         $order = 1;
-        $query = $db->getQuery(true)
+        $query = $db->createQuery()
             ->insert($db->quoteName('#__user_profiles'))
             ->columns([
                     $db->quoteName('user_id'),
@@ -418,7 +418,7 @@ public function onUserAfterDelete(AfterDeleteEvent $event): void
 
         try {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->delete($db->quoteName('#__user_profiles'))
                 ->where($db->quoteName('user_id') . ' = :userId')
                 ->where($db->quoteName('profile_key') . ' LIKE :profileKey');
@@ -462,7 +462,7 @@ private function getTokenSeedForUser(int $userId): ?string
     {
         try {
             $db    = $this->getDatabase();
-            $query = $db->getQuery(true)
+            $query = $db->createQuery()
                 ->select($db->quoteName('profile_value'))
                 ->from($db->quoteName('#__user_profiles'))
                 ->where($db->quoteName('profile_key') . ' = :profileKey')
@@ -612,7 +612,7 @@ private function hasTokenProfileFields(?int $userId): bool
         }
 
         $db = $this->getDatabase();
-        $q  = $db->getQuery(true)
+        $q  = $db->createQuery()
             ->select('COUNT(*)')
             ->from($db->quoteName('#__user_profiles'))
             ->where($db->quoteName('user_id') . ' = ' . $userId)
diff --git a/plugins/workflow/notification/src/Extension/Notification.php b/plugins/workflow/notification/src/Extension/Notification.php
index ca9c1facc8225..952e33422cb54 100644
--- a/plugins/workflow/notification/src/Extension/Notification.php
+++ b/plugins/workflow/notification/src/Extension/Notification.php
@@ -330,7 +330,7 @@ private function removeLocked(array $userIds): array
         $db = $this->getDatabase();
 
         // Check for locked inboxes would be better to have _cdf settings in the user_object or a filter in users model
-        $query = $db->getQuery(true);
+        $query = $db->createQuery();
 
         $query->select($db->quoteName('user_id'))
             ->from($db->quoteName('#__messages_cfg'))
diff --git a/tests/Unit/Component/Actionlogs/Administrator/Model/ActionlogConfigModelTest.php b/tests/Unit/Component/Actionlogs/Administrator/Model/ActionlogConfigModelTest.php
index 3f6fde9875f54..b7321d5587b30 100644
--- a/tests/Unit/Component/Actionlogs/Administrator/Model/ActionlogConfigModelTest.php
+++ b/tests/Unit/Component/Actionlogs/Administrator/Model/ActionlogConfigModelTest.php
@@ -35,7 +35,7 @@ public function testGetLogContentTypeParams()
     {
         $config = new \stdClass();
         $db     = $this->createStub(DatabaseInterface::class);
-        $db->method('getQuery')->willReturn($this->getQueryStub($db));
+        $db->method('createQuery')->willReturn($this->getQueryStub($db));
         $db->method('loadObject')->willReturn($config);
 
         $model = new ActionlogConfigModel(['dbo' => $db], $this->createStub(MVCFactoryInterface::class));
@@ -53,7 +53,7 @@ public function testGetLogContentTypeParams()
     public function testGetNullLogContentTypeParams()
     {
         $db = $this->createStub(DatabaseInterface::class);
-        $db->method('getQuery')->willReturn($this->getQueryStub($db));
+        $db->method('createQuery')->willReturn($this->getQueryStub($db));
 
         $model = new ActionlogConfigModel(['dbo' => $db], $this->createStub(MVCFactoryInterface::class));
 
diff --git a/tests/Unit/Libraries/Cms/MVC/Model/DatabaseModelTest.php b/tests/Unit/Libraries/Cms/MVC/Model/DatabaseModelTest.php
index 42908a60a2faf..7915635164e30 100644
--- a/tests/Unit/Libraries/Cms/MVC/Model/DatabaseModelTest.php
+++ b/tests/Unit/Libraries/Cms/MVC/Model/DatabaseModelTest.php
@@ -129,7 +129,7 @@ public function testGetListFromString()
     {
         $db = $this->createStub(DatabaseInterface::class);
         $db->method('loadObjectList')->willReturn([1]);
-        $db->method('getQuery')->willReturn($this->getQueryStub($db));
+        $db->method('createQuery')->willReturn($this->getQueryStub($db));
 
         $model = new class (['dbo' => $db], $this->createStub(MVCFactoryInterface::class)) extends BaseDatabaseModel {
             public function _getList($query, $limitstart = 0, $limit = 0)