activerecord_sqlserver_crm 5.1.1 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 518b8ac7c1220a69156623f41405677b532f8602
-  data.tar.gz: d9d4ff4ff4f7f596311fac39a25cdf7aabad1c1d
+  metadata.gz: 14c8162bb4c63c744295b08a767f3dd347967557
+  data.tar.gz: b0151c208209aad112ee07e250bbb63cf53c9339
 SHA512:
-  metadata.gz: 068eee1e08e11f006a83aa2837f56fecec1cefdcfb0a5b74bcfc32d15ea1ef5525357527ce23e36055ee31411c9135ae2079e3550b7288f48252d0e5c92992b7
-  data.tar.gz: af7e7da093231b6f063c0520aea8ca2156b454af93c324b88793a94c8bb1ee268e4baf0174d9d006b5df16b65f57d769eba60b70c758df80e8f5eb376c786542
+  metadata.gz: 8778543933b59bc25e589cb93e12f85b64ba5ab93a3e2e7c715d209bbda04cf86835af423cd47746de8a9f5216bfae8cf5deba0367223f928638c30a28048d96
+  data.tar.gz: 9032fb1c27e6ef1ddf1a400fe7cc3ea3ff448a6cb016202486d8ff72b4fb414ea4692ef716ccaf1cb82b5ecb98a4d179bdd4ffeeac7e5b8ec589ef730c4ab92f

data/config/initializers/extensions.rb

@@ -2,3 +2,4 @@ require 'odata_config'
 require "active_record_extension"
 require "big_decimal"
 require "sql_server_adapter"
+require "sqlserver"

data/lib/activerecord_sqlserver_crm/version.rb

@@ -1,3 +1,3 @@
 module ActiverecordSqlserverCrm
-  VERSION = "5.1.1"
+  VERSION = "5.1.2"
 end

data/lib/sqlserver.rb

@@ -0,0 +1,42 @@
+# This file comes from the activerecord_sqlserver gem and is overridden.
+# It fixes 2 problems:
+# 1. Primary key was looked up from database. But since we are using Views in CRM, nothing was returned for
+#    primary keys. Instead we get primary key from ActiveRecord Object
+# 2. With a find method, it was adding an Order by and a fetch, which is not necessary
+module Arel
+  module Visitors
+    class SQLServer < Arel::Visitors::ToSql
+
+      def visit_Arel_Nodes_SelectStatement o, collector
+        @select_statement = o
+        distinct_One_As_One_Is_So_Not_Fetch o
+        if o.with
+          collector = visit o.with, collector
+          collector << SPACE
+        end
+        collector = o.cores.inject(collector) { |c,x|
+          visit_Arel_Nodes_SelectCore(x, c)
+        }
+        # Added this line to check for orders present
+        if o.orders.present?
+          collector = visit_Orders_And_Let_Fetch_Happen o, collector
+          collector = visit_Make_Fetch_Happen o, collector
+        end
+        collector
+      ensure
+        @select_statement = nil
+      end
+
+      def primary_Key_From_Table t
+        return unless t
+        # Use activerecord class, and get primary key from that rather than look in database
+        arclass = t.send(:type_caster)&.send(:types)&.name&.constantize
+        column_name = @connection.schema_cache.primary_keys(t.name) ||
+            arclass.primary_key ||
+            @connection.schema_cache.columns_hash(t.name).first.try(:second).try(:name)
+        column_name ? t[column_name] : nil
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_sqlserver_crm
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.2
 platform: ruby
 authors:
 - Rolf Lawrenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -180,6 +180,7 @@ files:
 - lib/odata/update_operation.rb
 - lib/odata_config.rb
 - lib/sql_server_adapter.rb
+- lib/sqlserver.rb
 - lib/tasks/activerecord_sqlserver_crm_tasks.rake
 homepage: https://github.com/RolfLawrenz/activerecord_sqlserver_crm
 licenses: