activerecord-sqlserver-adapter 3.1.2 → 3.1.3

data/CHANGELOG

@@ -1,4 +1,10 @@
 
+* 3.1.3 *
+
+* Distinguish between identity and primary key key columns during schema reflection. Allows us 
+  us to only do identity inserts when technically needed. Fixes #139 [chadcf] & [joncanady]
+
+
 * 3.1.2 *
 
 * Fix SQL Azure conflicts with DBCC useroptions. Use new #user_options_xyz methods. [kazamachi]

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

@@ -194,6 +194,9 @@ module ActiveRecord
             END AS [is_nullable],
             CASE 
               WHEN CCU.COLUMN_NAME IS NOT NULL AND TC.CONSTRAINT_TYPE = N'PRIMARY KEY' THEN 1
+              ELSE NULL
+            END AS [is_primary],
+            CASE 
               WHEN COLUMNPROPERTY(OBJECT_ID(columns.TABLE_SCHEMA+'.'+columns.TABLE_NAME), columns.COLUMN_NAME, 'IsIdentity') = 1 THEN 1
               ELSE NULL
             END AS [is_identity]
@@ -239,6 +242,7 @@ module ActiveRecord
                                    match_data ? match_data[1] : nil
                                  end
             ci[:null] = ci[:is_nullable].to_i == 1 ; ci.delete(:is_nullable)
+            ci[:is_primary] = ci[:is_primary].to_i == 1
             ci[:is_identity] = ci[:is_identity].to_i == 1
             ci
           end
@@ -363,7 +367,7 @@ module ActiveRecord
           if insert_sql?(sql)
             table_name = get_table_name(sql)
             id_column = identity_column(table_name)
-            id_column && id_column.is_integer? && sql =~ /^\s*(INSERT|EXEC sp_executesql N'INSERT)[^(]+\([^)]*\b(#{id_column.name})\b,?[^)]*\)/i ? quote_table_name(table_name) : false
+            id_column && sql =~ /^\s*(INSERT|EXEC sp_executesql N'INSERT)[^(]+\([^)]*\b(#{id_column.name})\b,?[^)]*\)/i ? quote_table_name(table_name) : false
           else
             false
           end
@@ -389,7 +393,7 @@ module ActiveRecord
         end
 
         def identity_column(table_name)
-          columns(table_name).detect(&:primary) || columns(table_name).detect(&:is_identity?)
+          columns(table_name).detect(&:is_identity?)
         end
 
       end

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

@@ -3,7 +3,7 @@ module ActiveRecord
     module Sqlserver
       module Version
         
-        VERSION = '3.1.2'.freeze
+        VERSION = '3.1.3'.freeze
         
       end
     end

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -53,7 +53,7 @@ module ActiveRecord
       def initialize(name, default, sql_type = nil, null = true, sqlserver_options = {})
         @sqlserver_options = sqlserver_options.symbolize_keys
         super(name, default, sql_type, null)
-        @primary = @sqlserver_options[:is_identity]
+        @primary = @sqlserver_options[:is_identity] || @sqlserver_options[:is_primary]
       end
       
       class << self
@@ -72,6 +72,10 @@ module ActiveRecord
         @sqlserver_options[:is_identity]
       end
       
+      def is_primary?
+        @sqlserver_options[:is_primary]
+      end
+      
       def is_utf8?
         !!(@sql_type =~ /nvarchar|ntext|nchar/i)
       end
@@ -289,7 +293,7 @@ module ActiveRecord
       end
 
       def primary_key(table_name)
-        identity_column(table_name).try(:name)
+        identity_column(table_name).try(:name) || columns(table_name).detect(&:is_primary?).try(:name)
       end
       
       # === SQLServer Specific (DB Reflection) ======================== #
@@ -434,8 +438,8 @@ module ActiveRecord
       
       # Override this method so every connection can be configured to your needs.
       # For example: 
-      #    do_execute "SET TEXTSIZE #{64.megabytes}"
-      #    do_execute "SET CONCAT_NULL_YIELDS_NULL ON"
+      #    raw_connection_do "SET TEXTSIZE #{64.megabytes}"
+      #    raw_connection_do "SET CONCAT_NULL_YIELDS_NULL ON"
       def configure_connection
       end
       

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 3
   - 1
-  - 2
-  version: 3.1.2
+  - 3
+  version: 3.1.3
 platform: ruby
 authors: 
 - Ken Collins
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-24 00:00:00 -04:00
+date: 2011-10-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency