[ARVADOS] updated: 1.3.0-34-g96165e8fc

Git user git at public.curoverse.com
Thu Dec 13 15:55:30 EST 2018


Summary of changes:
 services/api/lib/record_filters.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

       via  96165e8fcea44632979ddf7db02c1b70cb95d0f4 (commit)
      from  cd7a746df5e9bf8a5770d06410b3fe1908282a7b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 96165e8fcea44632979ddf7db02c1b70cb95d0f4
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Thu Dec 13 17:53:33 2018 -0300

    13006: Fail when using is_a filter on uuid attr and prefix_uuid doesn't match.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/services/api/lib/record_filters.rb b/services/api/lib/record_filters.rb
index 9839413fc..831e357b4 100644
--- a/services/api/lib/record_filters.rb
+++ b/services/api/lib/record_filters.rb
@@ -197,9 +197,14 @@ module RecordFilters
             operand.each do |op|
               cl = ArvadosModel::kind_class op
               if cl
-                if attr == 'uuid' and model_class.uuid_prefix == cl.uuid_prefix
-                  cond << "1=1"
+                if attr == 'uuid'
+                  if model_class.uuid_prefix == cl.uuid_prefix
+                    cond << "1=1"
+                  else
+                    cond << "1=0"
+                  end
                 else
+                  # Use a substring query to support remote uuids
                   cond << "substring(#{ar_table_name}.#{attr}, 7, 5) = ?"
                   param_out << cl.uuid_prefix
                 end

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list