abstractor 1.0.14 → 1.0.15

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWYyNzk5NjkxOTcyZjMyZjg2MDM0OWQ0MzgwZWVhZTZkMGFhMzY4OA==
+    NmMxMzYzMjdiMmFjODc2MDU0YTBiNDcwYmQ0MGQ2YWVmMjE4ZTA1Zg==
   data.tar.gz: !binary |-
-    ZWYxNTJlNjA1NDYzYjJkMDdjOTYzMDk5NjMyMjM5NTRhOTYyNmQ3ZA==
+    ZDRmNzc4NWVmN2IwNDVlMDUxMmE4ZDc3OWIyNTMyNmQ2ZTA0MjU0MQ==
 SHA512:
   metadata.gz: !binary |-
-    MTNhZDQ1Mzg0MzRiYTI4Nzc4ODE3ZTFiMmMzZWRhNzE3NjlmNzA2NTQ1MjAy
-    YzhlMTJhN2IxMWFlODA5YjdjMjliOWEwYTI2Y2ZiZGFkNGRhZGYxNzliODBk
-    M2U1ZTk4MjE4Zjk0ZmU4MGY1MmZlMjhlZWE2YzQxODhmNDY0ZDM=
+    MGQzNmYxYzFhOGNhYzJjODQ3NTc1YTUwMTUxYmQ0NDY1YTAzY2E3OTRlYWY4
+    MzU2MTY1NGM2ODExYjA0NWRmMDdhN2MxMmNiM2MxZmFmNmI5ZmNiYmNiNGQw
+    MTk2Nzk0ZmI1YmI0ZGE3MzBmMmY0YjViOWNkYzRiMTRjNjg1ZWE=
   data.tar.gz: !binary |-
-    OTI1ZTUyZGQ3YzAxZDVjNDUxNjdhOGZmY2MyOTE0Y2NjNzJlYzlkOGJiZWJj
-    MTc4MTE1ZTU3MmEyY2UzNzk1YjQ4ODAzMmIzNDYzZDQ3ODhhZDljYzNjZTlh
-    ZmQ3MGEzMmI0ZDk5ZTg3ODZmNmI1NzFiODQwZjUzOTlkMjgwZTc=
+    OWVjYzMyMWZlNzBhMDhlMmE5NGQ2ZDJlOWQxMTRhYjk3MjM1YzgxMzVjZWFl
+    YTlkNTY2Y2E4ZThmOTRhODgyNzFjY2Y5NWFiZDIxYzE2NzJiZmU4ZjQzMjgy
+    ODU0ZDFkOTVjN2Q3Y2VjNjc1MmNmMTFmMmUyZjQ4MTI2NTJlOWI=

data/lib/abstractor/abstractable.rb

@@ -136,29 +136,16 @@ module Abstractor
       # @return ActiveRecord::Relation
       def pivot_abstractions
         select = prepare_pivot_select(grouped: false)
-        joins = "LEFT JOIN
-        (
-        SELECT #{self.table_name}.id AS subject_id,
-        #{select}
-        FROM
-        (SELECT   aas.predicate
-                , aas.id AS abstractor_abstraction_schema_id
-                , asb.subject_type
-                , aa.about_id
-                , aa.value
-        FROM abstractor_abstractions aa JOIN abstractor_subjects asb            ON aa.abstractor_subject_id = asb.id
-                                        JOIN abstractor_abstraction_schemas aas ON asb.abstractor_abstraction_schema_id = aas.id
-        WHERE asb.subject_type = '#{self.to_s}'
-        AND NOT EXISTS (
-          SELECT 1
-          FROM abstractor_abstraction_group_members aagm
-          WHERE aa.id = aagm.abstractor_abstraction_id
-        )
-        ) data join #{self.table_name} ON  data.about_id = #{self.table_name}.id
-        GROUP BY #{self.table_name}.id
-        ) pivoted_abstractions ON pivoted_abstractions.subject_id = #{self.table_name}.id
-        "
-        joins(joins).select("#{self.table_name}.*, pivoted_abstractions.*")
+        adapter = ActiveRecord::Base.connection.instance_values["config"][:adapter]
+        j = case adapter
+        when 'sqlite3'
+          prepare_pivot_joins(select, "'t'")
+        when 'sqlserver'
+          prepare_pivot_joins(select, '1')
+        when 'postgresql'
+          prepare_pivot_joins(select, 'true')
+        end
+        joins(j).select("#{self.table_name}.*, pivoted_abstractions.*")
       end
 
       ##
@@ -181,30 +168,17 @@ module Abstractor
       # @return ActiveRecord::Relation
       # @see Abstractor::Methods::Models:AbstractorSubjectGroup
       def pivot_grouped_abstractions(abstractor_subject_groups_name)
-        abstractor_subject_group = abstractor_subject_groups.detect { |abstractor_subject_group| abstractor_subject_group.name ==  abstractor_subject_groups_name }
         select = prepare_pivot_select(grouped: true)
-        joins = "JOIN
-        (
-        SELECT #{self.table_name}.id AS subject_id,
-        #{select}
-        FROM
-        (SELECT   aas.predicate
-                , aas.id AS abstraction_schema_id
-                , asb.subject_type
-                , aa.about_id
-                , aa.value
-                , aag.id AS abstractor_abstraction_group_id
-        FROM abstractor_abstractions aa JOIN abstractor_subjects asb                    ON aa.abstractor_subject_id = asb.id
-                                        JOIN abstractor_abstraction_schemas aas         ON asb.abstractor_abstraction_schema_id = aas.id
-                                        JOIN abstractor_abstraction_group_members aagm  ON aa.id = aagm.abstractor_abstraction_id
-                                        JOIN abstractor_abstraction_groups aag          ON aagm.abstractor_abstraction_group_id= aag.id
-        WHERE asb.subject_type = '#{self.to_s}'
-        AND aag.abstractor_subject_group_id = #{abstractor_subject_group.id}
-        ) data join #{self.table_name} ON  data.about_id = #{self.table_name}.id
-        GROUP BY #{self.table_name}.id, abstractor_abstraction_group_id
-        ) pivoted_abstractions ON pivoted_abstractions.subject_id = #{self.table_name}.id
-        "
-        joins(joins).select("#{self.table_name}.*, pivoted_abstractions.*")
+        adapter = ActiveRecord::Base.connection.instance_values["config"][:adapter]
+        j = case adapter
+        when 'sqlite3'
+          prepare_grouped_pivot_joins(select, "'t'", abstractor_subject_groups_name)
+        when 'sqlserver'
+          prepare_grouped_pivot_joins(select, '1', abstractor_subject_groups_name)
+        when 'postgresql'
+          prepare_grouped_pivot_joins(select, 'true', abstractor_subject_groups_name)
+        end
+        joins(j).select("#{self.table_name}.*, pivoted_abstractions.*")
       end
 
       private
@@ -218,6 +192,57 @@ module Abstractor
           end
           select = select.join(',')
         end
+
+        def prepare_pivot_joins(select, bool)
+          "LEFT JOIN
+          (
+          SELECT #{self.table_name}.id AS subject_id,
+          #{select}
+          FROM
+          (SELECT   aas.predicate
+                  , aas.id AS abstractor_abstraction_schema_id
+                  , asb.subject_type
+                  , aa.about_id
+                  , CASE WHEN aa.value IS NOT NULL AND aa.value != '' THEN aa.value WHEN aa.unknown = #{bool} THEN 'unknown' WHEN aa.not_applicable = #{bool} THEN 'not applicable' END AS value
+          FROM abstractor_abstractions aa JOIN abstractor_subjects asb            ON aa.abstractor_subject_id = asb.id
+                                          JOIN abstractor_abstraction_schemas aas ON asb.abstractor_abstraction_schema_id = aas.id
+          WHERE asb.subject_type = '#{self.to_s}'
+          AND NOT EXISTS (
+            SELECT 1
+            FROM abstractor_abstraction_group_members aagm
+            WHERE aa.id = aagm.abstractor_abstraction_id
+          )
+          ) data join #{self.table_name} ON  data.about_id = #{self.table_name}.id
+          GROUP BY #{self.table_name}.id
+          ) pivoted_abstractions ON pivoted_abstractions.subject_id = #{self.table_name}.id
+          "
+        end
+
+        def prepare_grouped_pivot_joins(select, bool, abstractor_subject_groups_name)
+          abstractor_subject_group = abstractor_subject_groups.detect { |abstractor_subject_group| abstractor_subject_group.name ==  abstractor_subject_groups_name }
+
+          "JOIN
+           (
+           SELECT #{self.table_name}.id AS subject_id,
+           #{select}
+           FROM
+           (SELECT   aas.predicate
+                   , aas.id AS abstraction_schema_id
+                   , asb.subject_type
+                   , aa.about_id
+                   , CASE WHEN aa.value IS NOT NULL AND aa.value != '' THEN aa.value WHEN aa.unknown = #{bool} THEN 'unknown' WHEN aa.not_applicable = #{bool} THEN 'not applicable' END AS value
+                   , aag.id AS abstractor_abstraction_group_id
+           FROM abstractor_abstractions aa JOIN abstractor_subjects asb                    ON aa.abstractor_subject_id = asb.id
+                                           JOIN abstractor_abstraction_schemas aas         ON asb.abstractor_abstraction_schema_id = aas.id
+                                           JOIN abstractor_abstraction_group_members aagm  ON aa.id = aagm.abstractor_abstraction_id
+                                           JOIN abstractor_abstraction_groups aag          ON aagm.abstractor_abstraction_group_id= aag.id
+           WHERE asb.subject_type = '#{self.to_s}'
+           AND aag.abstractor_subject_group_id = #{abstractor_subject_group.id}
+           ) data join #{self.table_name} ON  data.about_id = #{self.table_name}.id
+           GROUP BY #{self.table_name}.id, abstractor_abstraction_group_id
+           ) pivoted_abstractions ON pivoted_abstractions.subject_id = #{self.table_name}.id
+           "
+        end
     end
   end
 end

data/lib/abstractor/version.rb

@@ -1,3 +1,3 @@
 module Abstractor
-  VERSION = '1.0.14'
+  VERSION = '1.0.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstractor
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Michael Gurley, Yulia Bushmanova
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails