diff --git a/admin/tool/xmldb/actions/view_table_sql/view_table_sql.class.php b/admin/tool/xmldb/actions/view_table_sql/view_table_sql.class.php
index a3f2566..30be6c8 100644
--- a/admin/tool/xmldb/actions/view_table_sql/view_table_sql.class.php
+++ b/admin/tool/xmldb/actions/view_table_sql/view_table_sql.class.php
@@ -96,8 +96,8 @@ class view_table_sql extends XMLDBAction {
         $o.= '      <tr><td><textarea cols="80" rows="32">';
 
         // Get an array of statements
-        if ($starr = $DB->get_manager()->generator->getCreateTableSQL($table)) {
-            $starr = $dbman->generator->getEndedStatements($starr);
+        if ($starr = $DB->get_manager('mssql')->generator->getCreateTableSQL($table)) {
+            $starr = $DB->get_manager('mssql')->generator->getEndedStatements($starr);
             $sqltext = '';
             foreach ($starr as $st) {
                 $sqltext .= s($st) . "\n\n";
diff --git a/lib/ddl/mssql_sql_generator.php b/lib/ddl/mssql_sql_generator.php
index ccd2d81..e7cde81 100644
--- a/lib/ddl/mssql_sql_generator.php
+++ b/lib/ddl/mssql_sql_generator.php
@@ -606,19 +606,9 @@ class mssql_sql_generator extends sql_generator {
             case 'uk':
             case 'fk':
             case 'ck':
-                if ($check = $this->mdb->get_records_sql("SELECT name
-                                                            FROM sysobjects
-                                                           WHERE lower(name) = ?", array(strtolower($object_name)))) {
-                    return true;
-                }
                 break;
             case 'ix':
             case 'uix':
-                if ($check = $this->mdb->get_records_sql("SELECT name
-                                                            FROM sysindexes
-                                                           WHERE lower(name) = ?", array(strtolower($object_name)))) {
-                    return true;
-                }
                 break;
         }
         return false; //No name in use found
diff --git a/lib/dml/moodle_database.php b/lib/dml/moodle_database.php
index 156d39c..27646d8 100644
--- a/lib/dml/moodle_database.php
+++ b/lib/dml/moodle_database.php
@@ -972,9 +972,19 @@ abstract class moodle_database {
      * @return database_manager The instance used to perform ddl operations.
      * @see lib/ddl/database_manager.php
      */
-    public function get_manager() {
+    public function get_manager($customfamily = null) {
         global $CFG;
 
+        if (!empty($customfamily)) {
+            require_once($CFG->libdir.'/ddllib.php');
+
+            $classname = $customfamily.'_sql_generator';
+            require_once("$CFG->libdir/ddl/$classname.php");
+            $generator = new $classname($this, $this->temptables);
+
+            return new database_manager($this, $generator);
+        }
+
         if (!$this->database_manager) {
             require_once($CFG->libdir.'/ddllib.php');