activerecord-sqlserver-adapter 4.2.6 → 4.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e84d27ebd75f08bcf37cf9243972440b0fc57280
-  data.tar.gz: f1f0a3e19713a80cdeba715025b4cb8523574c25
+  metadata.gz: 6f37e4ce81b63e3fe3375111b70da855a95d1251
+  data.tar.gz: 7b11a582736c9718dbb20097b0b55c392f691b08
 SHA512:
-  metadata.gz: f35f9ee3b2b34f7601f86d6867f2a86bf618203411e6e94ba4eec6b8d92f26cca09c63ae0596f50acacd4090fc644c4bfba43a3d2b7f2c33f849b170174d3cad
-  data.tar.gz: e59869fcb2a59c6a68a3778a56f7a1834becaec3c15844b44ed522115ca1a157cffe18c378b48cb697904188580171cdca76940f800377228c030ebc00c57233
+  metadata.gz: f0066beca8922fb26506304059d80069a91f45b9392857e68a2af63640f4706ff300ca4b8e8bb18d807117bb168039188d50d397897488de255b31c454692a1c
+  data.tar.gz: e52261a203dcc9d9124ed6d04113fbcc15887e09b38f18076e213906da9b2b4fbf71e83032b5ee284483c206a28d9bb237f6f04e67cbdcc7e0b68ece791f8fbb

data/CHANGELOG.md

@@ -1,4 +1,38 @@
 
+## v4.2.8
+
+#### Fixed
+
+* Azure-Friendly Disable Referential Integrity. No more `sp_MSforeachtable` usage. Fixes #421
+* Azure-Friendly DB create/drop. Fixes #442
+  - Create allows edition options like: MAXSIZE, EDITION, and SERVICE_OBJECTIVE.
+
+
+## v4.2.7
+
+#### Added
+
+* Support 2008 Datatypes Using TDSVER=7.3. Fixes #433
+
+#### Changed
+
+* Test now use latest v0.9.5 of TinyTDS. Includes tests for `defncopy` Windows binstub.
+* Make linked servers stronger. Fixes #427. Thanks @jippeholwerda
+* Use proper module for the `sqlserver_connection` method. Fixes #431. Thanks @jippeholwerda
+* All datetime casting using the `Time::DATE_FORMATS[:_sqlserver_*]` formats set after connection.
+
+#### Removed
+
+* The `SQLServer::Utils.with_sqlserver_db_date_formats` helper and `quoted_date` hacks.
+* The `Quoter` value type which allowed column => type special case quoting.
+
+#### Fixed
+
+* Every time datatype has perfect micro/nano second handling.
+* All supported datatypes dump defaults properly to schema.rb
+* Partial indexes using `:where` in schema dumper. Fixes #153
+
+
 ## v4.2.6
 
 #### Fixed

data/Gemfile

@@ -37,6 +37,8 @@ end
 group :tinytds do
   if ENV['TINYTDS_SOURCE']
     gem 'tiny_tds', path: ENV['TINYTDS_SOURCE']
+  elsif ENV['TINYTDS_VERSION']
+    gem 'tiny_tds', ENV['TINYTDS_VERSION']
   else
     gem 'tiny_tds'
   end
@@ -46,3 +48,10 @@ group :odbc do
   gem 'ruby-odbc'
 end
 
+group :development do
+  gem 'guard'
+  gem 'guard-minitest'
+  gem 'mocha'
+  gem 'minitest', '< 5.3.4' # PENDING: [Rails5.x] Remove test order constraint.
+  gem 'minitest-spec-rails'
+end

data/README.md

@@ -25,36 +25,50 @@ Account.execute_procedure :update_totals, named: 'params'
 
 #### Native Data Type Support
 
-We support every data type supported by FreeTDS and then a few more. All simplified Rails types in migrations will coorespond to a matching SQL Server national data type. Here is a basic chart. Always check the `initialize_native_database_types` method for an updated list.
+We support every data type supported by FreeTDS and then a few more. All simplified Rails types in migrations will coorespond to a matching SQL Server national (unicode) data type. Here is a basic chart. Always check the `initialize_native_database_types` method for an updated list.
 
 ```ruby
-integer:      { name: 'int', limit: 4 }
-bigint:       { name: 'bigint' }
-boolean:      { name: 'bit' }
-decimal:      { name: 'decimal' }
-money:        { name: 'money' }
-smallmoney:   { name: 'smallmoney' }
-float:        { name: 'float' }
-real:         { name: 'real' }
-date:         { name: 'date' }
-datetime:     { name: 'datetime' }
-timestamp:    { name: 'datetime' }
-time:         { name: 'time' }
-char:         { name: 'char' }
-varchar:      { name: 'varchar', limit: 8000 }
-varchar_max:  { name: 'varchar(max)' }
-text_basic:   { name: 'text' }
-nchar:        { name: 'nchar' }
-string:       { name: 'nvarchar', limit: 4000 }
-text:         { name: 'nvarchar(max)' }
-ntext:        { name: 'ntext' }
-binary_basic: { name: 'binary' }
-varbinary:    { name: 'varbinary', limit: 8000 }
-binary:       { name: 'varbinary(max)' }
-uuid:         { name: 'uniqueidentifier' }
-ss_timestamp: { name: 'timestamp' }
+integer:        { name: 'int', limit: 4 }
+bigint:         { name: 'bigint' }
+boolean:        { name: 'bit' }
+decimal:        { name: 'decimal' }
+money:          { name: 'money' }
+smallmoney:     { name: 'smallmoney' }
+float:          { name: 'float' }
+real:           { name: 'real' }
+date:           { name: 'date' }
+datetime:       { name: 'datetime' }
+datetime2:      { name: 'datetime2', precision: 7 }
+datetimeoffset: { name: 'datetimeoffset', precision: 7 }
+smalldatetime:  { name: 'smalldatetime' }
+timestamp:      { name: 'datetime' }
+time:           { name: 'time' }
+char:           { name: 'char' }
+varchar:        { name: 'varchar', limit: 8000 }
+varchar_max:    { name: 'varchar(max)' }
+text_basic:     { name: 'text' }
+nchar:          { name: 'nchar' }
+string:         { name: 'nvarchar', limit: 4000 }
+text:           { name: 'nvarchar(max)' }
+ntext:          { name: 'ntext' }
+binary_basic:   { name: 'binary' }
+varbinary:      { name: 'varbinary', limit: 8000 }
+binary:         { name: 'varbinary(max)' }
+uuid:           { name: 'uniqueidentifier' }
+ss_timestamp:   { name: 'timestamp' }
 ```
 
+The following types require TDS version 7.3 with TinyTDS. This requires the latest FreeTDS v0.95 or higher.
+
+* date
+* datetime2
+* datetimeoffset
+* time
+
+Set `tds_version` in your database.yml or the `TDSVER` environment variable to `7.3` to ensure you are using the proper protocol version till 7.3 becomes the default.
+
+**Zone Conversion** - The `[datetimeoffset]` type is the only ActiveRecord time based datatype that does not cast the zone to ActiveRecord's default - typically UTC. As intended, this datatype is meant to maintain the zone you pass to it and/or retreived from the database.
+
 
 #### Force Schema To Lowercase
 

data/VERSION

@@ -0,0 +1 @@
+4.2.8

data/activerecord-sqlserver-adapter.gemspec

@@ -17,14 +17,4 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
   spec.add_dependency 'activerecord', '~> 4.2.1'
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'guard'
-  spec.add_development_dependency 'guard-minitest'
-  spec.add_development_dependency 'minitest', '< 5.3.4' # PENDING: [Rails5.x] Remove test order constraint.
-  spec.add_development_dependency 'minitest-focus'
-  spec.add_development_dependency 'minitest-spec-rails'
-  spec.add_development_dependency 'mocha'
-  spec.add_development_dependency 'nokogiri'
-  spec.add_development_dependency 'byebug'
-  spec.add_development_dependency 'rake'
 end

data/appveyor.yml

@@ -1,13 +1,14 @@
-version: 4.2.5.{build}
 init:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - SET PATH=C:\MinGW\msys\1.0\bin;%PATH%
   - SET RAKEOPT=-rdevkit
+  - SET TINYTDS_VERSION=0.9.5.rc.3
 clone_depth: 5
 skip_tags: true
 matrix:
   fast_finish: true
 install:
+  - ps: Update-AppveyorBuild -Version "$(Get-Content $env:appveyor_build_folder\VERSION).$env:appveyor_build_number"
   - ruby --version
   - gem --version
   - bundle install --without odbc
@@ -19,12 +20,23 @@ test_script:
   - timeout /t 4 /nobreak > NUL
   - sqlcmd -S ".\SQL2014" -U sa -P Password12! -i %APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.sql
   - bundle exec rake test ACTIVERECORD_UNITTEST_DATASERVER="localhost\SQL2014"
+  - bundle exec rake test ACTIVERECORD_UNITTEST_DATASERVER="localhost\SQL2014" ACTIVERECORD_UNITTEST_TDSVERSION="7.3"
   - ps: Stop-Service 'MSSQL$SQL2014'
   - ps: Start-Service 'MSSQL$SQL2012SP1'
   - timeout /t 4 /nobreak > NUL
   - sqlcmd -S ".\SQL2012SP1" -U sa -P Password12! -i %APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.sql
   - bundle exec rake test ACTIVERECORD_UNITTEST_DATASERVER="localhost\SQL2012SP1"
+  - bundle exec rake test ACTIVERECORD_UNITTEST_DATASERVER="localhost\SQL2012SP1" ACTIVERECORD_UNITTEST_TDSVERSION="7.3"
+  # - timeout /t 4 /nobreak > NUL
+  # - bundle exec rake test ACTIVERECORD_UNITTEST_HOST=%CI_AZURE_HOST% ACTIVERECORD_UNITTEST_PASS=%CI_AZURE_PASS% ACTIVERECORD_UNITTEST_AZURE=1
+  # - timeout /t 4 /nobreak > NUL
+  # - bundle exec rake test ACTIVERECORD_UNITTEST_HOST=%CI_AZURE_HOST% ACTIVERECORD_UNITTEST_PASS=%CI_AZURE_PASS% ACTIVERECORD_UNITTEST_AZURE=1 TDSVER=7.3
 environment:
+  CI_AZURE_HOST:
+    secure: VChrioaIWkf9iuuaSs4cryiA4honrADgZqNC0++begg=
+  CI_AZURE_PASS:
+    secure: cSQp8sk4urJYvq0utpsK+r7J+snJ2wpcdp8RdXJfB+w=
   matrix:
-    - ruby_version: "200-x64"
-    - ruby_version: "21-x64"
+    - ruby_version: "200"
+    - ruby_version: "22"
+    - ruby_version: "22-x64"

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

@@ -179,8 +179,8 @@ module ActiveRecord
           if sqlserver_azure?
             sql = %(SELECT CASE [transaction_isolation_level]
                     WHEN 0 THEN NULL
-                    WHEN 1 THEN 'READ UNCOMITTED'
-                    WHEN 2 THEN 'READ COMITTED'
+                    WHEN 1 THEN 'READ UNCOMMITTED'
+                    WHEN 2 THEN 'READ COMMITTED'
                     WHEN 3 THEN 'REPEATABLE READ'
                     WHEN 4 THEN 'SERIALIZABLE'
                     WHEN 5 THEN 'SNAPSHOT' END AS [isolation_level]
@@ -216,7 +216,7 @@ module ActiveRecord
         end
 
         def sql_for_insert(sql, pk, id_value, sequence_name, binds)
-          sql = if pk && self.class.use_output_inserted
+          sql = if pk && self.class.use_output_inserted && !database_prefix_remote_server?
             quoted_pk = SQLServer::Utils.extract_identifiers(pk).quoted
             sql.insert sql.index(/ (DEFAULT )?VALUES/), " OUTPUT INSERTED.#{quoted_pk}"
           else

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

@@ -5,17 +5,9 @@ module ActiveRecord
 
         def create_database(database, options = {})
           name = SQLServer::Utils.extract_identifiers(database)
-          options = {collation: @connection_options[:collation]}.merge!(options.symbolize_keys)
-          options = options.select { |_, v| v.present? }
-          option_string = options.inject("") do |memo, (key, value)|
-            memo += case key
-            when :collation
-              " COLLATE #{value}"
-            else
-              ""
-            end
-          end
-          do_execute "CREATE DATABASE #{name}#{option_string}"
+          db_options = create_database_options(options)
+          edition_options = create_database_edition_options(options)
+          do_execute "CREATE DATABASE #{name} #{db_options} #{edition_options}"
         end
 
         def drop_database(database)
@@ -35,6 +27,38 @@ module ActiveRecord
           select_value "SELECT DATABASEPROPERTYEX(DB_NAME(), 'Collation')"
         end
 
+
+        private
+
+        def create_database_options(options={})
+          keys  = [:collate]
+          copts = @connection_options
+          options = {
+            collate: copts[:collation]
+          }.merge(options.symbolize_keys).select { |_, v|
+            v.present?
+          }.slice(*keys).map { |k,v|
+            "#{k.to_s.upcase} #{v}"
+          }.join(' ')
+          options
+        end
+
+        def create_database_edition_options(options={})
+          keys  = [:maxsize, :edition, :service_objective]
+          copts = @connection_options
+          edition_options = {
+            maxsize: copts[:azure_maxsize],
+            edition: copts[:azure_edition],
+            service_objective: copts[:azure_service_objective]
+          }.merge(options.symbolize_keys).select { |_, v|
+            v.present?
+          }.slice(*keys).map { |k,v|
+            "#{k.to_s.upcase} = #{v}"
+          }.join(', ')
+          edition_options = "( #{edition_options} )" if edition_options.present?
+          edition_options
+        end
+
       end
     end
   end

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

@@ -40,15 +40,10 @@ module ActiveRecord
         end
 
         def quoted_date(value)
-          SQLServer::Utils.with_sqlserver_db_date_formats do
-            if value.acts_like?(:time) && value.respond_to?(:usec)
-              precision = (BigDecimal(value.usec.to_s) / 1_000_000).round(3).to_s.split('.').last
-              "#{super}.#{precision}"
-            elsif value.acts_like?(:date)
-              value.to_s(:_sqlserver_dateformat)
-            else
-              super
-            end
+          if value.acts_like?(:date)
+            Type::Date.new.type_cast_for_database(value)
+          else value.acts_like?(:time)
+            Type::DateTime.new.type_cast_for_database(value)
           end
         end
 
@@ -59,8 +54,6 @@ module ActiveRecord
           case value
           when Type::Binary::Data
             "0x#{value.hex}"
-          when SQLServer::Type::Quoter
-            value.quote_ss_value
           when String, ActiveSupport::Multibyte::Chars
             if value.is_utf8?
               "#{QUOTED_STRING_PREFIX}#{super}"
@@ -72,11 +65,6 @@ module ActiveRecord
           end
         end
 
-        def quoted_value_acts_like_time_filter(value)
-          zone_conversion_method = ActiveRecord::Base.default_timezone == :utc ? :getutc : :getlocal
-          value.respond_to?(zone_conversion_method) ? value.send(zone_conversion_method) : value
-        end
-
       end
     end
   end

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

@@ -32,12 +32,13 @@ module ActiveRecord
             else
               name    = index[:index_name]
               unique  = index[:index_description] =~ /unique/
+              where   = select_value("SELECT [filter_definition] FROM sys.indexes WHERE name = #{quote(name)}")
               columns = index[:index_keys].split(',').map do |column|
                 column.strip!
                 column.gsub! '(-)', '' if column.ends_with?('(-)')
                 column
               end
-              indexes << IndexDefinition.new(table_name, name, unique, columns)
+              indexes << IndexDefinition.new(table_name, name, unique, columns, nil, nil, where)
             end
           end
         end
@@ -201,6 +202,9 @@ module ActiveRecord
             real: { name: 'real' },
             date: { name: 'date' },
             datetime: { name: 'datetime' },
+            datetime2: { name: 'datetime2' },
+            datetimeoffset: { name: 'datetimeoffset' },
+            smalldatetime: { name: 'smalldatetime' },
             timestamp: { name: 'datetime' },
             time: { name: 'time' },
             char: { name: 'char' },
@@ -220,7 +224,11 @@ module ActiveRecord
         end
 
         def column_definitions(table_name)
-          identifier  = SQLServer::Utils.extract_identifiers(table_name)
+          identifier = if database_prefix_remote_server?
+            SQLServer::Utils.extract_identifiers("#{database_prefix}#{table_name}")
+          else
+            SQLServer::Utils.extract_identifiers(table_name)
+          end
           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
@@ -282,6 +290,8 @@ module ActiveRecord
             ci[:type] = case ci[:type]
                         when /^bit|image|text|ntext|datetime$/
                           ci[:type]
+                        when /^datetime2|datetimeoffset$/i
+                          "#{ci[:type]}(#{ci[:datetime_precision]})"
                         when /^time$/i
                           "#{ci[:type]}(#{ci[:datetime_precision]})"
                         when /^numeric|decimal$/i

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

@@ -18,6 +18,14 @@ module ActiveRecord
           column(name, :money, options)
         end
 
+        def datetime2(name, options = {})
+          column(name, :datetime2, options)
+        end
+
+        def datetimeoffset(name, options = {})
+          column(name, :datetimeoffset, options)
+        end
+
         def smallmoney(name, options = {})
           column(name, :smallmoney, options)
         end

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

@@ -1,5 +1,4 @@
 require 'active_record/type'
-require 'active_record/connection_adapters/sqlserver/type/quoter.rb'
 # Exact Numerics
 require 'active_record/connection_adapters/sqlserver/type/integer.rb'
 require 'active_record/connection_adapters/sqlserver/type/big_integer.rb'
@@ -13,8 +12,11 @@ require 'active_record/connection_adapters/sqlserver/type/small_money.rb'
 require 'active_record/connection_adapters/sqlserver/type/float.rb'
 require 'active_record/connection_adapters/sqlserver/type/real.rb'
 # Date and Time
+require 'active_record/connection_adapters/sqlserver/type/time_value_fractional.rb'
 require 'active_record/connection_adapters/sqlserver/type/date.rb'
 require 'active_record/connection_adapters/sqlserver/type/datetime.rb'
+require 'active_record/connection_adapters/sqlserver/type/datetime2.rb'
+require 'active_record/connection_adapters/sqlserver/type/datetimeoffset.rb'
 require 'active_record/connection_adapters/sqlserver/type/smalldatetime.rb'
 require 'active_record/connection_adapters/sqlserver/type/time.rb'
 # Character Strings

data/lib/active_record/connection_adapters/sqlserver/type/date.rb

@@ -4,6 +4,15 @@ module ActiveRecord
       module Type
         class Date < ActiveRecord::Type::Date
 
+          def type_cast_for_database(value)
+            return unless value.present?
+            return value if value.acts_like?(:string)
+            value.to_s(:_sqlserver_dateformat)
+          end
+
+          def type_cast_for_schema(value)
+            type_cast_for_database(value).inspect
+          end
 
         end
       end

data/lib/active_record/connection_adapters/sqlserver/type/datetime.rb

@@ -4,28 +4,34 @@ module ActiveRecord
       module Type
         class DateTime < ActiveRecord::Type::DateTime
 
+          include TimeValueFractional
+
+          def type_cast_for_database(value)
+            return super unless value.acts_like?(:time)
+            value = zone_conversion(value)
+            datetime = value.to_s(:_sqlserver_datetime)
+            "#{datetime}".tap do |v|
+              fraction = quote_fractional(value)
+              v << ".#{fraction}" unless fraction.to_i.zero?
+            end
+          end
+
           def type_cast_for_schema(value)
-            value.acts_like?(:string) ? "'#{value}'" : super
+            type_cast_for_database(value).inspect
           end
 
 
           private
 
           def cast_value(value)
-            value = value.respond_to?(:usec) ? value : super
+            value = value.acts_like?(:time) ? value : super
             return unless value
-            value.change usec: cast_usec(value)
-          end
-
-          def cast_usec(value)
-            return 0 if !value.respond_to?(:usec) || value.usec.zero?
-            seconds = value.usec.to_f / 1_000_000.0
-            ss_seconds = ((seconds * (1 / second_precision)).round / (1 / second_precision)).round(3)
-            (ss_seconds * 1_000_000).to_i
+            cast_fractional(value)
           end
 
-          def second_precision
-            0.00333
+          def zone_conversion(value)
+            method = ActiveRecord::Base.default_timezone == :utc ? :getutc : :getlocal
+            value.respond_to?(method) ? value.send(method) : value
           end
 
         end