card-mod-lookup 0.2 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d77f0f0886a1501eb9348fe19e42575ddfac1b74a0a8083d133919cc9c74807b
-  data.tar.gz: 5814cbfda2b15d6c2b4903474940908539121449d83b79528ce048c04bedd688
+  metadata.gz: a98f8a016a2cab0a120e24080a6a9412c78df74364ffc335eeebcaed237d381e
+  data.tar.gz: ea21cc3f70eae3eabb38fcacd5bd69e6780c7fd9b365230536cb97c7ae211155
 SHA512:
-  metadata.gz: bcabc55ee2467ea1bde04d59a735d4d5d86cb240186232ccde7c7ff4a774d6d1f126fb2c3a834211b38e459029f2481ce0745ead932f5b168c32d47e9ac458e5
-  data.tar.gz: 9e11d30ff675d7e87d2976488cbf45808cf436682210707366f0bf8b25f9884b4d835c9c873be32fbac0dac5a5bd0ac778a5143938e109438d15a59becb7605e
+  metadata.gz: 3ea4e3b72a7ff53aedb4045386d9d901c7b9b594f6faa44d534ef7add330c693a1e011ca942b3efa80997d903f5ab03a258d2461c569e61328bee40debff2da5
+  data.tar.gz: d10d164d42714b2db57d77101d69af7c74244402ec597018efc59ee06599edfd7b4cd2767fc11ebd1609590d6cf2bcd7bd9fb512d80ea82886502f8ccf6ef1a9

data/README.md

@@ -18,10 +18,10 @@ 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 
+and metric designers that Wikirate supports, you can imagine the queries 
 becoming quite complex if we have to re-join the cards table to itself every
 time we want to consider a different variable.
 

data/lib/card/{lookup_filter_query → lookup_query}/active_record_extension.rb

@@ -1,5 +1,5 @@
 class Card
-  class LookupFilterQuery
+  class LookupQuery
     # support methods for sort and page
     module ActiveRecordExtension
       # @params hash [Hash] key1: dir1, key2: dir2
@@ -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 → lookup_query}/filtering.rb

@@ -1,6 +1,6 @@
 class Card
-  class LookupFilterQuery
-    # shared filtering methods for FilterQuery classes built on lookup tables
+  class LookupQuery
+    # shared filtering methods for query classes built on lookup tables
     module Filtering
       def process_filters
         normalize_filter_args
@@ -17,7 +17,7 @@ class Card
         if (method = filter_method key)
           send method, key, value
         else
-          try "#{key}_query", value
+          try "filter_by_#{key}", value
         end
       end
 
@@ -40,10 +40,13 @@ class Card
         filter card_id_map[key], card_id
       end
 
-      def not_ids_query value
-        add_condition "#{lookup_class.card_column} not in (?)", value.split(",")
+      def filter_by_not_ids value
+        add_condition "#{lookup_class.card_column} not in (?)",
+                      not_ids_value(value)
       end
 
+      private
+
       def to_card_id value
         if value.is_a? Array
           value.map(&:card_id)
@@ -63,9 +66,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
@@ -93,6 +109,11 @@ class Card
       def db_value value
         value.is_a?(Array) ? "(?)" : "?"
       end
+
+      def not_ids_value value
+        return value if value.is_a? Array
+        value.to_s.split ","
+      end
     end
   end
 end

data/lib/card/{lookup_filter_query.rb → lookup_query.rb}

@@ -1,6 +1,6 @@
 class Card
-  # base class for FilterQuery classes built on lookup tables
-  class LookupFilterQuery
+  # base class for query classes built on lookup tables
+  class LookupQuery
     include Filtering
 
     attr_accessor :filter_args, :sort_args, :paging_args
@@ -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

@@ -12,12 +12,12 @@ def run_query_returning query, return_type
   end
 end
 
-def filter_class
-  raise Error::ServerError, "filter_class required!"
+def query_class
+  raise Error::ServerError, "query_class required!"
 end
 
 def query paging={}
-  filter_class.new query_hash, {}, paging
+  query_class.new query_hash, {}, paging
 end
 
 def query_hash
@@ -29,7 +29,7 @@ def count
 end
 
 format do
-  delegate :filter_class, to: :card
+  delegate :query_class, to: :card
 
   def search_with_params
     @search_with_params ||= card.search query: query
@@ -40,11 +40,11 @@ format do
   end
 
   def query
-    filter_class.new query_hash, sort_hash, paging_params
+    query_class.new query_hash, sort_hash, paging_params
   end
 
   def count_query
-    filter_class.new query_hash
+    query_class.new query_hash
   end
 
   def query_hash
@@ -85,10 +85,12 @@ 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
+  # 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.4'
 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-10-17 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
@@ -33,9 +47,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- lib/card/lookup_filter_query.rb
-- lib/card/lookup_filter_query/active_record_extension.rb
-- lib/card/lookup_filter_query/filtering.rb
+- lib/card/lookup_query.rb
+- lib/card/lookup_query/active_record_extension.rb
+- lib/card/lookup_query/filtering.rb
 - lib/lookup_table.rb
 - lib/lookup_table/class_methods.rb
 - set/abstract/lookup.rb
@@ -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.4.10
 signing_key:
 specification_version: 4
 summary: lookup