From 0f887b881e56dbe458ece21074eb58dc35894fcd Mon Sep 17 00:00:00 2001 From: stronk7 Date: Fri, 28 Aug 2009 17:30:18 +0000 Subject: [PATCH] Delete the tweakTempTable() thing used to support temp tables in mssql. Was hacky and incomplete. Proper solution must be mssql exclusive. --- lib/ddl/database_manager.php | 4 ---- lib/ddl/mssql_sql_generator.php | 10 ---------- lib/ddl/sql_generator.php | 7 ------- 3 files changed, 21 deletions(-) diff --git a/lib/ddl/database_manager.php b/lib/ddl/database_manager.php index fe9dd84faf..3015cf1f41 100644 --- a/lib/ddl/database_manager.php +++ b/lib/ddl/database_manager.php @@ -492,8 +492,6 @@ class database_manager { * @return void */ public function create_temp_table(xmldb_table $xmldb_table) { - /// hack for mssql - it requires names to start with # - $xmldb_table = $this->generator->tweakTempTable($xmldb_table); /// Check table doesn't exist if ($this->table_exists($xmldb_table, true)) { @@ -517,8 +515,6 @@ class database_manager { * @return void */ public function drop_temp_table(xmldb_table $xmldb_table) { - /// mssql requires names to start with # - $xmldb_table = $this->generator->tweakTempTable($xmldb_table); /// Check table doesn't exist if (!$this->table_exists($xmldb_table, true)) { diff --git a/lib/ddl/mssql_sql_generator.php b/lib/ddl/mssql_sql_generator.php index 3484262a3c..71d83ddae7 100644 --- a/lib/ddl/mssql_sql_generator.php +++ b/lib/ddl/mssql_sql_generator.php @@ -124,16 +124,6 @@ class mssql_sql_generator extends sql_generator { return $sqlarr; } - /** - * Tweaks the temp table instance - required for mssql # naming - */ - public function tweakTempTable($xmldb_table) { - if (strpos($xmldb_table->getName(), '#') !== 0) { - $xmldb_table->setName('#'.$xmldb_table->getName()); // MSSQL requires temp table names to start with # - } - return $xmldb_table; - } - /** * Given one XMLDB Type, lenght and decimals, returns the DB proper SQL type */ diff --git a/lib/ddl/sql_generator.php b/lib/ddl/sql_generator.php index 44e57df6a8..4b6dc5471b 100644 --- a/lib/ddl/sql_generator.php +++ b/lib/ddl/sql_generator.php @@ -370,13 +370,6 @@ abstract class sql_generator { return $sqlarr; } - /** - * Tweaks the temp table instance - required for mssql # naming - */ - public function tweakTempTable($xmldb_table) { - return $xmldb_table; - } - /** * Given one correct xmldb_index, returns the SQL statements * needed to create it (in array) -- 2.39.5