Index: cck_address.module
===================================================================
--- cck_address.module	(revision 433)
+++ cck_address.module	(working copy)
@@ -199,13 +199,29 @@
           '#return_value' => 1,
         );
         $all_tables = array();
-        $sql = "SHOW tables";
+				switch ($GLOBALS['db_type']) {
+	        case 'mssql':
+						if (db_version() == '2000') {
+							$sql = "SELECT name from sysobjects WHERE xtype = 'U'";
+						}
+						break;
+					default:
+						$sql = "SHOW tables";
+						break; 
+				}				
         $results = db_query($sql);
         global $db_url;
         $db_name = substr(strrchr($db_url, "/"), 1);
         $db_tables = 'Tables_in_' .$db_name;
         while ($result = db_fetch_object($results)) {
-          $all_tables[$result->$db_tables] = $result->$db_tables;
+          switch ($GLOBALS['db_type']) {
+	          case 'mssql':
+							$all_tables[$result->name] = $result->name;
+							break;
+						default:
+	         		$all_tables[$result->$db_tables] = $result->$db_tables;
+							break;
+					}
         }
         if (isset($field['select_streetcolumn']) && isset($field['select_street_numcolumn']) && isset($field['select_city']) && isset($field['select_zip'])) {
           $extra_street_num_city_zip = $field['select_streetcolumn']. ',' .$field['select_street_numcolumn']. ',' .$field['select_city']. ',' .$field['select_zip'];
@@ -1348,11 +1364,26 @@
   }
   $output = array();
   $array = activeselect_explode_values($string);
-  
-  $sql = "SHOW COLUMNS FROM {%s}";
+	switch ($GLOBALS['db_type']) {
+		case 'mssql':
+			if (db_version() == '2000') {
+				$sql = "SELECT syscolumns.name FROM sysobjects JOIN syscolumns ON sysobjects.id = syscolumns.id	JOIN systypes ON syscolumns.xtype=systypes.xtype WHERE sysobjects.xtype='U' AND sysobjects.name = '{%s}'";
+    	}
+			break;
+		default:
+			$sql = "SHOW COLUMNS FROM {%s}";
+			break;
+	}		
   $results = db_query($sql, $array);
   while ($result = db_fetch_object($results)) {
-    $column_options[$result->Field] = $result->Field;
+    switch ($GLOBALS['db_type']) {
+			case 'mssql':
+		    $column_options[$result->name] = $result->name;
+				break;
+  		default:
+		    $column_options[$result->Field] = $result->Field;
+				break;
+		}
   }
   foreach ($targets as $target) {
     $options = array();