// Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names

modules/autoupgrade/AdminPreferences.php

@@ -34,7 +34,7 @@ class AdminPreferences extends AdminTab
 		$this->className = 'Configuration';
 		$this->table = 'configuration';
 
-		$timezones = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT name FROM '._DB_PREFIX_.'timezone');
+		$timezones = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT name FROM '._DB_PREFIX_.'timezone');
 		$taxes[] = array('id' => 0, 'name' => $this->l('None'));
 /*		foreach (Tax::getTaxes((int)($cookie->id_lang)) as $tax)
 			$taxes[] = array('id' => $tax['id_tax'], 'name' => $tax['name']);

modules/autoupgrade/AdminSelfTab.php

@@ -522,7 +522,7 @@ abstract class AdminSelfTab
 			$required_fields[(int)$row['id_required_field']] = $row['field_name'];
 
 
-		$table_fields = Db::getInstance()->ExecuteS('SHOW COLUMNS FROM '.pSQL(_DB_PREFIX_.$this->table));
+		$table_fields = Db::getInstance()->executeS('SHOW COLUMNS FROM '.pSQL(_DB_PREFIX_.$this->table));
 		$irow = 0;
 		foreach ($table_fields AS $field)
 		{
@@ -1397,7 +1397,7 @@ abstract class AdminSelfTab
 			($this->_tmpTableFilter ? ') tmpTable WHERE 1'.$this->_tmpTableFilter : '').'
 			LIMIT '.(int)($start).','.(int)($limit);
 
-		$this->_list = Db::getInstance()->ExecuteS($sql);
+		$this->_list = Db::getInstance()->executeS($sql);
 		$this->_listTotal = Db::getInstance()->getValue('SELECT FOUND_ROWS() AS `'._DB_PREFIX_.$this->table.'`');
 
 	}

modules/autoupgrade/Backup.php

@@ -214,7 +214,7 @@ class BackupCore
 		fwrite($fp, "\n".'SET NAMES \'utf8\';'."\n\n");
 
 		// Find all tables
-		$tables = Db::getInstance()->ExecuteS('SHOW TABLES');
+		$tables = Db::getInstance()->executeS('SHOW TABLES');
 		$found = 0;
 		foreach ($tables AS $table)
 		{
@@ -225,7 +225,7 @@ class BackupCore
 				continue;
 
 			// Export the table schema
-			$schema = Db::getInstance()->ExecuteS('SHOW CREATE TABLE `' . $table . '`');
+			$schema = Db::getInstance()->executeS('SHOW CREATE TABLE `' . $table . '`');
 
 			if (count($schema) != 1 || !isset($schema[0]['Table']) || !isset($schema[0]['Create Table']))
 			{
@@ -244,7 +244,7 @@ class BackupCore
 
 			if (!in_array($schema[0]['Table'], $ignore_insert_table))
 			{
-				$data = Db::getInstance()->ExecuteS('SELECT * FROM `' . $schema[0]['Table'] . '`', false);
+				$data = Db::getInstance()->executeS('SELECT * FROM `' . $schema[0]['Table'] . '`', false);
 				$sizeof = DB::getInstance()->NumRows();
 				$lines = explode("\n", $schema[0]['Create Table']);
 

modules/autoupgrade/SelfModule.php

@@ -105,7 +105,7 @@ abstract class SelfModule
 			if (self::$modulesCache == NULL AND !is_array(self::$modulesCache))
 			{
 				self::$modulesCache = array();
-				$result = Db::getInstance()->ExecuteS('SELECT * FROM `'.pSQL(_DB_PREFIX_.$this->table).'`');
+				$result = Db::getInstance()->executeS('SELECT * FROM `'.pSQL(_DB_PREFIX_.$this->table).'`');
 				foreach ($result as $row)
 					self::$modulesCache[$row['name']] = $row;
 			}
@@ -150,19 +150,19 @@ abstract class SelfModule
 	{
 		if (!Validate::isUnsignedId($this->id))
 			return false;
-		$result = Db::getInstance()->ExecuteS('
+		$result = Db::getInstance()->executeS('
 		SELECT `id_hook`
 		FROM `'._DB_PREFIX_.'hook_module` hm
 		WHERE `id_module` = '.(int)($this->id));
 		foreach	($result AS $row)
 		{
-			Db::getInstance()->Execute('
+			Db::getInstance()->execute('
 			DELETE FROM `'._DB_PREFIX_.'hook_module`
 			WHERE `id_module` = '.(int)($this->id).'
 			AND `id_hook` = '.(int)($row['id_hook']));
 			$this->cleanPositions($row['id_hook']);
 		}
-		return Db::getInstance()->Execute('
+		return Db::getInstance()->execute('
 			DELETE FROM `'._DB_PREFIX_.'module`
 			WHERE `id_module` = '.(int)($this->id));
 	}
@@ -183,7 +183,7 @@ abstract class SelfModule
 		foreach ($name as $k=>$v)
 			$name[$k] = '"'.pSQL($v).'"';
 
-		return Db::getInstance()->Execute('
+		return Db::getInstance()->execute('
 		UPDATE `'._DB_PREFIX_.'module`
 		SET `active`= 1
 		WHERE `name` IN ('.implode(',',$name).')');
@@ -193,7 +193,7 @@ abstract class SelfModule
 	 */
 	public function enable()
 	{
-		return Db::getInstance()->Execute('
+		return Db::getInstance()->execute('
 		UPDATE `'._DB_PREFIX_.'module`
 		SET `active`= 1
 		WHERE `name` = \''.pSQL($this->name).'\'');
@@ -215,7 +215,7 @@ abstract class SelfModule
 		foreach ($name as $k=>$v)
 			$name[$k] = '"'.pSQL($v).'"';
 
-		return Db::getInstance()->Execute('
+		return Db::getInstance()->execute('
 		UPDATE `'._DB_PREFIX_.'module`
 		SET `active`= 0
 		WHERE `name` IN ('.implode(',',$name).')');
@@ -268,7 +268,7 @@ abstract class SelfModule
 			return false;
 
 		// Register module in hook
-		$return = Db::getInstance()->Execute('
+		$return = Db::getInstance()->execute('
 		INSERT INTO `'._DB_PREFIX_.'hook_module` (`id_module`, `id_hook`, `position`)
 		VALUES ('.(int)($this->id).', '.(int)($result['id_hook']).', '.(int)($result2['position'] + 1).')');
 
@@ -313,7 +313,7 @@ abstract class SelfModule
 	  */
 	public function unregisterHook($hook_id)
 	{
-		return Db::getInstance()->Execute('
+		return Db::getInstance()->execute('
 		DELETE
 		FROM `'._DB_PREFIX_.'hook_module`
 		WHERE `id_module` = '.(int)($this->id).'
@@ -328,7 +328,7 @@ abstract class SelfModule
 	  */
 	public function unregisterExceptions($hook_id)
 	{
-		return Db::getInstance()->Execute('
+		return Db::getInstance()->execute('
 		DELETE
 		FROM `'._DB_PREFIX_.'hook_module_exceptions`
 		WHERE `id_module` = '.(int)($this->id).'
@@ -348,7 +348,7 @@ abstract class SelfModule
 		{
 			if (!empty($except))
 			{
-				$result = Db::getInstance()->Execute('
+				$result = Db::getInstance()->execute('
 				INSERT INTO `'._DB_PREFIX_.'hook_module_exceptions` (`id_module`, `id_hook`, `file_name`)
 				VALUES ('.(int)($this->id).', '.(int)($id_hook).', \''.pSQL(strval($except)).'\')');
 				if (!$result)
@@ -361,7 +361,7 @@ abstract class SelfModule
 	public function editExceptions($id_hook, $excepts)
 	{
 		// Cleaning...
-		Db::getInstance()->Execute('
+		Db::getInstance()->execute('
 				DELETE FROM `'._DB_PREFIX_.'hook_module_exceptions`
 				WHERE `id_module` = '.(int)($this->id).' AND `id_hook` ='.(int)($id_hook));
 		return $this->registerExceptions($id_hook, $excepts);
@@ -642,7 +642,7 @@ abstract class SelfModule
 					$arrNativeModules[] = '"'.pSQL($module['name']).'"';
 			}
 
-		return $db->ExecuteS('
+		return $db->executeS('
 			SELECT *
 			FROM `'._DB_PREFIX_.'module` m
 			WHERE name NOT IN ('.implode(',',$arrNativeModules).') ');
@@ -656,7 +656,7 @@ abstract class SelfModule
 		*/
 	public static function getModulesInstalled($position = 0)
 	{
-		return Db::getInstance()->ExecuteS('
+		return Db::getInstance()->executeS('
 		SELECT *
 		FROM `'._DB_PREFIX_.'module` m
 		'.($position ? '
@@ -689,7 +689,7 @@ abstract class SelfModule
 		if (!isset(self::$_hookModulesCache))
 		{
 			$db = Db::getInstance(_PS_USE_SQL_SLAVE_);
-			$result = $db->ExecuteS('
+			$result = $db->executeS('
 			SELECT h.`name` as hook, m.`id_module`, h.`id_hook`, m.`name` as module, h.`live_edit`
 			FROM `'._DB_PREFIX_.'module` m
 			LEFT JOIN `'._DB_PREFIX_.'hook_module` hm ON hm.`id_module` = m.`id_module`
@@ -774,7 +774,7 @@ abstract class SelfModule
 		$id_customer = (int)($cookie->id_customer);
 		$billing = new Address((int)($cart->id_address_invoice));
 		
-		$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
+		$result = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('
 		SELECT DISTINCT h.`id_hook`, m.`name`, hm.`position`
 		FROM `'._DB_PREFIX_.'module_country` mc
 		LEFT JOIN `'._DB_PREFIX_.'module` m ON m.`id_module` = mc.`id_module`
@@ -868,7 +868,7 @@ abstract class SelfModule
 	 */
 	public function updatePosition($id_hook, $way, $position = NULL)
 	{
-		if (!$res = Db::getInstance()->ExecuteS('
+		if (!$res = Db::getInstance()->executeS('
 		SELECT hm.`id_module`, hm.`position`, hm.`id_hook`
 		FROM `'._DB_PREFIX_.'hook_module` hm
 		WHERE hm.`id_hook` = '.(int)($id_hook).'
@@ -888,13 +888,13 @@ abstract class SelfModule
 		if (isset($position) and !empty($position))
 			$to['position'] = (int)($position);
 
-		return (Db::getInstance()->Execute('
+		return (Db::getInstance()->execute('
 		UPDATE `'._DB_PREFIX_.'hook_module`
 		SET `position`= position '.($way ? '-1' : '+1').'
 		WHERE position between '.(int)(min(array($from['position'], $to['position']))) .' AND '.(int)(max(array($from['position'], $to['position']))).'
 		AND `id_hook`='.(int)($from['id_hook']))
 		AND
-		Db::getInstance()->Execute('
+		Db::getInstance()->execute('
 		UPDATE `'._DB_PREFIX_.'hook_module`
 		SET `position`='.(int)($to['position']).'
 		WHERE `'.pSQL($this->identifier).'` = '.(int)($from[$this->identifier]).' AND `id_hook`='.(int)($to['id_hook']))
@@ -908,14 +908,14 @@ abstract class SelfModule
 	 */
 	public function cleanPositions($id_hook)
 	{
-		$result = Db::getInstance()->ExecuteS('
+		$result = Db::getInstance()->executeS('
 		SELECT `id_module`
 		FROM `'._DB_PREFIX_.'hook_module`
 		WHERE `id_hook` = '.(int)($id_hook).'
 		ORDER BY `position`');
 		$sizeof = sizeof($result);
 		for ($i = 0; $i < $sizeof; ++$i)
-			Db::getInstance()->Execute('
+			Db::getInstance()->execute('
 			UPDATE `'._DB_PREFIX_.'hook_module`
 			SET `position` = '.(int)($i + 1).'
 			WHERE `id_hook` = '.(int)($id_hook).'
@@ -976,7 +976,7 @@ abstract class SelfModule
 		if (self::$exceptionsCache == NULL AND !is_array(self::$exceptionsCache))
 		{
 			self::$exceptionsCache = array();
-			$result = Db::getInstance()->ExecuteS('
+			$result = Db::getInstance()->executeS('
 			SELECT CONCAT(id_hook, \'-\', id_module) as `key`, `file_name` as value
 			FROM `'._DB_PREFIX_.'hook_module_exceptions`');
 			foreach ($result as $row)
@@ -993,7 +993,7 @@ abstract class SelfModule
 
 	public static function isInstalled($moduleName)
 	{
-		Db::getInstance()->ExecuteS('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \''.pSQL($moduleName).'\'');
+		Db::getInstance()->executeS('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \''.pSQL($moduleName).'\'');
 		return (bool)Db::getInstance()->NumRows();
 	}
 

modules/autoupgrade/Tools14.php

@@ -817,7 +817,7 @@ class Tools14Core
 
 			if (isset($category['id_category']))
 			{
-				$categories = Db::getInstance()->ExecuteS('
+				$categories = Db::getInstance()->executeS('
 				SELECT c.id_category, cl.name, cl.link_rewrite
 				FROM '._DB_PREFIX_.'category c
 				LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = c.id_category)

modules/autoupgrade/functions.php

@@ -144,7 +144,7 @@ function getPath($urlBase, $id_category, $path = '', $highlight = '', $categoryT
 
 		if (isset($category['id_category']))
 		{
-			$categories = Db::getInstance()->ExecuteS('
+			$categories = Db::getInstance()->executeS('
 			SELECT c.id_category, cl.name, cl.link_rewrite
 			FROM '._DB_PREFIX_.'category c
 			LEFT JOIN '._DB_PREFIX_.'category_lang cl ON (cl.id_category = c.id_category)