marty 2.6.6 → 2.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f77ca834ce7eeb1587f8d62efa516ce7262e36d1e89db6a378605463b402ba7
-  data.tar.gz: 78bf895b5cf2c433107cde56de4c95e10ff4201344464a3cfab85a0f8fc5538c
+  metadata.gz: 4617855bbed5e317b7983641b7f6565ec24a85a0690b8494cc17d1ac5b1372ed
+  data.tar.gz: 3155a823f0c5d0add5c361256c75f8c7c3851a9cf4fc257c9490bf76cedd9a01
 SHA512:
-  metadata.gz: a09feaaeed242cc80a6b53c49d3a520f8e0fb0891b0afdac1b3f4787c7280c67e9d821361edcc5b3a68127caebb32f7b44e45f05ab424d0a8fb8ba12543b0d36
-  data.tar.gz: 93c296049983ba212d6655a376541f0123d750ed4a3c3e45983c5488bc038732818e154a931c075a795c356f3af4d80ca578cdb153ffa59a995fd29158c5e3bf
+  metadata.gz: d95e2defaa45dcc3a3fce8fd087654ea205591b7eaca786bfd9536f523f0de392e2917c410aa404accb038f17a1f8663dae06cf3d9ef4175f4eca914b3a33432
+  data.tar.gz: a4a8300480ea3cc8bd69c2cad1a2f162c9edc0cbfdd812f2acd98c686507d93d6083a682211f6085371c464c360d521dfe7adcb5c03fe32ab845dd83d8bf7ba2

data/app/models/marty/data_grid.rb

@@ -165,8 +165,8 @@ class Marty::DataGrid < Marty::Base
 
   PLV_DT_FMT = '%Y-%m-%d %H:%M:%S.%N6'
 
-  def self.plv_lookup_grid_distinct(h_passed, dgh, ret_grid_data = false,
-                                    distinct = true)
+  def self.plpg_lookup_grid_distinct(h_passed, dgh, ret_grid_data = false,
+                                     distinct = true)
     cd = dgh['created_dt']
     @@dtcache ||= {}
     @@dtcache[cd] ||= cd.strftime(PLV_DT_FMT)
@@ -199,7 +199,7 @@ class Marty::DataGrid < Marty::Base
       parms, sqls, ress, dg = res['error_extra'].values_at(
         'params', 'sql', 'results', 'dg')
 
-      raise "DG #{name}: Error in PLV8 call: #{msg}\n"\
+      raise "DG #{name}: Error in PLPG call: #{msg}\n"\
             "params: #{parms}\n"\
             "sqls: #{sqls}\n"\
             "results: #{ress}\n"\
@@ -251,7 +251,7 @@ class Marty::DataGrid < Marty::Base
     #   "name"     => <grid name>
     #   "data"     => <grid's data array>
     #   "metadata" => <grid's metadata (array of hashes)>
-    vhash = plv_lookup_grid_distinct(h, dgh, return_grid_data, distinct)
+    vhash = plpg_lookup_grid_distinct(h, dgh, return_grid_data, distinct)
 
     return vhash if vhash['result'].nil? || !dgh['data_type']
 

data/db/migrate/504_remove_plv8_extension.rb

@@ -0,0 +1,13 @@
+class RemovePlv8Extension < ActiveRecord::Migration[5.1]
+  def up
+    connection.execute <<-SQL
+    DROP EXTENSION IF EXISTS plv8;
+    SQL
+  end
+
+  def down
+    connection.execute <<-SQL
+    CREATE EXTENSION IF NOT EXISTS plv8;
+    SQL
+  end
+end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = '2.6.6'
+  VERSION = '2.6.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.6.6
+  version: 2.6.7
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-03 00:00:00.000000000 Z
+date: 2019-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -343,9 +343,6 @@ files:
 - config/database.yml.travis
 - config/locales/en.yml
 - config/routes.rb
-- db/js/errinfo_v1.js
-- db/js/lookup_grid_distinct_v1.js
-- db/js/query_grid_dir_v1.js
 - db/migrate/001_create_marty_scripts.rb
 - db/migrate/003_create_marty_users.rb
 - db/migrate/004_create_marty_roles.rb
@@ -381,13 +378,13 @@ files:
 - db/migrate/302_add_api_configs_validate_result.rb
 - db/migrate/303_create_marty_logs.rb
 - db/migrate/304_drop_marty_api_logs.rb
-- db/migrate/400_create_dg_plv8_v1_fns.rb
 - 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/migrate/502_add_promise_type_enum.rb
 - db/migrate/503_add_promise_type_to_promises.rb
+- db/migrate/504_remove_plv8_extension.rb
 - db/seeds.rb
 - db/sql/lookup_grid_distinct_v1.sql
 - db/sql/query_grid_dir_v1.sql

data/db/js/errinfo_v1.js

@@ -1,16 +0,0 @@
-// PARAM: err JSONB
-// RETURN: JSONB
-var locre = /at.*[ (]([a-z][a-z0-9_]*[:][0-9]+)[:][0-9]+/i;
-var stack = err.stack;
-var res = '';
-if (stack) {
-    var lines = stack.split('\\n');
-    for (i=0, len=lines.length; i<len; ++i) {
-        m = locre.exec(lines[i]);
-        if (m) {
-            res += m[1];
-        }
-    }
-    return { "error": res + " " + err.message };
-}
-else return { "error": err };

data/db/js/lookup_grid_distinct_v1.js

@@ -1,64 +0,0 @@
-// PARAM: h JSONB
-// PARAM: row_info JSONB
-// PARAM: return_grid_data boolean default false
-// PARAM: dis boolean default false
-// RETURN: JSONB
-var sqls = []
-var ress = []
-try {
-    var query_dir = plv8.find_function('query_grid_dir');
-    var errinfo = plv8.find_function('errinfo');
-    var ih = {};
-    var sql = 'SELECT metadata, lenient, name, group_id, data FROM marty_data_grids WHERE id = $1'
-    var dg = plv8.execute(sql, [row_info['id']])[0];
-    var res;
-    ['h','v'].forEach(function(dir) {
-        var infos = dg["metadata"].filter(function(md) { return md["dir"] == dir; });
-        if (infos.length == 0)
-        {
-            ih[dir] = [0]
-            return
-        }
-        a = query_dir(h, infos, row_info);
-        sqls.push(a);
-        ih[dir] = []
-        if (a) {
-            res = plv8.execute(a[0], a[1]);
-            ress.push(res);
-            for (var j = 0; j < res.length; j++)
-            {
-                ih[dir].push(res[j]["index"])
-            }
-        }
-        if (dis && ih[dir].length > 1)  {
-            throw Error("matches > 1");
-        }
-    });
-    if ((ih["v"].length == 0 || ih["h"].length == 0) &&
-        !dg['lenient'] && !return_grid_data) {
-        throw Error("Data Grid lookup failed");
-    }
-    
-    vi = ih["v"].length > 0 ? Math.min.apply(9999, ih["v"]) : null
-    hi = ih["h"].length > 0 ? Math.min.apply(9999, ih["h"]) : null
-    
-    var result = null;
-    if (vi!==null && hi!==null) {
-        result = dg["data"][vi][hi];
-    }
-    return { "result" : result,
-             "name"   : dg["name"],
-             "data"   : return_grid_data ? dg["data"] : null,
-             "metadata" : return_grid_data ? dg["metadata"] : null
-           };
-} catch (err) {
-    ei = errinfo(err);
-
-    ei["error_extra"] = {}
-    ei["error_extra"]["sql"] = sqls;
-    ei["error_extra"]["results"] = ress;
-    ei["error_extra"]["params"] = h;
-    ei["error_extra"]["dg"] = dg;
-
-    return ei;
-}

data/db/js/query_grid_dir_v1.js

@@ -1,61 +0,0 @@
-// PARAM: h JSONB
-// PARAM: infos JSONB[]
-// PARAM: row_info JSONB
-// RETURN: JSONB
-var getfilter = function(type, idx) {
-    switch(type) {
-    case "boolean":
-        return "key = $" + idx + " OR ";
-    case "numrange":
-        return "key @> $" + idx + "::numeric OR ";
-    case "int4range":
-        return "key @> $" + idx + "::integer OR ";
-    case "integer":
-        return "key @> ARRAY[$" + idx + "::integer] OR ";
-    default:
-        return "key @> ARRAY[$" + idx + "::text] OR ";
-    }
-}
-
-var temp = [];
-var args = [];
-
-var sql;
-for (var sqlidx=1, i = 0; i < infos.length; i++) {
-    var type = infos[i]["type"];
-    var attr = infos[i]["attr"];
-    var v = h[attr];
-    if (!h.hasOwnProperty(attr)) {
-        //throw Error("missing attr " + attr)
-        continue;
-    }
-    switch (type) {
-    case 'boolean':
-    case "numrange":
-    case "int4range":
-    case "integer":
-        tab = "marty_grid_index_" + type + "s";
-        break;
-    default:
-        tab = 'marty_grid_index_strings';
-    };
-
-    sql = "SELECT DISTINCT index from " + tab +
-        " WHERE data_grid_id = $" + sqlidx++ +
-        " AND created_dt = $"    + sqlidx++ +
-        " AND attr = $"          + sqlidx++ + ' ';
-
-    args.push(row_info["group_id"]);
-    args.push(row_info["created_dt"]);
-    args.push(attr);
-
-    if (v!==null) {
-        filt = getfilter(type, sqlidx++);
-        args.push(v);
-    } else filt = ''
-    sql += ' AND (' + filt + "key is NULL) ";
-
-    temp.push(sql);
-}
-if (temp ==[]) return null;
-return [temp.join(" INTERSECT "), args];

data/db/migrate/400_create_dg_plv8_v1_fns.rb

@@ -1,12 +0,0 @@
-class CreateDgPlv8V1Fns < ActiveRecord::Migration[4.2]
-  def change
-    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