activerecord-sqlserver-adapter 4.2.5 → 4.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54dab2a4b34d04529678804457e654cdf3c436b9
-  data.tar.gz: 1719214a6ddc266cd8fad7dec68005cabd6ad9e8
+  metadata.gz: e84d27ebd75f08bcf37cf9243972440b0fc57280
+  data.tar.gz: f1f0a3e19713a80cdeba715025b4cb8523574c25
 SHA512:
-  metadata.gz: 3ffd8586472a4bdbbd6a113919085029268a134b4eecc5b924c129e151518aa61a287f7e5120f5c755e28addb73a4a546136952b18d35265a78df8f775bce015
-  data.tar.gz: 2ca086d538c72d86cd508e55cac63ebad56261dcc71eb4f13ae2bd8dd94cb4835b20a7e32acfe9ab551297b201d3af6eaa033fafe139ac1a7a6765d015662e6b
+  metadata.gz: f35f9ee3b2b34f7601f86d6867f2a86bf618203411e6e94ba4eec6b8d92f26cca09c63ae0596f50acacd4090fc644c4bfba43a3d2b7f2c33f849b170174d3cad
+  data.tar.gz: e59869fcb2a59c6a68a3778a56f7a1834becaec3c15844b44ed522115ca1a157cffe18c378b48cb697904188580171cdca76940f800377228c030ebc00c57233

data/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+## v4.2.6
+
+#### Fixed
+
+* Allow linked servers for table names. Fixes #426. Thanks @jippeholwerda
+
+
 ## v4.2.5
 
 #### Removed

data/lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -221,7 +221,7 @@ module ActiveRecord
 
         def column_definitions(table_name)
           identifier  = SQLServer::Utils.extract_identifiers(table_name)
-          database    = "#{identifier.database_quoted}." if identifier.database_quoted
+          database    = identifier.fully_qualified_database_quoted
           view_exists = schema_cache.view_exists?(table_name)
           view_tblnm  = table_name_or_views_table_name(table_name) if view_exists
           sql = %{
@@ -237,7 +237,7 @@ module ActiveRecord
             columns.ordinal_position,
             CASE
               WHEN columns.DATA_TYPE IN ('nchar','nvarchar','char','varchar') THEN columns.CHARACTER_MAXIMUM_LENGTH
-              ELSE COL_LENGTH('#{database}'+columns.TABLE_SCHEMA+'.'+columns.TABLE_NAME, columns.COLUMN_NAME)
+              ELSE COL_LENGTH('#{database}.'+columns.TABLE_SCHEMA+'.'+columns.TABLE_NAME, columns.COLUMN_NAME)
             END AS [length],
             CASE
               WHEN columns.IS_NULLABLE = 'YES' THEN 1
@@ -248,24 +248,24 @@ module ActiveRecord
               ELSE NULL
             END AS [is_primary],
             c.is_identity AS [is_identity]
-            FROM #{database}INFORMATION_SCHEMA.COLUMNS columns
-            LEFT OUTER JOIN #{database}INFORMATION_SCHEMA.TABLE_CONSTRAINTS AS TC
+            FROM #{database}.INFORMATION_SCHEMA.COLUMNS columns
+            LEFT OUTER JOIN #{database}.INFORMATION_SCHEMA.TABLE_CONSTRAINTS AS TC
               ON TC.TABLE_NAME = columns.TABLE_NAME
               AND TC.CONSTRAINT_TYPE = N'PRIMARY KEY'
-            LEFT OUTER JOIN #{database}INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS KCU
+            LEFT OUTER JOIN #{database}.INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS KCU
               ON KCU.COLUMN_NAME = columns.COLUMN_NAME
               AND KCU.CONSTRAINT_NAME = TC.CONSTRAINT_NAME
               AND KCU.CONSTRAINT_CATALOG = TC.CONSTRAINT_CATALOG
               AND KCU.CONSTRAINT_SCHEMA = TC.CONSTRAINT_SCHEMA
-            INNER JOIN #{identifier.database_quoted}.sys.schemas AS s
+            INNER JOIN #{database}.sys.schemas AS s
               ON s.name = columns.TABLE_SCHEMA
               AND s.schema_id = s.schema_id
-            INNER JOIN #{identifier.database_quoted}.sys.objects AS o
+            INNER JOIN #{database}.sys.objects AS o
               ON s.schema_id = o.schema_id
               AND o.is_ms_shipped = 0
               AND o.type IN ('U', 'V')
               AND o.name = columns.TABLE_NAME
-            INNER JOIN #{identifier.database_quoted}.sys.columns AS c
+            INNER JOIN #{database}.sys.columns AS c
               ON o.object_id = c.object_id
               AND c.name = columns.COLUMN_NAME
             WHERE columns.TABLE_NAME = @0
@@ -299,7 +299,7 @@ module ActiveRecord
               if default.nil? && view_exists
                 default = select_value "
                   SELECT c.COLUMN_DEFAULT
-                  FROM #{database}INFORMATION_SCHEMA.COLUMNS c
+                  FROM #{database}.INFORMATION_SCHEMA.COLUMNS c
                   WHERE c.TABLE_NAME = '#{view_tblnm}'
                   AND c.COLUMN_NAME = '#{views_real_column_name(table_name, ci[:name])}'".squish, 'SCHEMA'
               end

data/lib/active_record/connection_adapters/sqlserver/utils.rb

@@ -39,6 +39,10 @@ module ActiveRecord
             server ? quote(server) : server
           end
 
+          def fully_qualified_database_quoted
+            [server_quoted, database_quoted].compact.join(SEPARATOR)
+          end
+
           def to_s
             quoted
           end

data/lib/active_record/connection_adapters/sqlserver/version.rb

@@ -3,7 +3,7 @@ module ActiveRecord
     module SQLServer
       module Version
 
-        VERSION = '4.2.5'
+        VERSION = '4.2.6'
 
       end
     end

data/test/cases/utils_test_sqlserver.rb

@@ -86,6 +86,14 @@ class UtilsTestSQLServer < ActiveRecord::TestCase
       SQLServer::Utils.extract_identifiers('[obj.name].[foo]').quoted.must_equal '[obj.name].[foo]'
     end
 
+    it 'can return fully qualified quoted table name' do
+      name = SQLServer::Utils.extract_identifiers('[server.name].[database].[schema].[object]')
+      name.fully_qualified_database_quoted.must_equal '[server.name].[database]'
+
+      name = SQLServer::Utils.extract_identifiers('server.database.schema.object')
+      name.fully_qualified_database_quoted.must_equal '[server].[database]'
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 4.2.5
+  version: 4.2.6
 platform: ruby
 authors:
 - Ken Collins
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-22 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord