activerecord-sqlserver-adapter 3.2.10 → 3.2.11

data/CHANGELOG

@@ -1,4 +1,24 @@
 
+* 3.2.11 *
+
+* Handle "No such column" when renaming some columns in the migrations. Fixes #237. Thanks @michelgrootjans.
+* Update regex for `RecordNotUnique` exception. Fixes #257. Thanks @pbatorre.
+* Pass tds_version to TinyTDS. Fixes #233. Thanks @denispeplin.
+* Use CONCAT_NULL_YIELDS_NULL for all TinyTDS connections. Fixes #262. Thanks @noel.
+* Fix for Azure SQL. Fixed #263. Thanks @eklipse2k8.
+* Drop shoulda and use minitest-spec-rails!!!
+* Test TinyTDS 0.6.0.
+* Fixed the unit tests due to changes in ActiveRecord that removes blank config values.
+* Fixed explain tests that were failing due to changes in ExplainSubscriber, cause was regex
+* Fixed change_column to update existing table column rows with new default value if there are any NULL values
+  and the column does not accept nulls
+* Fixed change_column to drop and add indexes if the colun type is changes
+* Fixed string_to_binary and binary_to_string in some cases where the binary data is not UTF-8
+* Fixing generating profile report to create output dir if needed, and code change for printing report
+* Adding ruby-prof to Gemfile, needed when running profile test cases
+* Updating mocha to work with newer ActiveRecord test cases
+
+
 * 3.2.10 *
 
 * Remove connection defaults for host/username/password. Since we want to suppoert Windows Authentication
@@ -67,7 +87,7 @@
 
 * 3.2.0 *
 
-* ActiveRecord explain (SHOWPLAN) support. 
+* ActiveRecord explain (SHOWPLAN) support.
   http://youtu.be/ckb3YYZZZ2Q
 
 * Remove our log_info_schema_queries config since we are not hooking properly into AR's 'SCHEMA' names.
@@ -86,7 +106,7 @@
 
 * 3.1.4 *
 
-* Use INFORMATION_SCHEMA.KEY_COLUMN_USAGE for schema reflection speed. 
+* Use INFORMATION_SCHEMA.KEY_COLUMN_USAGE for schema reflection speed.
   Fixes #125. [Wüthrich Hannes @hwuethrich]
 
 * New deadlock victim retry using the #retry_deadlock_victim config.  [Jason Frey, Joe Rafaniello]
@@ -98,10 +118,10 @@
 
 * Add methods for sqlserver's #product_version, #product_level, #edition and include them in inspect.
   Fixes #145 [Jason Frey, Joe Rafaniello]
-  
-* Handle statements that cannot be retried on a new database connection by not reconnecting. 
+
+* Handle statements that cannot be retried on a new database connection by not reconnecting.
   Fixes #147 [Jason Frey, Joe Rafaniello]
-  
+
 * Added connection#spid for debugging. Fixes #144 [Jason Frey, Joe Rafaniello]
 
 * Add ENV['TEST_FILES'] to Rakefile for easy single case tests. [Jason Frey, Joe Rafaniello]
@@ -117,7 +137,7 @@
 
 * 3.1.3 *
 
-* Distinguish between identity and primary key key columns during schema reflection. Allows us 
+* 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]
 
 
@@ -138,7 +158,7 @@
 
 * Make #rollback_db_transaction smarter.
 
-* Provide a method to override for the quoted string prefix. Not a config because trumping this method will 
+* Provide a method to override for the quoted string prefix. Not a config because trumping this method will
   have drastically bad results. Fixes #124
 
 * Allow :limit/:offset to be used with fully qualified table and column in :select.
@@ -151,12 +171,12 @@
 * Make auto reconnect duration configurable. Fixes #109 [David Chelimsky]
 
 * Quote most time objects to use ISO8601 format to be multi-language dateformat compatible. The [datetime] data type is
-  automatically limited to milliseconds while [time] & [datetimeoffset] have full support. Even included a Date/Time 
+  automatically limited to milliseconds while [time] & [datetimeoffset] have full support. Even included a Date/Time
   ActiveSupport formatter that is used per the language settings of the connection.
 
 * Include a visit_Arel_Nodes_UpdateStatement method in our Arel visitor to add a limit/top for update
   that has order and no limit/top. https://github.com/rails/rails/commit/787194ee43ab1fb0a7dc8bfbbfbd5079b047d833
-  
+
 * Allow drop_database to be called even when DB does not exist.
 
 * Remove totally broken ADONET connection mode. Want it back, submit a patch.
@@ -218,7 +238,7 @@
 * Support for ActiveRecord v3.0.3 and ARel v2.0.7
 
 
-* 3.0.7 * 
+* 3.0.7 *
 
 * Properly quote table names when reflecting on views.
 
@@ -258,7 +278,7 @@
 
 * 3.0.1
 
-* Support DSN'less connections. Resolves ticket 38. 
+* Support DSN'less connections. Resolves ticket 38.
 
 * Support upcoming ruby odbc 0.99992
 
@@ -289,14 +309,14 @@
 
 * 2.3.5
 
-* Initial IronRuby ADONET connection mode support baked right in. Removed most &block 
-  parameters, no handle/request object yielded anymore. Better abstraction and compliance 
-  per the ActiveRecord abstract adapter to not yielding handles for #execute and only for 
-  low level #select. Better wrapping of all queries at lowest level in #log so exceptions 
-  at anytime can be handled correctly by core AR. Critical for System::Data's command 
-  readers. Better abstraction for introspecting on #connection_mode. Added support for 
+* Initial IronRuby ADONET connection mode support baked right in. Removed most &block
+  parameters, no handle/request object yielded anymore. Better abstraction and compliance
+  per the ActiveRecord abstract adapter to not yielding handles for #execute and only for
+  low level #select. Better wrapping of all queries at lowest level in #log so exceptions
+  at anytime can be handled correctly by core AR. Critical for System::Data's command
+  readers. Better abstraction for introspecting on #connection_mode. Added support for
   running singular test cases via TextMate's Command-R. [Ken Collins]
-  
+
 * Force a binary encoding on values coming in and out of those columns for ruby 1.9.
   Fixes ticket #33 [Jeroen Zwartepoorte]
 
@@ -315,22 +335,22 @@
 * For tables that named with schema(ex. rails.users), they could not get length of column.
   column of varchar(40) gets length => nil. Ticket #27 & #15 [Ken Tachiya]
 
-* Altered limited_update_conditions regex conditions, the .* would greedily fail 
+* Altered limited_update_conditions regex conditions, the .* would greedily fail
   if the where_sql had WHERE in a table or field, etc. [Ransom Briggs]
 
-* Changing test to allow ENV['ARUNIT_DB_NAME'] as the database name for the test units. 
+* Changing test to allow ENV['ARUNIT_DB_NAME'] as the database name for the test units.
   Matches up with AR conventions. [Ransom Briggs]
 
 
 2.3.3
-  
-* Revert #ad83df82 and again cache column information at the connection's instance. The 
+
+* Revert #ad83df82 and again cache column information at the connection's instance. The
   previous commit was causing all sorts of view and schema reflection problems. [Ken Collins]
 
 
 2.3.2
 
-* Insert queries that include the word "insert" as a partial column name with the word 
+* Insert queries that include the word "insert" as a partial column name with the word
   "id" as a value were falsely being matched as identity inserts. [Sean Caffery/bfabry]
 
 * Delegate all low level #raw_connection calls to #raw_connection_run and #raw_connection_do
@@ -348,10 +368,10 @@
 * Coerce a few tests that were failing in 2.3.x [Ken Collins]
 
 * Change column/view cache to happen at class level. Allows connection pool to share same
-  caches as well as the ability to expire the caches when needed. Also fix change_column so 
+  caches as well as the ability to expire the caches when needed. Also fix change_column so
   that exceptions are not raised when the column contains an existing default. [Ken Collins]
 
-* Allow query_requires_identity_insert? method to return quoted table name in situations where the 
+* Allow query_requires_identity_insert? method to return quoted table name in situations where the
   INSERT parts are not quoted themselves. [Gary/iawgens, Richard Penwell, Ken Collins]
 
 * Fixed namespace in calling test_sqlserver_odbc within test_unicode_types. [Gary/iawgens]
@@ -363,7 +383,7 @@
 
 * Support Identity-key-column judgement on multiple schema environment [Ken Tachiya]
 
-* Add support for tinyint data types. In MySQL all these types would be boolean, however in 
+* Add support for tinyint data types. In MySQL all these types would be boolean, however in
   our adapter, they will use the full 1 => 255 Fixnum value as you would expect. [Ken Collins]
 
 
@@ -381,10 +401,10 @@
 
 * Implement a new remove_default_constraint method that uses sp_helpconstraint [Ken Collins]
 
-* Use a lazy match in add_order_by_for_association_limiting! to allow sub selects to be used. Resolves 
+* Use a lazy match in add_order_by_for_association_limiting! to allow sub selects to be used. Resolves
   ticket #11.
 
-* Add default rake task back for testing. Runs the namespaced sqlserver:test_sqlserver_odbc. 
+* Add default rake task back for testing. Runs the namespaced sqlserver:test_sqlserver_odbc.
   Resolves ticket #10 [Ken Collins]
 
 * Default value detection in column_definitions is kinder to badly formatted, or long winded user
@@ -397,7 +417,7 @@
 
 * Leave quoted column names as is. Resolves ticket #36 [Vince Puzzella]
 
-* Changing add_limit! in ActiveRecord::Base for SQLServer so that it passes through any scoped :order 
+* Changing add_limit! in ActiveRecord::Base for SQLServer so that it passes through any scoped :order
   parameters. Resolves ticket #35 [Murray Steele]
 
 
@@ -410,45 +430,45 @@
 
 * 2.2.17 * (May 14th, 2009)
 
-* Add simplified type recognition for varchar(max) and nvarchar(max) under SQL Server 2005 to be a 
+* Add simplified type recognition for varchar(max) and nvarchar(max) under SQL Server 2005 to be a
   :text type. This ensures schema dumper does the right thing. Fixes ticket #30. [Ken Collins]
 
-* Tested ruby 1.9, ruby-odbc 0.9996, and DBI 0.4.1. Also added correct support for UTF-8 character 
-  encoding going in and out of the DB. See before gist http://gist.github.com/111709 and after gist 
+* Tested ruby 1.9, ruby-odbc 0.9996, and DBI 0.4.1. Also added correct support for UTF-8 character
+  encoding going in and out of the DB. See before gist http://gist.github.com/111709 and after gist
   http://gist.github.com/111719 [Ken Collins]
 
 
 * 2.2.16 * (April 21st, 2009)
 
-* Make add_limit_offset! only add locking hints (for tally) when the :lock option is present. Added tests 
-  to make sure tally SQL is augmented correctly and tests to make sure that add_lock! is doing what it needs 
+* Make add_limit_offset! only add locking hints (for tally) when the :lock option is present. Added tests
+  to make sure tally SQL is augmented correctly and tests to make sure that add_lock! is doing what it needs
   for deep sub selects in paginated results. [Ken Collins]
 
-* Add auto reconnect support utilizing a new #with_auto_reconnect block. By default each query run through 
-  the adapter will automatically reconnect at standard intervals, logging attempts along the way, till success 
-  or the original exception bubbles up. See docs for more details. Resolves ticket #18 [Ken Collins] 
+* Add auto reconnect support utilizing a new #with_auto_reconnect block. By default each query run through
+  the adapter will automatically reconnect at standard intervals, logging attempts along the way, till success
+  or the original exception bubbles up. See docs for more details. Resolves ticket #18 [Ken Collins]
 
-* Update internal helper method #orders_and_dirs_set to cope with an order clause like "description desc". This 
+* Update internal helper method #orders_and_dirs_set to cope with an order clause like "description desc". This
   resolves ticket #26 [Ken Collins]
 
-* Provide support for running queries at different isolation levels using #run_with_isolation_level method 
-  that can take a block or not. Also implement a #user_options method that reflects on the current user 
+* Provide support for running queries at different isolation levels using #run_with_isolation_level method
+  that can take a block or not. Also implement a #user_options method that reflects on the current user
   session values. Resolves #20 [Murray Steele]
 
 
 * 2.2.15 * (March 23rd, 2009)
 
-* Better add_lock! method that can add the lock to just about all the elements in the statement. This 
-  could be eager loaded associations, joins, etc. Done so that paginated results can easily add lock 
-  options for performance. Note, the tally count in add_limit_offset! use "WITH (NOLOCK)" explicitly 
+* Better add_lock! method that can add the lock to just about all the elements in the statement. This
+  could be eager loaded associations, joins, etc. Done so that paginated results can easily add lock
+  options for performance. Note, the tally count in add_limit_offset! use "WITH (NOLOCK)" explicitly
   as it can not hurt and is needed. [Ken Collins]
 
 
 * 2.2.14 * (March 17th, 2009)
 
-* Rails2.3 - Back passing tests on 2.2 work. Includes: (1) Created new test helpers that check ActiveRecord 
-  version strings so we can conditionally run 2.2 and 2.3 tests. (2) Making TransactionTestSqlserver use Ship vs 
-  Bird model. Also made it conditional run a few blocks for different versions of ActiveRecord. (3) Previous 
+* Rails2.3 - Back passing tests on 2.2 work. Includes: (1) Created new test helpers that check ActiveRecord
+  version strings so we can conditionally run 2.2 and 2.3 tests. (2) Making TransactionTestSqlserver use Ship vs
+  Bird model. Also made it conditional run a few blocks for different versions of ActiveRecord. (3) Previous
   JoinDependency#aliased_table_name_for is now only patched in ActiveRecord equal or greater than 2.3. [Ken Collins]
 
 * Rails2.3 - Implement new savepoint support [Ken Collins]
@@ -460,24 +480,24 @@
 * Rails2.3 - Implement a custom ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation#aliased_table_name_for
   method that uses a Regexp.escape so that table/column quoting does not get ignored. [Ken Collins]
 
-* Rails2.3 - Implement #outside_transaction? and a new transaction test case to test some SQL Server 
+* Rails2.3 - Implement #outside_transaction? and a new transaction test case to test some SQL Server
   basic support while implementing this method. Future home of some savepoint tests too. [Ken Collins]
 
-* Rails2.3 - Coerced tests that ensure hash conditions on referenced tables are considered when eager 
+* Rails2.3 - Coerced tests that ensure hash conditions on referenced tables are considered when eager
   loading with limit/offset. Information on these changes and the ticket in rails are.
   http://github.com/rails/rails/commit/9a4d557713acb0fc8e80f61af18094034aca029a
   http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/1404-conditions_tables-doesnt-understand-condition-hashes
 
 * Rails2.3 - Add coerced tests for true/false attributes in selects use SQL Server case statement. [Ken Collins]
 
-* Making sure that smalldatetime types are OK to use. Also fixed a bug in the #view_information method that 
-  checks to see if a view definition is equal to 4000 chars, meaning that it is most likely truncated and 
+* Making sure that smalldatetime types are OK to use. Also fixed a bug in the #view_information method that
+  checks to see if a view definition is equal to 4000 chars, meaning that it is most likely truncated and
   needs to use the backup method of sp_helptext to get it's view definition. [Ken Collins]
 
 
 * 2.2.13 * (February 10th, 2009)
 
-* Update #indexes to use unqualified table name. Fixes cases where users may decide to use table 
+* Update #indexes to use unqualified table name. Fixes cases where users may decide to use table
   name prefixes like 'dbo.'. [Ken Collins]
 
 
@@ -493,11 +513,11 @@
 
 * 2.2.9 * (January 22nd, 2009)
 
-* Fixing a small bug in the deprecated DBI::Timestamp conversion so it correctly converts nanosecond whole 
-  numbers to back to pre type cast SQL Server milliseconds, ultimately allow ruby's Time#usec which is 
+* Fixing a small bug in the deprecated DBI::Timestamp conversion so it correctly converts nanosecond whole
+  numbers to back to pre type cast SQL Server milliseconds, ultimately allow ruby's Time#usec which is
   microseconds to be correct. [Ken Collins]
-  
-* Sometimes views are more than 4000 chars long and will return NULL for the VIEW_DEFINITION. If so, use 
+
+* Sometimes views are more than 4000 chars long and will return NULL for the VIEW_DEFINITION. If so, use
   sp_helptext procedure as a backup method. [Ken Collins]
 
 
@@ -508,13 +528,13 @@
 
 * 2.2.7 (January 9th, 2009)
 
-* Created a connection#execute_procedure method that takes can take any number of ruby objects as variables 
-  and quotes them according to the connection's rules. Also added an ActiveRecord::Base class level core 
-  extension that hooks into this. It also checks if the connection responds to #execute_procedure and if 
+* Created a connection#execute_procedure method that takes can take any number of ruby objects as variables
+  and quotes them according to the connection's rules. Also added an ActiveRecord::Base class level core
+  extension that hooks into this. It also checks if the connection responds to #execute_procedure and if
   not returns an empty array. [Ken Collins]
 
-* Added a #enable_default_unicode_types class attribute access to make all new added or changed string types 
-  like :string/:text default to unicode/national data types. See the README for full details. Added a rake 
+* Added a #enable_default_unicode_types class attribute access to make all new added or changed string types
+  like :string/:text default to unicode/national data types. See the README for full details. Added a rake
   task that assists setting this to true when running tests.  [Ken Collins]
 
 
@@ -525,15 +545,15 @@
 
 * 2.2.5 (January 4th, 2009)
 
-* Added a log_info_schema_queries class attribute and make all queries to INFORMATION_SCHEMA silent by 
+* Added a log_info_schema_queries class attribute and make all queries to INFORMATION_SCHEMA silent by
   default. [Ken Collins]
 
 * Fix millisecond support in datetime columns. ODBC::Timestamp incorrectly takes SQL Server milliseconds
-  and applies them as nanoseconds. We cope with this at the DBI layer by using SQLServerDBI::Type::SqlserverTimestamp 
-  class to parse the before type cast value appropriately. Also update the adapters #quoted_date method 
+  and applies them as nanoseconds. We cope with this at the DBI layer by using SQLServerDBI::Type::SqlserverTimestamp
+  class to parse the before type cast value appropriately. Also update the adapters #quoted_date method
   to work more simply by converting ruby's #usec milliseconds to SQL Server microseconds. [Ken Collins]
 
-* Core extensions for ActiveRecord now reflect on the connection before doing SQL Server things. Now 
+* Core extensions for ActiveRecord now reflect on the connection before doing SQL Server things. Now
   this adapter is compatible for using with other adapters. [Ken Collins]
 
 
@@ -544,9 +564,9 @@
 
 * 2.2.3 (December 5th, 2008)
 
-* Changing back to using real table name in column_definitions. Makes sure views get back only the columns 
-  that are defined for them with correct names, etc. Now supporting views by looking for NULL default and 
-  then if table name is a view, perform a targeted with sub select to the real table name and column name 
+* Changing back to using real table name in column_definitions. Makes sure views get back only the columns
+  that are defined for them with correct names, etc. Now supporting views by looking for NULL default and
+  then if table name is a view, perform a targeted with sub select to the real table name and column name
   to find true default. [Ken Collins]
 
 * Ensure that add_limit_offset! does not alter sub queries. [Erik Bryn]
@@ -561,10 +581,10 @@
 
 2.2.1 (November 25th, 2008)
 
-* Add identity insert support for views. Cache #views so that identity #table_name_or_views_table_name 
+* Add identity insert support for views. Cache #views so that identity #table_name_or_views_table_name
   will run quickly. [Ken Collins]
 
-* Add views support. ActiveRecord classes can use views. The connection now has a #views method and 
+* Add views support. ActiveRecord classes can use views. The connection now has a #views method and
   #table_exists? will now fall back to checking views too. [Ken Collins]
 
 

data/VERSION

@@ -1 +1 @@
-3.2.10
+3.2.11

data/lib/active_record/connection_adapters/sqlserver/core_ext/explain_subscriber.rb

@@ -0,0 +1,26 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Sqlserver
+      module CoreExt
+        class ExplainSubscriber
+          def call(*args)
+            if queries = Thread.current[:available_queries_for_explain]
+              payload = args.last
+              queries << payload.values_at(:sql, :binds) unless ignore_sqlserver_payload?(payload)
+            end
+          end
+
+          IGNORED_PAYLOADS = %w(SCHEMA EXPLAIN CACHE)
+          SQLSERVER_EXPLAINED_SQLS = /(select|update|delete|insert)/i
+
+          # Need to modify the regex for the TSQL generated by this adapter so we can explain the proper sql statements
+          def ignore_sqlserver_payload?(payload)
+            payload[:exception] || IGNORED_PAYLOADS.include?(payload[:name]) || payload[:sql] !~ SQLSERVER_EXPLAINED_SQLS
+          end
+
+          ActiveSupport::Notifications.subscribe("sql.active_record", new)
+        end
+      end
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ module ActiveRecord
   module ConnectionAdapters
     module Sqlserver
       module SchemaStatements
-        
+
         def native_database_types
           @native_database_types ||= initialize_native_database_types.freeze
         end
@@ -43,11 +43,11 @@ module ActiveRecord
             SQLServerColumn.new ci[:name], ci[:default_value], ci[:type], ci[:null], sqlserver_options
           end
         end
-        
+
         def rename_table(table_name, new_name)
           do_execute "EXEC sp_rename '#{table_name}', '#{new_name}'"
         end
-        
+
         def remove_column(table_name, *column_names)
           raise ArgumentError.new("You must specify at least one column name.  Example: remove_column(:people, :first_name)") if column_names.empty?
           ActiveSupport::Deprecation.warn 'Passing array to remove_columns is deprecated, please use multiple arguments, like: `remove_columns(:posts, :foo, :bar)`', caller if column_names.flatten!
@@ -61,16 +61,25 @@ module ActiveRecord
 
         def change_column(table_name, column_name, type, options = {})
           sql_commands = []
+          indexes = []
           column_object = schema_cache.columns[table_name].detect { |c| c.name.to_s == column_name.to_s }
-          change_column_sql = "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
-          change_column_sql << " NOT NULL" if options[:null] == false
-          sql_commands << change_column_sql
+
           if options_include_default?(options) || (column_object && column_object.type != type.to_sym)
-           	remove_default_constraint(table_name,column_name)
+            remove_default_constraint(table_name,column_name)
+            indexes = indexes(table_name).select{ |index| index.columns.include?(column_name.to_s) }
+            remove_indexes(table_name, column_name)
           end
+          sql_commands << "UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote(options[:default])} WHERE #{quote_column_name(column_name)} IS NULL" if !options[:null].nil? && options[:null] == false && !options[:default].nil?
+          sql_commands << "ALTER TABLE #{quote_table_name(table_name)} ALTER COLUMN #{quote_column_name(column_name)} #{type_to_sql(type, options[:limit], options[:precision], options[:scale])}"
+          sql_commands[-1] << " NOT NULL" if !options[:null].nil? && options[:null] == false
           if options_include_default?(options)
             sql_commands << "ALTER TABLE #{quote_table_name(table_name)} ADD CONSTRAINT #{default_constraint_name(table_name,column_name)} DEFAULT #{quote(options[:default])} FOR #{quote_column_name(column_name)}"
           end
+
+          #Add any removed indexes back
+          indexes.each do |index|
+            sql_commands << "CREATE INDEX #{quote_table_name(index.name)} ON #{quote_table_name(table_name)} (#{index.columns.collect {|c|quote_column_name(c)}.join(', ')})"
+          end
           sql_commands.each { |c| do_execute(c) }
         end
 
@@ -80,10 +89,11 @@ module ActiveRecord
         end
 
         def rename_column(table_name, column_name, new_column_name)
+          schema_cache.clear_table_cache!(table_name)
           detect_column_for! table_name, column_name
           do_execute "EXEC sp_rename '#{table_name}.#{column_name}', '#{new_column_name}', 'COLUMN'"
         end
-        
+
         def remove_index!(table_name, index_name)
           do_execute "DROP INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)}"
         end
@@ -104,27 +114,27 @@ module ActiveRecord
           end
         end
 
-        def change_column_null(table_name, column_name, null, default = nil)
+        def change_column_null(table_name, column_name, allow_null, default = nil)
           column = detect_column_for! table_name, column_name
-          unless null || default.nil?
+          if !allow_null.nil? && allow_null == false && !default.nil?
             do_execute("UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote(default)} WHERE #{quote_column_name(column_name)} IS NULL")
           end
           sql = "ALTER TABLE #{table_name} ALTER COLUMN #{quote_column_name(column_name)} #{type_to_sql column.type, column.limit, column.precision, column.scale}"
-          sql << " NOT NULL" unless null
+          sql << " NOT NULL" if !allow_null.nil? && allow_null == false
           do_execute sql
         end
-        
+
         # === SQLServer Specific ======================================== #
-        
+
         def views
           tables('VIEW')
         end
-        
-        
+
+
         protected
-        
+
         # === SQLServer Specific ======================================== #
-        
+
         def initialize_native_database_types
           {
             :primary_key  => "int NOT NULL IDENTITY(1,1) PRIMARY KEY",
@@ -156,7 +166,7 @@ module ActiveRecord
           table_schema = Utils.unqualify_table_schema(table_name)
           table_name = Utils.unqualify_table_name(table_name)
           sql = %{
-            SELECT DISTINCT 
+            SELECT DISTINCT
             #{lowercase_schema_reflection_sql('columns.TABLE_NAME')} AS table_name,
             #{lowercase_schema_reflection_sql('columns.COLUMN_NAME')} AS name,
             columns.DATA_TYPE AS type,
@@ -172,7 +182,7 @@ module ActiveRecord
               WHEN columns.IS_NULLABLE = 'YES' THEN 1
               ELSE NULL
             END AS [is_nullable],
-            CASE 
+            CASE
               WHEN KCU.COLUMN_NAME IS NOT NULL AND TC.CONSTRAINT_TYPE = N'PRIMARY KEY' THEN 1
               ELSE NULL
             END AS [is_primary],
@@ -240,7 +250,7 @@ module ActiveRecord
             ci
           end
         end
-        
+
         def remove_check_constraints(table_name, column_name)
           constraints = select_values "SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE where TABLE_NAME = '#{quote_string(table_name)}' and COLUMN_NAME = '#{quote_string(column_name)}'", 'SCHEMA'
           constraints.each do |constraint|
@@ -262,9 +272,9 @@ module ActiveRecord
             remove_index(table_name, {:name => index.name})
           end
         end
-        
+
         # === SQLServer Specific (Misc Helpers) ========================= #
-        
+
         def get_table_name(sql)
           if sql =~ /^\s*(INSERT|EXEC sp_executesql N'INSERT)\s+INTO\s+([^\(\s]+)\s*|^\s*update\s+([^\(\s]+)\s*/i
             $2 || $3
@@ -274,29 +284,29 @@ module ActiveRecord
             nil
           end
         end
-        
+
         def default_constraint_name(table_name, column_name)
           "DF_#{table_name}_#{column_name}"
         end
-        
+
         def detect_column_for!(table_name, column_name)
           unless column = schema_cache.columns[table_name].detect { |c| c.name == column_name.to_s }
             raise ActiveRecordError, "No such column: #{table_name}.#{column_name}"
           end
           column
         end
-        
+
         def lowercase_schema_reflection_sql(node)
           lowercase_schema_reflection ? "LOWER(#{node})" : node
         end
-        
+
         # === SQLServer Specific (View Reflection) ====================== #
-        
+
         def view_table_name(table_name)
           view_info = schema_cache.view_information(table_name)
           view_info ? get_table_name(view_info['VIEW_DEFINITION']) : table_name
         end
-        
+
         def view_information(table_name)
           table_name = Utils.unqualify_table_name(table_name)
           view_info = select_one "SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = '#{table_name}'", 'SCHEMA'
@@ -313,18 +323,18 @@ module ActiveRecord
           end
           view_info
         end
-        
+
         def table_name_or_views_table_name(table_name)
           unquoted_table_name = Utils.unqualify_table_name(table_name)
           schema_cache.view_names.include?(unquoted_table_name) ? view_table_name(unquoted_table_name) : unquoted_table_name
         end
-        
+
         def views_real_column_name(table_name,column_name)
           view_definition = schema_cache.view_information(table_name)[:VIEW_DEFINITION]
           match_data = view_definition.match(/([\w-]*)\s+as\s+#{column_name}/im)
           match_data ? match_data[1] : column_name
         end
-        
+
         # === SQLServer Specific (Identity Inserts) ===================== #
 
         def query_requires_identity_insert?(sql)
@@ -336,11 +346,11 @@ module ActiveRecord
             false
           end
         end
-        
+
         def insert_sql?(sql)
           !(sql =~ /^\s*(INSERT|EXEC sp_executesql N'INSERT)/i).nil?
         end
-        
+
         def with_identity_insert_enabled(table_name)
           table_name = quote_table_name(table_name_or_views_table_name(table_name))
           set_identity_insert(table_name, true)

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -8,6 +8,7 @@ require 'active_record/connection_adapters/abstract_adapter'
 require 'active_record/connection_adapters/sqlserver/core_ext/active_record'
 require 'active_record/connection_adapters/sqlserver/core_ext/database_statements'
 require 'active_record/connection_adapters/sqlserver/core_ext/explain'
+require 'active_record/connection_adapters/sqlserver/core_ext/explain_subscriber'
 require 'active_record/connection_adapters/sqlserver/core_ext/relation'
 require 'active_record/connection_adapters/sqlserver/database_limits'
 require 'active_record/connection_adapters/sqlserver/database_statements'
@@ -19,9 +20,9 @@ require 'active_record/connection_adapters/sqlserver/quoting'
 require 'active_record/connection_adapters/sqlserver/utils'
 
 module ActiveRecord
-  
+
   class Base
-    
+
     def self.sqlserver_connection(config) #:nodoc:
       config = config.symbolize_keys
       config.reverse_merge! :mode => :dblib
@@ -38,21 +39,21 @@ module ActiveRecord
       end
       ConnectionAdapters::SQLServerAdapter.new(nil, logger, nil, config.merge(:mode=>mode))
     end
-    
+
     protected
-    
+
     def self.did_retry_sqlserver_connection(connection,count)
       logger.info "CONNECTION RETRY: #{connection.class.name} retry ##{count}."
     end
-    
+
     def self.did_lose_sqlserver_connection(connection)
       logger.info "CONNECTION LOST: #{connection.class.name}"
     end
-    
+
   end
-  
+
   module ConnectionAdapters
-    
+
     class SQLServerColumn < Column
 
       def initialize(name, default, sql_type = nil, null = true, sqlserver_options = {})
@@ -60,39 +61,42 @@ module ActiveRecord
         super(name, default, sql_type, null)
         @primary = @sqlserver_options[:is_identity] || @sqlserver_options[:is_primary]
       end
-      
+
       class << self
-        
+
         def string_to_binary(value)
          "0x#{value.unpack("H*")[0]}"
         end
-        
+
         def binary_to_string(value)
+          if value.respond_to?(:force_encoding) && value.encoding != Encoding::ASCII_8BIT
+            value = value.force_encoding(Encoding::ASCII_8BIT)
+          end
           value =~ /[^[:xdigit:]]/ ? value : [value].pack('H*')
         end
-        
+
       end
-      
+
       def is_identity?
         @sqlserver_options[:is_identity]
       end
-      
+
       def is_primary?
         @sqlserver_options[:is_primary]
       end
-      
+
       def is_utf8?
         !!(@sql_type =~ /nvarchar|ntext|nchar/i)
       end
-      
+
       def is_integer?
         !!(@sql_type =~ /int/i)
       end
-      
+
       def is_real?
         !!(@sql_type =~ /real/i)
       end
-      
+
       def sql_type_for_statement
         if is_integer? || is_real?
           sql_type.sub(/\((\d+)?\)/,'')
@@ -100,15 +104,15 @@ module ActiveRecord
           sql_type
         end
       end
-      
+
       def default_function
         @sqlserver_options[:default_function]
       end
-      
+
       def table_name
         @sqlserver_options[:table_name]
       end
-      
+
       def table_klass
         @table_klass ||= begin
           table_name.classify.constantize
@@ -117,14 +121,14 @@ module ActiveRecord
         end
         (@table_klass && @table_klass < ActiveRecord::Base) ? @table_klass : nil
       end
-      
+
       def database_year
         @sqlserver_options[:database_year]
       end
-      
-      
+
+
       private
-      
+
       def extract_limit(sql_type)
         case sql_type
         when /^smallint/i
@@ -139,7 +143,7 @@ module ActiveRecord
           super
         end
       end
-      
+
       def simplified_type(field_type)
         case field_type
           when /real/i              then :float
@@ -153,7 +157,7 @@ module ActiveRecord
           else super
         end
       end
-      
+
       def simplified_datetime
         if database_year >= 2008
           :datetime
@@ -165,33 +169,33 @@ module ActiveRecord
           :datetime
         end
       end
-      
+
     end #class SQLServerColumn
-    
+
     class SQLServerAdapter < AbstractAdapter
-      
+
       include Sqlserver::Quoting
       include Sqlserver::DatabaseStatements
       include Sqlserver::Showplan
       include Sqlserver::SchemaStatements
       include Sqlserver::DatabaseLimits
       include Sqlserver::Errors
-      
+
       VERSION                     = File.read(File.expand_path("../../../../VERSION",__FILE__)).strip
       ADAPTER_NAME                = 'SQLServer'.freeze
       DATABASE_VERSION_REGEXP     = /Microsoft SQL Server\s+"?(\d{4}|\w+)"?/
       SUPPORTED_VERSIONS          = [2005,2008,2010,2011,2012]
-      
+
       attr_reader :database_version, :database_year, :spid, :product_level, :product_version, :edition
-      
+
       cattr_accessor :native_text_database_type, :native_binary_database_type, :native_string_database_type,
                      :enable_default_unicode_types, :auto_connect, :retry_deadlock_victim,
                      :cs_equality_operator, :lowercase_schema_reflection, :auto_connect_duration,
                      :showplan_option
-      
+
       self.enable_default_unicode_types = true
-      
-      
+
+
       def initialize(connection, logger, pool, config)
         super(connection, logger, pool)
         # AbstractAdapter Responsibility
@@ -203,9 +207,10 @@ module ActiveRecord
         connect
         @database_version = select_value 'SELECT @@version', 'SCHEMA'
         @database_year = begin
-                           if @database_version =~ /Microsoft SQL Azure/i
+                           if @database_version =~ /Azure/i
                              @sqlserver_azure = true
-                             @database_version.match(/\s(\d{4})\s/)[1].to_i
+                             @database_version.match(/\s-\s([0-9.]+)/)[1]
+                             year = 2012
                            else
                              year = DATABASE_VERSION_REGEXP.match(@database_version)[1]
                              year == "Denali" ? 2011 : year.to_i
@@ -218,58 +223,58 @@ module ActiveRecord
         @edition          = select_value "SELECT CAST(SERVERPROPERTY('edition') AS VARCHAR(128))", 'SCHEMA'
         initialize_dateformatter
         use_database
-        unless SUPPORTED_VERSIONS.include?(@database_year)
+        unless (@sqlserver_azure == true || SUPPORTED_VERSIONS.include?(@database_year))
           raise NotImplementedError, "Currently, only #{SUPPORTED_VERSIONS.to_sentence} are supported. We got back #{@database_version}."
         end
       end
-      
+
       # === Abstract Adapter ========================================== #
-      
+
       def adapter_name
         ADAPTER_NAME
       end
-      
+
       def supports_migrations?
         true
       end
-      
+
       def supports_primary_key?
         true
       end
-      
+
       def supports_count_distinct?
         true
       end
-      
+
       def supports_ddl_transactions?
         true
       end
-      
+
       def supports_bulk_alter?
         false
       end
-      
+
       def supports_savepoints?
         true
       end
-      
+
       def supports_index_sort_order?
         true
       end
-      
+
       def supports_explain?
         true
       end
-      
+
       def disable_referential_integrity
         do_execute "EXEC sp_MSforeachtable 'ALTER TABLE ? NOCHECK CONSTRAINT ALL'"
         yield
       ensure
         do_execute "EXEC sp_MSforeachtable 'ALTER TABLE ? CHECK CONSTRAINT ALL'"
       end
-      
+
       # === Abstract Adapter (Connection Management) ================== #
-      
+
       def active?
         case @connection_options[:mode]
         when :dblib
@@ -296,13 +301,13 @@ module ActiveRecord
           @connection.disconnect rescue nil
         end
       end
-      
+
       def reset!
         remove_database_connections_and_rollback { }
       end
-      
+
       # === Abstract Adapter (Misc Support) =========================== #
-      
+
       def pk_and_sequence_for(table_name)
         idcol = identity_column(table_name)
         idcol ? [idcol.name,nil] : nil
@@ -311,85 +316,85 @@ module ActiveRecord
       def primary_key(table_name)
         identity_column(table_name).try(:name) || schema_cache.columns[table_name].detect(&:is_primary?).try(:name)
       end
-      
+
       # === SQLServer Specific (DB Reflection) ======================== #
-      
+
       def sqlserver?
         true
       end
-      
+
       def sqlserver_2005?
         @database_year == 2005
       end
-      
+
       def sqlserver_2008?
         @database_year == 2008
       end
-      
+
       def sqlserver_2011?
         @database_year == 2011
       end
-      
+
       def sqlserver_2012?
         @database_year == 2012
       end
-      
+
       def sqlserver_azure?
         @sqlserver_azure
       end
-      
+
       def version
         self.class::VERSION
       end
-      
+
       def inspect
         "#<#{self.class} version: #{version}, year: #{@database_year}, product_level: #{@product_level.inspect}, product_version: #{@product_version.inspect}, edition: #{@edition.inspect}, connection_options: #{@connection_options.inspect}>"
       end
-      
+
       def auto_connect
         @@auto_connect.is_a?(FalseClass) ? false : true
       end
-      
+
       def auto_connect_duration
         @@auto_connect_duration ||= 10
       end
-      
+
       def retry_deadlock_victim
         @@retry_deadlock_victim.is_a?(FalseClass) ? false : true
       end
       alias :retry_deadlock_victim? :retry_deadlock_victim
-      
+
       def native_string_database_type
-        @@native_string_database_type || (enable_default_unicode_types ? 'nvarchar' : 'varchar') 
+        @@native_string_database_type || (enable_default_unicode_types ? 'nvarchar' : 'varchar')
       end
-      
+
       def native_text_database_type
         @@native_text_database_type || enable_default_unicode_types ? 'nvarchar(max)' : 'varchar(max)'
       end
-      
+
       def native_time_database_type
         sqlserver_2005? ? 'datetime' : 'time'
       end
-      
+
       def native_date_database_type
         sqlserver_2005? ? 'datetime' : 'date'
       end
-      
+
       def native_binary_database_type
         @@native_binary_database_type || 'varbinary(max)'
       end
-      
+
       def cs_equality_operator
         @@cs_equality_operator || 'COLLATE Latin1_General_CS_AS_WS'
       end
-      
+
       protected
-      
+
       # === Abstract Adapter (Misc Support) =========================== #
-      
+
       def translate_exception(e, message)
         case message
-        when /cannot insert duplicate key .* with unique index/i
+        when /(cannot insert duplicate key .* with unique index) | (violation of unique key constraint)/i
           RecordNotUnique.new(message,e)
         when /conflicted with the foreign key constraint/i
           InvalidForeignKey.new(message,e)
@@ -401,9 +406,9 @@ module ActiveRecord
           super
         end
       end
-      
+
       # === SQLServer Specific (Connection Management) ================ #
-      
+
       def connect
         config = @connection_options
         @connection = case config[:mode]
@@ -412,13 +417,14 @@ module ActiveRecord
                         login_timeout = config[:login_timeout].present? ? config[:login_timeout].to_i : nil
                         timeout = config[:timeout].present? ? config[:timeout].to_i/1000 : nil
                         encoding = config[:encoding].present? ? config[:encoding] : nil
-                        TinyTds::Client.new({ 
+                        TinyTds::Client.new({
                           :dataserver    => config[:dataserver],
                           :host          => config[:host],
                           :port          => config[:port],
                           :username      => config[:username],
                           :password      => config[:password],
                           :database      => config[:database],
+                          :tds_version   => config[:tds_version],
                           :appname       => appname,
                           :login_timeout => login_timeout,
                           :timeout       => timeout,
@@ -439,6 +445,7 @@ module ActiveRecord
                             client.execute("SET IMPLICIT_TRANSACTIONS OFF").do
                           end
                           client.execute("SET TEXTSIZE 2147483647").do
+                          client.execute("SET CONCAT_NULL_YIELDS_NULL ON").do
                         end
                       when :odbc
                         if config[:dsn].include?(';')
@@ -449,7 +456,7 @@ module ActiveRecord
                           ODBC::Database.new.drvconnect(driver)
                         else
                           ODBC.connect config[:dsn], config[:username], config[:password]
-                        end.tap do |c|  
+                        end.tap do |c|
                           begin
                             c.use_time = true
                             c.use_utc = ActiveRecord::Base.default_timezone == :utc
@@ -463,20 +470,20 @@ module ActiveRecord
       rescue
         raise unless @auto_connecting
       end
-      
+
       # Override this method so every connection can be configured to your needs.
-      # For example: 
+      # For example:
       #    raw_connection_do "SET TEXTSIZE #{64.megabytes}"
       #    raw_connection_do "SET CONCAT_NULL_YIELDS_NULL ON"
       def configure_connection
       end
-      
+
       # Override this method so every connection can have a unique name. Max 30 characters. Used by TinyTDS only.
       # For example:
       #    "myapp_#{$$}_#{Thread.current.object_id}".to(29)
       def configure_application_name
       end
-      
+
       def initialize_dateformatter
         @database_dateformat = user_options_dateformat
         a, b, c = @database_dateformat.each_char.to_a
@@ -485,7 +492,7 @@ module ActiveRecord
         ::Date::DATE_FORMATS[:_sqlserver_dateformat] = dateformat
         ::Time::DATE_FORMATS[:_sqlserver_dateformat] = dateformat
       end
-      
+
       def remove_database_connections_and_rollback(database=nil)
         database ||= current_database
         do_execute "ALTER DATABASE #{quote_table_name(database)} SET SINGLE_USER WITH ROLLBACK IMMEDIATE"
@@ -495,7 +502,7 @@ module ActiveRecord
           do_execute "ALTER DATABASE #{quote_table_name(database)} SET MULTI_USER"
         end if block_given?
       end
-      
+
       def with_sqlserver_error_handling
         begin
           yield
@@ -507,22 +514,23 @@ module ActiveRecord
           raise
         end
       end
-      
+
       def disable_auto_reconnect
         old_auto_connect, self.class.auto_connect = self.class.auto_connect, false
         yield
       ensure
         self.class.auto_connect = old_auto_connect
       end
-      
+
       def auto_reconnected?
         return false unless auto_connect
         @auto_connecting = true
         count = 0
         while count <= (auto_connect_duration / 2)
-          sleep 2** count
+          result = reconnect!
           ActiveRecord::Base.did_retry_sqlserver_connection(self,count)
-          return true if reconnect!
+          return true if result
+          sleep 2** count
           count += 1
         end
         ActiveRecord::Base.did_lose_sqlserver_connection(self)
@@ -530,10 +538,10 @@ module ActiveRecord
       ensure
         @auto_connecting = false
       end
-            
+
     end #class SQLServerAdapter < AbstractAdapter
-    
+
   end #module ConnectionAdapters
-  
+
 end #module ActiveRecord
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 3.2.10
   prerelease: 
+  version: 3.2.11
 platform: ruby
 authors:
 - Ken Collins
@@ -13,24 +13,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
+    none: false
+  prerelease: false
+  type: :runtime
 description: ActiveRecord SQL Server Adapter. For SQL Server 2005 And Higher.
 email: ken@metaskills.net
 executables: []
@@ -43,6 +43,7 @@ files:
 - lib/active_record/connection_adapters/sqlserver/core_ext/active_record.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/database_statements.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/explain.rb
+- lib/active_record/connection_adapters/sqlserver/core_ext/explain_subscriber.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/odbc.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/relation.rb
 - lib/active_record/connection_adapters/sqlserver/database_limits.rb
@@ -65,20 +66,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: activerecord-sqlserver-adapter
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: ActiveRecord SQL Server Adapter. For SQL Server 2005 And Higher.