Way better schema support! Thanks to @ianic! Fixes #61

Author: metaskills

CHANGELOG

@@ -1,6 +1,8 @@
 
 * 3.0.15 *
 
+* Way better schema support! Thanks to @ianic! Fixes #61
+
 * Warn of possible permission problems if "EXEC sp_helptext..." does not work view. Fixes #73.
 
 

lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -9,7 +9,7 @@ def native_database_types
 
         def tables(name = nil)
           info_schema_query do
-            select_values "SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_NAME <> 'dtproperties'"
+            select_values "SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_NAME <> 'dtproperties' AND TABLE_SCHEMA = schema_name()"
           end
         end
 
@@ -39,7 +39,7 @@ def indexes(table_name, name = nil)
 
         def columns(table_name, name = nil)
           return [] if table_name.blank?
-          cache_key = unqualify_table_name(table_name)
+          cache_key = columns_cache_key(table_name)
           @sqlserver_columns_cache[cache_key] ||= column_definitions(table_name).collect do |ci|
             sqlserver_options = ci.except(:name,:default_value,:type,:null).merge(:database_year=>database_year)
             SQLServerColumn.new ci[:name], ci[:default_value], ci[:type], ci[:null], sqlserver_options
@@ -175,6 +175,7 @@ def initialize_native_database_types
         def column_definitions(table_name)
           db_name = unqualify_db_name(table_name)
           db_name_with_period = "#{db_name}." if db_name
+          table_schema = unqualify_table_schema(table_name)
           table_name = unqualify_table_name(table_name)
           sql = %{
             SELECT
@@ -198,6 +199,7 @@ def column_definitions(table_name)
             END as is_identity
             FROM #{db_name_with_period}INFORMATION_SCHEMA.COLUMNS columns
             WHERE columns.TABLE_NAME = '#{table_name}'
+              AND columns.TABLE_SCHEMA = #{table_schema.nil? ? "schema_name() " : "'#{table_schema}' "}
             ORDER BY columns.ordinal_position
           }.gsub(/[ \t\r\n]+/,' ')
           results = info_schema_query { select(sql,nil) }
@@ -266,6 +268,10 @@ def unqualify_table_name(table_name)
           table_name.to_s.split('.').last.tr('[]','')
         end
 
+        def unqualify_table_schema(table_name)
+          table_name.to_s.split('.')[-2].gsub(/[\[\]]/,'') rescue nil
+        end
+
         def unqualify_db_name(table_name)
           table_names = table_name.to_s.split('.')
           table_names.length == 3 ? table_names.first.tr('[]','') : nil
@@ -332,7 +338,17 @@ def views_real_column_name(table_name,column_name)
         end
 
         # === SQLServer Specific (Column/View Caches) =================== #
-        
+
+        def columns_cache_key(table_name)
+          table_schema = unqualify_table_schema(table_name)
+          table_name = unqualify_table_name(table_name) 
+          if table_schema
+            "#{table_schema}.#{table_name}"  
+          else
+            table_name
+          end
+        end
+
         def remove_sqlserver_columns_cache_for(table_name)
           cache_key = unqualify_table_name(table_name)
           @sqlserver_columns_cache[cache_key] = nil

test/schema/sqlserver_specific_schema.rb

@@ -102,6 +102,33 @@
       /*#{'x'*4000}}*/
       FROM string_defaults
   STRINGDEFAULTSBIGVIEW
+
+
+  # Another schema.
+  create_table :sql_server_schema_columns, :force => true do |t|
+    t.column :field1 , :integer
+  end
+  execute "IF NOT EXISTS(SELECT * FROM sys.schemas WHERE name = 'test') EXEC sp_executesql N'CREATE SCHEMA test'"
+  execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sql_server_schema_columns' and TABLE_SCHEMA = 'test') DROP TABLE test.sql_server_schema_columns"
+  execute <<-SIMILIARTABLEINOTHERSCHEMA
+    CREATE TABLE test.sql_server_schema_columns(
+    	id int IDENTITY NOT NULL primary key,
+    	filed_1 int,	
+    	field_2 int,
+    	name varchar(255),
+    	description varchar(1000),
+    	n_name nvarchar(255),
+    	n_description nvarchar(1000)
+    )
+  SIMILIARTABLEINOTHERSCHEMA
+  execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sql_server_schema_identity' and TABLE_SCHEMA = 'test') DROP TABLE test.sql_server_schema_identity"
+  execute <<-SIMILIARTABLEINOTHERSCHEMA
+    CREATE TABLE test.sql_server_schema_identity(
+    	id int IDENTITY NOT NULL primary key,
+    	filed_1 int
+    )
+  SIMILIARTABLEINOTHERSCHEMA
+  
 
   if sqlserver_azure?
     # Azure needs clustered indexes.