activerecord_sqlserver_crm 4.3.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5632b8f45c98560b213a941945be26caf7933396
-  data.tar.gz: 2b79f447a42186b1143f98d8e0f3e30fcba6911e
+  metadata.gz: fb4cd782e903ee4cd337f04794c441e3dde58bce
+  data.tar.gz: 3f7885b8975e84872bb1bfc91460dfd84d8b0745
 SHA512:
-  metadata.gz: 81567aa661188bacd4765591de49261aa900c6a94c1879fe99e18cb18798365c408ca20df536c13262cf941a1b1363b508e1b1f005e9b5186d9cb567529fb23f
-  data.tar.gz: fa2db689e0709d531eee6ce092e71a89dd7cdade0ec3e815ac2106579864128f08ffaa78a119c2ed09c648bcb404c4bfafad5be105918914c0a947ab6dc70e59
+  metadata.gz: 6b197031744c98bf4e907864225dcebc038a636a492630db3b72913f18d4349cb28e895af60b4023980a9e154044eef9e0861c65f4b41912b884ac8a76cfe0af
+  data.tar.gz: 423356df1139ead9d10ad8e93af3b3c624767e50d8d8daff568739cf99a3d33328c819a4e52af2c7a1110b6c4e526fb9cf65410cb6f28c4c576257b8816472d4

data/config/initializers/schema_statements.rb

@@ -7,7 +7,7 @@ module ActiveRecord
 
         def views_real_column_name(table_name, column_name)
           view_definition = Rails.cache.fetch("sqlserver_table_view_info_#{table_name}", expires_in: SCHEMA_EXPIRES_IN) do
-            schema_cache.view_information(table_name)[:VIEW_DEFINITION]
+            view_information(table_name)[:VIEW_DEFINITION]
           end
           return column_name unless view_definition
           # match_data = view_definition.match(/([\w-]*)\s+as\s+#{column_name}/im)
@@ -24,8 +24,8 @@ module ActiveRecord
                            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
+            view_exists = view_exists?(table_name)
+            view_tblnm  = view_table_name(table_name) if view_exists
             sql = %{
               SELECT DISTINCT
               #{lowercase_schema_reflection_sql('columns.TABLE_NAME')} AS table_name,
@@ -35,7 +35,7 @@ module ActiveRecord
               columns.NUMERIC_SCALE AS numeric_scale,
               columns.NUMERIC_PRECISION AS numeric_precision,
               columns.DATETIME_PRECISION AS datetime_precision,
-              columns.COLLATION_NAME AS collation,
+              columns.COLLATION_NAME AS [collation],
               columns.ordinal_position,
               CASE
                 WHEN columns.DATA_TYPE IN ('nchar','nvarchar','char','varchar') THEN columns.CHARACTER_MAXIMUM_LENGTH
@@ -53,6 +53,7 @@ module ActiveRecord
               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.TABLE_SCHEMA = columns.TABLE_SCHEMA
                 AND TC.CONSTRAINT_TYPE = N'PRIMARY KEY'
               LEFT OUTER JOIN #{database}.INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS KCU
                 ON KCU.COLUMN_NAME = columns.COLUMN_NAME
@@ -70,12 +71,14 @@ module ActiveRecord
               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
-                AND columns.TABLE_SCHEMA = #{identifier.schema.blank? ? 'schema_name()' : '@1'}
+              WHERE columns.TABLE_NAME = #{prepared_statements ? '@0' : quote(identifier.object)}
+                AND columns.TABLE_SCHEMA = #{identifier.schema.blank? ? 'schema_name()' : (prepared_statements ? '@1' : quote(identifier.schema))}
               ORDER BY columns.ordinal_position
-            }.gsub(/[ \t\r\n]+/, ' ')
-            binds = [[info_schema_table_name_column, identifier.object]]
-            binds << [info_schema_table_schema_column, identifier.schema] unless identifier.schema.blank?
+            }.gsub(/[ \t\r\n]+/, ' ').strip
+            binds = []
+            nv128 = SQLServer::Type::UnicodeVarchar.new limit: 128
+            binds << Relation::QueryAttribute.new('TABLE_NAME', identifier.object, nv128)
+            binds << Relation::QueryAttribute.new('TABLE_SCHEMA', identifier.schema, nv128) unless identifier.schema.blank?
             results = sp_executesql(sql, 'SCHEMA', binds)
             ret = results.map do |ci|
               ci = ci.symbolize_keys

data/lib/active_record_extension.rb

@@ -142,13 +142,9 @@ unless OdataConfig.odata_config[Rails.env]['odata_enabled'] == false
   ActiveRecord::Base.send(:include, ActiveRecordExtension)
 
   # Extend belongs_to for crm_key field
-  module BelongsToActiveRecordExtension
-    def valid_options
-      super + [:crm_key]
-    end
-  end
-
   class ActiveRecord::Associations::Builder::BelongsTo
-    include ::BelongsToActiveRecordExtension
+    def self.valid_options(options)
+      super + [:polymorphic, :touch, :counter_cache, :optional, :crm_key]
+    end
   end
 end

data/lib/activerecord_sqlserver_crm/version.rb

@@ -1,3 +1,3 @@
 module ActiverecordSqlserverCrm
-  VERSION = "4.3.0"
+  VERSION = "5.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_sqlserver_crm
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Rolf Lawrenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,60 +16,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.6
+        version: 5.0.1
 - !ruby/object:Gem::Dependency
   name: activerecord-sqlserver-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.15
+        version: 5.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.15
+        version: 5.0.5
 - !ruby/object:Gem::Dependency
   name: tiny_tds
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -89,21 +89,21 @@ dependencies:
         version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 3.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: 3.5.2
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +113,7 @@ dependencies:
         version: '9.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 9.0.5
+        version: 9.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -123,7 +123,7 @@ dependencies:
         version: '9.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 9.0.5
+        version: 9.0.6
 description: A rails engine that uses ActiveRecord SQL Server to read from CRM SQL
   Server, and OData to write to CRM.
 email: