marty 2.5.9 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec3679621406e9c0a3d3a343f38bc89cd467a9e39c353b7a2a4911877482194d
-  data.tar.gz: fde0d9513d1f964b7a9a7022d964971a6aa486785027e7e96ddb1da11c815807
+  metadata.gz: 5793ffa9b322a289ab5cf900d733f296127f4840586baf8a95afe8793e9752cd
+  data.tar.gz: 6e1e78d9cbb3472ac5ed1f99a5592cc1718ab706eb1d878265a5682408d9b130
 SHA512:
-  metadata.gz: d520244f0c0e98a1ae3c779660f049663514f2062eabd837e3167bb6098754476abef431e5f9c22fdd460567c56791a7d08095b852af0c807a628c6998148cfc
-  data.tar.gz: f6d70ee23ab6b1a571a5bb913ffc10e453169731b4e5736a8ac22ff830262b65d19e9cf81361f8e54f54fd774d64b6149f6d572c524249af8c80a9315537da95
+  metadata.gz: 3e47115835ddf8cff33b27b6582f73cd77f5e802099c776981aa47311bae1f11047bbba797fe5def8c8188c5ae10de6e213dff1fe37dd51c974e1d326a2c22dc
+  data.tar.gz: 731b6b6799978cbd72416461ca55c1243eac694b324b8df497a5193d2416569b901c610d862e84a19d58810031c38d4b22d2206280bf9ceaa2ad917b7365ab65

data/db/migrate/501_create_dg_plpgsql_v1_fns.rb

@@ -0,0 +1,22 @@
+class CreateDgPlpgsqlV1Fns < ActiveRecord::Migration[4.2]
+  def up
+    marty_path = Gem.loaded_specs["marty"].full_gem_path
+    Dir.glob("#{marty_path}/db/sql/*_v1.sql") do |f|
+      connection.execute(File.read(f))
+    end
+
+    connection.execute('DROP FUNCTION IF EXISTS errinfo(err jsonb);')
+  end
+
+  def down
+    connection.execute <<-SQL
+      -- required to utilize plv8 extension
+      CREATE EXTENSION IF NOT EXISTS plv8;
+    SQL
+
+    marty_path = Gem.loaded_specs["marty"].full_gem_path
+    Dir.glob("#{marty_path}/db/js/*_v1.js") do |f|
+      connection.execute(Marty::Migrations.get_plv8_migration(f))
+    end
+  end
+end

data/db/sql/lookup_grid_distinct_v1.sql

@@ -0,0 +1,175 @@
+CREATE OR REPLACE FUNCTION public.lookup_grid_distinct(h jsonb, row_info jsonb, return_grid_data boolean DEFAULT false, dis boolean DEFAULT false) RETURNS jsonb
+  LANGUAGE plpgsql
+  AS $_$
+
+-- Finds a data grid metadata, calculates the SQL query for it's vertical and horizontal attributes
+-- Fetches vertical and horizontal indexes and uses them to fetch value from data grid data
+
+DECLARE
+  directions TEXT[] = ARRAY['h', 'v'];
+  direction TEXT;
+
+  data_grid_info JSONB;
+  data_grid_metadata JSONB;
+  data_grid_lenient BOOLEAN;
+  data_grid_data JSONB;
+  data_grid_name TEXT;
+  data_grid_group_id TEXT;
+  data_grid_metadata_h JSONB[];
+  data_grid_metadata_v JSONB[];
+  data_grid_metadata_current JSONB[];
+
+  horizontal_indexes JSONB = '[]'::JSONB;
+  horizontal_index INTEGER;
+
+  vertical_indexes JSONB = '[]'::JSONB;
+  vertical_index INTEGER;
+
+  query_dir_result JSONB;
+  query_index_result JSONB = '[]'::JSONB;
+  metadata_record JSONB;
+
+  all_results JSONB[];
+  sql_scripts_arr text[];
+
+  result JSONB;
+  return_json JSONB;
+  
+  error_extra JSONB;
+
+  target RECORD;
+BEGIN
+  EXECUTE 'SELECT metadata, lenient, name, data, group_id FROM marty_data_grids WHERE id = $1::INTEGER'
+    INTO data_grid_metadata, data_grid_lenient, data_grid_name, data_grid_data, data_grid_group_id
+    USING row_info ->> 'id';
+
+
+  data_grid_metadata := COALESCE(data_grid_metadata, '[]'::JSONB);
+
+  FOR i IN 0 .. (jsonb_array_length(data_grid_metadata) - 1) LOOP
+    metadata_record := data_grid_metadata -> i;
+    IF (metadata_record ->> 'dir') = 'h' THEN
+      data_grid_metadata_h := data_grid_metadata_h || metadata_record;
+    ELSIF (metadata_record ->> 'dir') = 'v' THEN
+      data_grid_metadata_v := data_grid_metadata_v || metadata_record;
+    END IF;
+  END LOOP;
+
+  FOREACH direction IN ARRAY directions LOOP 
+
+    IF direction = 'h' THEN
+      data_grid_metadata_current := data_grid_metadata_h;
+    ELSE
+      data_grid_metadata_current := data_grid_metadata_v;
+    END IF;
+
+
+    IF COALESCE(array_length(data_grid_metadata_current, 1), 0) = 0 THEN
+			 IF direction = 'h' THEN
+				 horizontal_indexes := '[0]'::JSONB;
+			 ELSE
+				 vertical_indexes := '[0]'::JSONB;
+			 END IF;
+      CONTINUE;
+    END IF;
+
+    -- fetch the resulting SQL query and it's arguments for current direction
+    EXECUTE 'SELECT public.query_grid_dir($1, $2, $3)'
+      INTO query_dir_result
+      USING h, data_grid_metadata_current, row_info;
+
+     IF query_dir_result ->> 0 IS NULL THEN
+       CONTINUE;
+     END IF;
+
+     sql_scripts_arr := sql_scripts_arr || (query_dir_result ->> 0);
+
+     query_index_result := '[]'::JSONB;
+
+     -- execute the SQL query that has been received before and 
+     -- add it's (possibly multiple) results to query_index_result variable
+     FOR target IN EXECUTE query_dir_result ->> 0 USING query_dir_result -> 1 LOOP
+       query_index_result := query_index_result || to_jsonb(target.index);
+     END LOOP;
+
+     all_results := all_results || query_index_result;
+     query_index_result := '[]'::JSONB || query_index_result; -- Use empty JSONB array in case of NULL results
+
+     IF direction = 'h' THEN
+       horizontal_indexes := query_index_result;
+     ELSE
+       vertical_indexes := query_index_result;
+     END IF;
+
+
+     IF dis AND jsonb_array_length(query_index_result) > 1 THEN 
+       RAISE EXCEPTION 'matches > 1';
+     END IF;
+
+    END LOOP;
+
+    vertical_indexes := COALESCE(vertical_indexes, '[]'::JSONB);
+    horizontal_indexes := COALESCE(horizontal_indexes, '[]'::JSONB);
+
+    IF ((jsonb_array_length(vertical_indexes)) = 0 
+       OR (jsonb_array_length(horizontal_indexes)) = 0)
+       AND NOT data_grid_lenient
+       AND NOT return_grid_data THEN
+
+     RAISE EXCEPTION 'Data Grid lookup failed';
+    END IF;
+
+    -- Get the smalles vertical index
+    IF jsonb_array_length(vertical_indexes) > 0 THEN
+      FOR i IN 0 .. (jsonb_array_length(vertical_indexes) - 1) LOOP
+        vertical_index := LEAST(vertical_index, (vertical_indexes ->> i)::INTEGER);
+      END LOOP;
+    END IF;
+
+    -- Get the smalles horizontal index
+    IF jsonb_array_length(horizontal_indexes) > 0 THEN
+      FOR i IN 0 .. (jsonb_array_length(vertical_indexes) - 1) LOOP
+        horizontal_index := LEAST(horizontal_index, (horizontal_indexes ->> i)::INTEGER);
+      END LOOP;
+    END IF;
+
+    IF vertical_index IS NOT NULL and horizontal_index IS NOT NULL THEN
+      result := data_grid_data -> vertical_index -> horizontal_index;
+    END IF;
+
+    IF NOT return_grid_data THEN 
+      data_grid_data := NULL;
+      data_grid_metadata := NULL;
+    END IF;
+
+    return_json := jsonb_build_object(
+      'result', result,
+      'name', data_grid_name,
+      'data', data_grid_data,
+      'metadata', data_grid_metadata
+    );
+
+    RETURN return_json;
+
+  EXCEPTION WHEN OTHERS THEN
+    error_extra := jsonb_build_object(
+      'error', SQLERRM,
+      'sql', sql_scripts_arr,
+      'results', all_results,
+      'params', h,
+      'dg', jsonb_build_object(
+        'name', data_grid_name,
+        'data', data_grid_data,
+        'metadata', data_grid_metadata,
+        'group_id', data_grid_group_id,
+        'lenient', data_grid_lenient
+      )
+    );
+
+    RETURN jsonb_build_object(
+      'error', SQLERRM,
+      'error_extra', error_extra
+    );
+END
+
+$_$;

data/db/sql/query_grid_dir_v1.sql

@@ -0,0 +1,100 @@
+CREATE OR REPLACE FUNCTION public.query_grid_dir(h jsonb, infos jsonb[], row_info jsonb) returns jsonb 
+  LANGUAGE plpgsql 
+  AS $$
+
+-- Iterates through infos and and builds a one big SQL query 
+-- with one SELECT per info and INTERSECT between those SELECTs
+-- in order to find the cells that multiple vertical or horizontal headers are pointing to.
+-- Return JSONB array with resulting SQL query and JSONB array of it's arguments.
+-- Each of the argument is references via it's index in JSONB array. Example: ($1 ->> 0)
+
+DECLARE
+  args text[];
+  sqlidx integer = 0;
+  i integer;
+
+  attr_type text;
+  attr_name text;
+  attr_value text;
+  h_key_exists boolean;
+
+  table_name text;
+  sql_script text;
+  sql_scripts_arr text[];
+  sql_scripts_arr_intersect text;
+  sql_filter text;
+
+BEGIN
+  FOR i IN 1 .. COALESCE(array_upper(infos, 1), 0)
+    LOOP
+      attr_type := infos[i] ->> 'type';
+      attr_name := infos[i] ->> 'attr';
+      attr_value := h ->> attr_name;
+      h_key_exists := h ? attr_name;
+
+      IF NOT h_key_exists THEN
+        CONTINUE;
+      END IF;
+
+      CASE attr_type 
+      WHEN 'boolean' THEN
+        table_name := 'marty_grid_index_' || attr_type || 's';
+      WHEN 'numrange' THEN
+        table_name := 'marty_grid_index_' || attr_type || 's';
+      WHEN 'int4range' THEN
+        table_name := 'marty_grid_index_' || attr_type || 's';
+      WHEN 'integer' THEN
+        table_name := 'marty_grid_index_' || attr_type || 's';
+      ELSE 
+        table_name := 'marty_grid_index_strings';
+      END CASE;
+
+      sql_script = 'SELECT DISTINCT index from ' || table_name ||
+        -- Convertion to FLOAT is neeed to make numbers like 2005.0 work
+        ' WHERE data_grid_id = ($1 ->> ' || sqlidx || ')::FLOAT::INTEGER' ||
+        ' AND created_dt = ($1 ->> ' || (sqlidx + 1) || ')::TIMESTAMP' ||
+        ' AND attr = $1 ->> ' || (sqlidx + 2) || ' ';
+
+      sqlidx := sqlidx + 3;
+
+      args := args || (row_info ->> 'group_id');
+      args := args || (row_info ->> 'created_dt');
+      args := args || attr_name;
+
+      IF attr_value IS NULL THEN
+        sql_filter := '';
+      ELSE
+        CASE attr_type
+           WHEN 'boolean' THEN 
+             sql_filter := 'key = ($1 ->> ' || sqlidx || ')::BOOLEAN OR ';
+           WHEN 'numrange' THEN 
+             sql_filter := 'key @> ($1 ->> ' || sqlidx || ')::NUMERIC OR ';
+           WHEN 'int4range' THEN 
+             -- Convertion to FLOAT is neeed to make numbers like 2005.0 work
+             sql_filter := 'key @> ($1 ->> ' || sqlidx || ')::FLOAT::INTEGER OR ';
+           WHEN 'integer' THEN
+             -- Convertion to FLOAT is neeed to make numbers like 2005.0 work
+             sql_filter := 'key @> ARRAY[($1 ->> ' || sqlidx || ')::FLOAT::INTEGER] OR ';
+           ELSE 
+             sql_filter := 'key @> ARRAY[($1 ->> ' || sqlidx || ')::TEXT] OR ';
+        END CASE;
+
+        sqlidx := sqlidx + 1;
+        args := args || attr_value;
+      END IF;
+
+      sql_script := sql_script || ' AND (' || sql_filter || 'key is NULL) ';
+
+      sql_scripts_arr := sql_scripts_arr || sql_script;
+    END LOOP;
+
+  IF array_length(sql_scripts_arr, 1) = 0 THEN
+    RETURN NULL;
+  END IF;
+
+  sql_scripts_arr_intersect := array_to_string(sql_scripts_arr, ' INTERSECT ');
+  
+  RETURN json_build_array(sql_scripts_arr_intersect, args);
+END;
+
+$$;

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = '2.5.9'
+  VERSION = '2.6.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.5.9
+  version: 2.6.0
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -379,7 +379,10 @@ files:
 - db/migrate/410_jsonb_promise_result.rb
 - db/migrate/411_create_vw_promises.rb
 - db/migrate/500_add_api_class_to_marty_api_config.rb
+- db/migrate/501_create_dg_plpgsql_v1_fns.rb
 - db/seeds.rb
+- db/sql/lookup_grid_distinct_v1.sql
+- db/sql/query_grid_dir_v1.sql
 - delorean/blame_report.dl
 - delorean/diagnostics.dl
 - delorean/marty_fields.dl