Index: migrate.module
===================================================================
--- migrate.module	(revision 329)
+++ migrate.module	(working copy)
@@ -172,10 +172,7 @@
     $tablename = $view->base_table;
   }
 
-  db_set_active($tabledb);
-  $inspect = schema_invoke('inspect');
-  db_set_active('default');
-  $sourceschema = $inspect[$tablename];
+  $sourceschema = tw_inspect_schema($tablename, $tabledb);
 
   // If the PK of the content set is defined, make sure we have a mapping table
   if (isset($content_set->sourcekey) && $content_set->sourcekey) {
@@ -1117,7 +1114,6 @@
   // before our install hook.
   if (db_table_exists('migrate_content_sets')) {
     $result = db_query("SELECT * FROM {migrate_content_sets}");
-    static $inspect = array();
     while ($content_set = db_fetch_object($result)) {
       $maptablename = migrate_map_table_name($content_set->mcsid);
       $msgtablename = migrate_message_table_name($content_set->mcsid);
@@ -1140,12 +1136,7 @@
         $tabledb = 'default';
       }
       $tablename = $view->base_table;
-      if (!isset($inspect[$tabledb])) {
-        db_set_active($tabledb);
-        $inspect[$tabledb] = schema_invoke('inspect');
-        db_set_active('default');
-      }
-      $sourceschema = $inspect[$tabledb][$tablename];
+      $sourceschema = tw_inspect_schema($tablename, $tabledb);
       // If the PK of the content set is defined, make sure we have a mapping table
       $sourcekey = $content_set->sourcekey;
       if ($sourcekey) {