activerecord-sqlserver-adapter 4.0.4 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a54d7e571a64b7870abe37edf41a68c27a64cb1
-  data.tar.gz: 1d6c387c805cd8770d73f51aa64c011b28d51018
+  metadata.gz: 1769be5dc11de446932e700fa5d565eedd0acb13
+  data.tar.gz: a27fc285acdf1b2d18c464effb4251a6a657106d
 SHA512:
-  metadata.gz: '0923cb551fe43f0af696f9cea6b638010c6b439de596e564c0cd45522b00b4214902b7d0b5f6e80b23c2a19f3e39517f0bc6db96e373edba3a435c8fa659d1de'
-  data.tar.gz: 5fc8c2fba1b67b1bdc46ea7a42ed6d569bab69bc4c4daae2cba13a81b724aa9123615276f17d501a644ba7b95be1d1fe4aa61f2f63d6113b01c346e54fc6d94d
+  metadata.gz: bbb747777f956819b3c0f74e0c50d144462a11736416a66cc09d34214195583c6fb1e1d120599e6d5b7212238a7dc89d7c4f0fcaa456bae7e2b45d924fb90087
+  data.tar.gz: 2520b82a442e5dd2dceb78731a8689251bdcc50bc40c2d58b955330b39a16d98b64b08de54d10afc72292fa36a7ccc5a74092167a9f01fee82ab03b942c068da

data/CHANGELOG

@@ -1,25 +1,4 @@
-* 4.0.4 *
-
-* Add `WITH NO_INFOMSGS` to `user_options` method. Fixes #580
-
-
-* 4.0.3 *
-
-* Fix parens around `enable_default_unicode_types`. Fixes #562
-
-
-* 4.0.2 *
-
-* Added vNext support.
-
-
-* 4.0.1 *
-
-* Added 2014 and 2016 to supported list.
-
-
 * 4.0.0 *
-
 * Dropped support for ruby 1.8.7
 * Removed deadlock victim retry in favor of Isolation Level
 * Removed auto_explain_threshold_in_seconds (not used in rails 4)

data/VERSION

@@ -1 +1 @@
-4.0.4
+4.1.0

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

@@ -18,8 +18,8 @@ module ActiveRecord
           if id_insert_table_name = sqlserver_options[:insert] ? query_requires_identity_insert?(sql) : nil
             with_identity_insert_enabled(id_insert_table_name) { do_exec_query(sql, name, binds) }
           elsif update_sql?(sql)
-             sql = strip_ident_from_update(sql)
-             do_exec_query(sql, name, binds)
+            sql = strip_ident_from_update(sql)
+            do_exec_query(sql, name, binds)
           else
             do_exec_query(sql, name, binds)
           end
@@ -56,15 +56,15 @@ module ActiveRecord
           do_execute 'IF @@TRANCOUNT > 0 ROLLBACK TRANSACTION'
         end
 
-        def create_savepoint
-          disable_auto_reconnect { do_execute "SAVE TRANSACTION #{current_savepoint_name}" }
+        def create_savepoint(name = current_savepoint_name)
+          disable_auto_reconnect { do_execute "SAVE TRANSACTION #{name}" }
         end
 
-        def release_savepoint
+        def release_savepoint(name = current_savepoint_name)
         end
 
-        def rollback_to_savepoint
-          disable_auto_reconnect { do_execute "ROLLBACK TRANSACTION #{current_savepoint_name}" }
+        def rollback_to_savepoint(name = current_savepoint_name)
+          disable_auto_reconnect { do_execute "ROLLBACK TRANSACTION #{name}" }
         end
 
         def add_limit_offset!(_sql, _options)
@@ -122,7 +122,7 @@ module ActiveRecord
 
         def user_options
           return {} if sqlserver_azure?
-          select_rows('DBCC USEROPTIONS WITH NO_INFOMSGS', 'SCHEMA').reduce(HashWithIndifferentAccess.new) do |values, row|
+          select_rows('dbcc useroptions', 'SCHEMA').reduce(HashWithIndifferentAccess.new) do |values, row|
             if row.instance_of? Hash
               set_option = row.values[0].gsub(/\s+/, '_')
               user_value = row.values[1]
@@ -334,7 +334,11 @@ module ActiveRecord
             next if ar_column && column.sql_type == 'timestamp'
             v = value
             names_and_types << if ar_column
-                                 v = value.to_i if column.is_integer? && value.present?
+                                 if column.is_integer? && value.present?
+                                   v = value.to_i
+                                   # Reset the casted value to the bind as required by Rails 4.1
+                                   binds[index] = [column, v]
+                                 end
                                  "@#{index} #{column.sql_type_for_statement}"
                                elsif column.acts_like?(:string)
                                  "@#{index} nvarchar(max)"

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

@@ -67,7 +67,7 @@ module ActiveRecord
           if column.respond_to?(:sql_type) && column.sql_type == 'timestamp'
             nil
           else
-            Arel.sql "@#{index}"
+            Arel::Nodes::BindParam.new "@#{index}"
           end
         end
 

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

@@ -22,6 +22,34 @@ module ActiveRecord
             super
           end
         end
+
+        def visit_TableDefinition(o)
+          quoted_name = "#{quote_table_name((o.temporary ? '#' : '') + o.name.to_s)} "
+
+          if o.as
+            if o.as.is_a?(ActiveRecord::Relation)
+              select = o.as.to_sql
+            elsif o.as.is_a?(String)
+              select = o.as
+            else
+              raise 'Only able to generate a table from a SELECT statement passed as a String or ActiveRecord::Relation'
+            end
+
+            create_sql = 'SELECT * INTO '
+            create_sql << quoted_name
+            create_sql << 'FROM ('
+            create_sql << select
+            create_sql << ') AS __sq'
+
+          else
+            create_sql = "CREATE TABLE "
+            create_sql << quoted_name
+            create_sql << "(#{o.columns.map { |c| accept c }.join(', ')}) "
+            create_sql << "#{o.options}"
+          end
+
+          create_sql
+        end
       end
     end
   end

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

@@ -16,6 +16,12 @@ module ActiveRecord
           super || tables.include?(unquoted_table_name) || views.include?(unquoted_table_name)
         end
 
+        def create_table(table_name, options = {})
+          res = super
+          schema_cache.clear_table_cache!(table_name)
+          res
+        end
+
         def indexes(table_name, name = nil)
           data = select("EXEC sp_helpindex #{quote(table_name)}", name) rescue []
           data.reduce([]) do |indexes, index|
@@ -256,7 +262,7 @@ module ActiveRecord
                                    nil
                                  else
                                    match_data = ci[:default_value].match(/\A\(+N?'?(.*?)'?\)+\Z/m)
-                                   match_data ? match_data[1] : nil
+                                   match_data ? match_data[1].gsub("''", "'") : nil
                                  end
             ci[:null] = ci[:is_nullable].to_i == 1
             ci.delete(:is_nullable)
@@ -408,8 +414,8 @@ module ActiveRecord
 
         private
 
-        def create_table_definition(name, temporary, options)
-          TableDefinition.new native_database_types, name, temporary, options
+        def create_table_definition(name, temporary, options, as = nil)
+          TableDefinition.new native_database_types, name, temporary, options, as
         end
       end
     end

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -37,7 +37,7 @@ module ActiveRecord
       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, 2014, 2016]
+      SUPPORTED_VERSIONS          = [2005, 2008, 2010, 2011, 2012]
 
       attr_reader :database_version, :database_year, :spid, :product_level, :product_version, :edition
 
@@ -65,9 +65,7 @@ module ActiveRecord
                            if @database_version =~ /Azure/i
                              @sqlserver_azure = true
                              @database_version.match(/\s-\s([0-9.]+)/)[1]
-                             year = 2016
-                           elsif @database_version =~ /vNext/i
-                             year = 2016
+                             year = 2012
                            else
                              year = DATABASE_VERSION_REGEXP.match(@database_version)[1]
                              year == 'Denali' ? 2011 : year.to_i
@@ -231,7 +229,7 @@ module ActiveRecord
       end
 
       def native_text_database_type
-        @@native_text_database_type || (enable_default_unicode_types ? 'nvarchar(max)' : 'varchar(max)')
+        @@native_text_database_type || enable_default_unicode_types ? 'nvarchar(max)' : 'varchar(max)'
       end
 
       def native_time_database_type
@@ -300,26 +298,26 @@ module ActiveRecord
                               encoding:  encoding(config),
                               azure: config[:azure]
                             ).tap do |client|
-                              if config[:azure]
-                                client.execute('SET ANSI_NULLS ON').do
-                                client.execute('SET CURSOR_CLOSE_ON_COMMIT OFF').do
-                                client.execute('SET ANSI_NULL_DFLT_ON ON').do
-                                client.execute('SET IMPLICIT_TRANSACTIONS OFF').do
-                                client.execute('SET ANSI_PADDING ON').do
-                                client.execute('SET QUOTED_IDENTIFIER ON')
-                                client.execute('SET ANSI_WARNINGS ON').do
-                              else
-                                client.execute('SET ANSI_DEFAULTS ON').do
-                                client.execute('SET CURSOR_CLOSE_ON_COMMIT OFF').do
-                                client.execute('SET IMPLICIT_TRANSACTIONS OFF').do
-                              end
+          if config[:azure]
+            client.execute('SET ANSI_NULLS ON').do
+            client.execute('SET CURSOR_CLOSE_ON_COMMIT OFF').do
+            client.execute('SET ANSI_NULL_DFLT_ON ON').do
+            client.execute('SET IMPLICIT_TRANSACTIONS OFF').do
+            client.execute('SET ANSI_PADDING ON').do
+            client.execute('SET QUOTED_IDENTIFIER ON')
+            client.execute('SET ANSI_WARNINGS ON').do
+          else
+            client.execute('SET ANSI_DEFAULTS ON').do
+            client.execute('SET CURSOR_CLOSE_ON_COMMIT OFF').do
+            client.execute('SET IMPLICIT_TRANSACTIONS OFF').do
+          end
           client.execute('SET TEXTSIZE 2147483647').do
           client.execute('SET CONCAT_NULL_YIELDS_NULL ON').do
         end
       end
 
       def appname(config)
-       config[:appname] || configure_application_name || Rails.application.class.name.split('::').first rescue nil
+        config[:appname] || configure_application_name || Rails.application.class.name.split('::').first rescue nil
       end
 
       def login_timeout(config)

data/lib/active_record/connection_adapters/sqlserver_column.rb

@@ -112,5 +112,5 @@ module ActiveRecord
         end
       end
     end # class SQLServerColumn
- end # module ConnectionAdapters
+  end # module ConnectionAdapters
 end # module ActiveRecord

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 4.0.4
+  version: 4.1.0
 platform: ruby
 authors:
 - Ken Collins
 - Anna Carey
+- Will Bond
 - Murray Steele
 - Shawn Balestracci
 - Joe Rafaniello
@@ -13,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-26 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -21,28 +22,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '0'
 description: ActiveRecord SQL Server Adapter. For SQL Server 2005 And Higher.
 email: ken@metaskills.net
 executables: []
@@ -97,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: activerecord-sqlserver-adapter
-rubygems_version: 2.6.8
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord SQL Server Adapter. For SQL Server 2005 And Higher.