card-mod-lookup 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d77f0f0886a1501eb9348fe19e42575ddfac1b74a0a8083d133919cc9c74807b
-  data.tar.gz: 5814cbfda2b15d6c2b4903474940908539121449d83b79528ce048c04bedd688
+  metadata.gz: 2c77c10ee00c6b928424df37db61a768e58a610f35d6db668e2a3d02a58a46ee
+  data.tar.gz: 78cc69b638d553606d18f558f0702aadf2c42100ec0af3a0e2ba38a57c12c7f9
 SHA512:
-  metadata.gz: bcabc55ee2467ea1bde04d59a735d4d5d86cb240186232ccde7c7ff4a774d6d1f126fb2c3a834211b38e459029f2481ce0745ead932f5b168c32d47e9ac458e5
-  data.tar.gz: 9e11d30ff675d7e87d2976488cbf45808cf436682210707366f0bf8b25f9884b4d835c9c873be32fbac0dac5a5bd0ac778a5143938e109438d15a59becb7605e
+  metadata.gz: c3650ecfd40809a93ce97167062ad4df2ff40970554565267370d192491230d8e29b27b2e68b0d28ec518e0f81791b5af03e302108c5beb05334dad3c8daf9fe
+  data.tar.gz: 1844dddf1146c2575cf4fab268de1a9e5369e1b1ef3d168c4f0b05fe532e058b5409f2f62aa1a5b6234247ef9d523fa00772e70304be3a916d2d71d05d8e17c7

data/README.md

@@ -18,7 +18,7 @@ and when a database grows large, it can become quite expensive to execute all
 the implied self joins.
 
 For example, consider the use case that first inspired this code: _answers_ on
-WikiRate.org. WikiRate is a site that collects answers to questions about 
+Wikirate.org. WikiRate is a site that collects answers to questions about 
 companies. A given answer is a response to a given metric for a given year
 for a given company. When you consider all the kinds of companies and metrics
 and metric designers that WikiRate supports, you can imagine the queries 

data/lib/card/lookup_filter_query/active_record_extension.rb

@@ -36,7 +36,8 @@ class Card
       end
 
       def sort_by_bookmarkers type, rel
-        [Card::Bookmark.add_sort_join(rel, "#{table.name}.#{type}_id"), "cts.value"]
+        [Card::Bookmark.add_sort_join(rel, "#{table.name}.#{type}_id"),
+         "bookmarkers"]
       end
     end
   end

data/lib/card/lookup_filter_query/filtering.rb

@@ -63,9 +63,22 @@ class Card
         @restrict_to_ids[col] = existing ? (existing & ids) : ids
       end
 
-      def restrict_by_cql col, cql
-        cql.reverse_merge! return: :id, limit: 0
-        @conditions << "#{filter_table col}.#{col} IN (#{Card::Query.new(cql).sql})"
+      def restrict_by_cql suffix, col, cql
+        q = Card::Query.new cql.merge(table_suffix: suffix)
+        on = "#{filter_table col}.#{col} = #{q.table_alias}.#{cql[:return] || :id}"
+        @joins << "JOIN cards #{q.table_alias} ON #{on}"
+        @joins << q.sql_statement.joins
+        @conditions << q.sql_statement.where(false)
+
+        # cql.reverse_merge! return: :id, limit: 0
+        # @conditions << "#{filter_table col}.#{col} IN (#{Card::Query.new(cql).sql})"
+
+        # original strat: list of ids. slightly slower than IN. uglier SQL
+        # restrict_to_ids col, Card.search(cql)
+
+        # exists strat: got crazy slow
+        # new_cond = "#{filter_table col}.#{col} = c0.#{cql[:return]}"
+        # @conditions << "EXISTS (#{Card::Query.new(cql).sql} AND #{new_cond})"
       end
 
       def filter field, value, operator=nil

data/lib/card/lookup_filter_query.rb

@@ -54,7 +54,8 @@ class Card
 
     # @return [Array]
     def count
-      @empty_result ? 0 : main_query.count
+      # we need the id because some joins distort the count
+      @empty_result ? 0 : main_query.select("#{lookup_table}.id").distinct.count
     end
 
     def limit
@@ -75,7 +76,10 @@ class Card
     def sort_and_page
       relation = yield
       @sort_joins.uniq.each { |j| relation = relation.joins(j) }
-
+      if @sort_hash.present?
+        select = ["#{lookup_table}.*", sort_fields].flatten.compact
+        relation = relation.select(select).distinct
+      end
       relation.sort(@sort_hash).paging(@paging_args)
     end
 
@@ -86,9 +90,23 @@ class Card
       end
     end
 
+    def sort_fields
+      @sort_hash.keys.map do |key|
+        return nil if key == :random
+
+        if key.match?(/_bookmarkers$/)
+          "cts.value as bookmarkers"
+        else
+          Card::Query.safe_sql key
+        end
+      end
+    end
+
     def sort_by sort_by
       if (id_field = sort_by_cardname[sort_by])
         sort_by_join sort_by, lookup_table, id_field
+      elsif sort_by == :random
+        "rand()"
       else
         simple_sort_by sort_by
       end

data/set/abstract/lookup_search.rb

@@ -85,10 +85,16 @@ format do
   end
 
   def sort_by_from_param
-    safe_sql_param(:sort_by)&.to_sym
+    # :sort is DEPRECATED
+    safe_sql_param(:sort_by)&.to_sym || safe_sql_param(:sort)&.to_sym
   end
 
   def default_limit
     Auth.signed_in? ? 5000 : 500
   end
+
+  # not a CQL search
+  def filter_cql
+    {}
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-lookup
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Philipp Kühl
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-23 00:00:00.000000000 Z
+date: 2023-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -25,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: card-mod-filter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - info@decko.org
@@ -62,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: lookup