zuora_connect 1.7.42 → 1.7.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9abaf525d1e36123a8e0cdad0f7b637851ae36e0
-  data.tar.gz: d1d46c60b201c79715a238aec1fd0c91f953b3a3
+  metadata.gz: fdca57b64a49a8871c3d819a95a2a1128f44afe6
+  data.tar.gz: a0d6c50a46bb77f8f004b5668b332552c90749c6
 SHA512:
-  metadata.gz: 46848f66a1c384e1185a18ffdfffea1bcd967bea19d5bdd4d1423dd948f94f0eb48d3ff39befbd9fed3e22d9193d497605aaa5dcf033e4a2c14ffe468cb46566
-  data.tar.gz: a6b35088ce8b0fcd6487ccc7b50e46cc1cfe90315ccfc7433e07c8c5829103fa1bd0625ddbec49432b0b35f70a0197627e3ae4d7b840ae8a10e0a7b60e13674e
+  metadata.gz: cbfb352159b9ba62f8a549b5b23fe3fdbb730e10e642e58e22b16d148c4f8df0d8142f3f69c688fc88410dd2be63e7fc7875aad869aab96abbf7f44141c72b3d
+  data.tar.gz: b5214f4079d92ae7f354a2a3b683b5d6f12d26c65c4dc9a64a953c915c898713f5a452fb537706c47a1c1cf21c7777d1c466eb0d071cc865944d3788bf7e0590

data/app/models/zuora_connect/app_instance_base.rb

@@ -797,9 +797,11 @@ module ZuoraConnect
     ### START Aggregate Grouping Helping Methods ####
       def self.refresh_aggregate_table(aggregate_name: 'all_tasks_processing', table_name: 'tasks', where_clause: "where status in ('Processing', 'Queued')", index_table: true)
         self.update_functions
-        #Broke function into two parts to ensure transaction size was small enough
-        ActiveRecord::Base.connection.execute('SELECT "shared_extensions".refresh_aggregate_table(\'%s\', \'%s\', %s, \'Table\');' % [aggregate_name, table_name, ActiveRecord::Base.connection.quote(where_clause)])
-        ActiveRecord::Base.connection.execute('SELECT "shared_extensions".refresh_aggregate_table(\'%s\', \'%s\', %s, \'Index\');' % [aggregate_name, table_name, ActiveRecord::Base.connection.quote(where_clause)]) if index_table
+        if index_table
+          ActiveRecord::Base.connection.execute('SELECT "shared_extensions".refresh_aggregate_table(\'%s\', \'%s\', %s, \'Index\');' % [aggregate_name, table_name, ActiveRecord::Base.connection.quote(where_clause)])
+        else 
+          ActiveRecord::Base.connection.execute('SELECT "shared_extensions".refresh_aggregate_table(\'%s\', \'%s\', %s, \'NO\');' % [aggregate_name, table_name, ActiveRecord::Base.connection.quote(where_clause)])
+        end
       end
 
       def self.update_functions

data/app/views/sql/refresh_aggregate_table.txt

@@ -10,75 +10,76 @@ DECLARE
   index_string varchar;
   index_id varchar;
 BEGIN
-  IF mode = 'Table' THEN
-    raise notice 'Starting aggregate of % to %', table_name, aggregate_table_name;
+  raise notice 'Starting aggregate of % to %', table_name, aggregate_table_name;
 
 
-    EXECUTE format('DROP TABLE IF EXISTS "public".%I', aggregate_table_name);
-    raise notice 'Filter %', filter;
+  EXECUTE format('DROP TABLE IF EXISTS "public".%I', aggregate_table_name);
+  raise notice 'Filter %', filter;
 
-    FOR schema IN EXECUTE
-      format(
-        'SELECT schema_name FROM information_schema.schemata WHERE schema_name ~ ''^[0-9]+$'''
-      )
-    LOOP
-      IF NOT created THEN
-        -- Create the aggregate table if we haven't already
-        EXECUTE format(
-          'CREATE TABLE "public".%I (LIKE %I.%I)',
-          aggregate_table_name,
-          schema.schema_name, table_name
-        );
-        -- Add a special `schema_name` column, which we'll populate with the name of the schema
-        -- each row originated from
-        EXECUTE format(
-          'ALTER TABLE "public".%I ADD COLUMN schema_name text', aggregate_table_name
-        );
-        created := true;
-      END IF;
-
-      -- Finally, we'll select everything from this schema's target table, plus the schema's name,
-      -- and insert them into our new aggregate table
+  FOR schema IN EXECUTE
+    format(
+      'SELECT schema_name FROM information_schema.schemata WHERE schema_name ~ ''^[0-9]+$'''
+    )
+  LOOP
+    IF NOT created THEN
+      -- Create the aggregate table if we haven't already
       EXECUTE format(
-        'SELECT string_agg(column_name, '','') from information_schema.columns where table_name = ''%s'' AND table_schema = ''%s''',  
-        table_name, schema.schema_name
-      ) into fields_order;
-      
-      raise notice 'Importing Schema %', schema.schema_name;
-
-      EXECUTE format(        
-        'INSERT INTO "public".%I (schema_name, %s) (SELECT ''%s'' AS schema_name, * FROM %I.%I  %s )',
+        'CREATE TABLE "public".%I (LIKE %I.%I)',
         aggregate_table_name,
-        fields_order,
-        schema.schema_name,
-        schema.schema_name, table_name, 
-        filter
+        schema.schema_name, table_name
+      );
+      -- Add a special `schema_name` column, which we'll populate with the name of the schema
+      -- each row originated from
+      EXECUTE format(
+        'ALTER TABLE "public".%I ADD COLUMN schema_name text', aggregate_table_name
       );
-    END LOOP;
 
-    EXECUTE
-      format('CREATE INDEX ON "public".%I (schema_name)', aggregate_table_name);
-    EXECUTE
-      format('CREATE INDEX ON "public".%I (id)', aggregate_table_name);
-  END IF;
-  IF mode = 'Index' THEN
-    FOR index_string, index_name, index_id IN
-       SELECT pg_get_indexdef(idx.oid)||';', idx.relname, idx.oid
-       from pg_index ind
-       join pg_class idx on idx.oid = ind.indexrelid
-       join pg_class tbl on tbl.oid = ind.indrelid
-       left join pg_namespace ns on ns.oid = tbl.relnamespace where idx.relname != concat(table_name, '_pkey') and tbl.relname = table_name and ns.nspname = 'public'
-    LOOP
-      BEGIN
-        EXECUTE
-          format('DROP INDEX IF EXISTS "public"."%s"', concat(aggregate_table_name, '_', index_id));
+      EXECUTE
+        format('CREATE INDEX ON "public".%I (schema_name)', aggregate_table_name);
+      EXECUTE
+        format('CREATE INDEX ON "public".%I (id)', aggregate_table_name);
+
+      -- Move indexes over if indexable
+      IF mode = 'Index' THEN
+        FOR index_string, index_name, index_id IN
+           SELECT pg_get_indexdef(idx.oid)||';', idx.relname, idx.oid
+           from pg_index ind
+           join pg_class idx on idx.oid = ind.indexrelid
+           join pg_class tbl on tbl.oid = ind.indrelid
+           left join pg_namespace ns on ns.oid = tbl.relnamespace where idx.relname != concat(table_name, '_pkey') and tbl.relname = table_name and ns.nspname = 'public'
+        LOOP
+          BEGIN
+            EXECUTE
+              format('DROP INDEX IF EXISTS "public"."%s"', concat(aggregate_table_name, '_', index_id));
+
+            EXECUTE
+              format(replace(replace(replace(index_string, index_name, concat(aggregate_table_name, '_', index_id)), concat(' ', table_name, ' '), concat( ' ', aggregate_table_name, ' ')), concat('public.', table_name), concat( 'public.', aggregate_table_name)));
+
+            RAISE NOTICE 'Creating Indexes %', replace(replace(replace(index_string, index_name, concat(aggregate_table_name, '_', index_id)), concat(' ', table_name, ' '), concat( ' ', aggregate_table_name, ' ')), concat('public.', table_name), concat( 'public.', aggregate_table_name)) ;
+          END;
+        END LOOP;
+      END IF;
+
+      created := true;
+    END IF;
 
-        EXECUTE
-          format(replace(replace(replace(index_string, index_name, concat(aggregate_table_name, '_', index_id)), concat(' ', table_name, ' '), concat( ' ', aggregate_table_name, ' ')), concat('public.', table_name), concat( 'public.', aggregate_table_name)));
+    -- Finally, we'll select everything from this schema's target table, plus the schema's name,
+    -- and insert them into our new aggregate table
+    EXECUTE format(
+      'SELECT string_agg(column_name, '','') from information_schema.columns where table_name = ''%s'' AND table_schema = ''%s''',  
+      table_name, schema.schema_name
+    ) into fields_order;
+    
+    raise notice 'Importing Schema %', schema.schema_name;
 
-        RAISE NOTICE 'Creating Indexes %', replace(replace(replace(index_string, index_name, concat(aggregate_table_name, '_', index_id)), concat(' ', table_name, ' '), concat( ' ', aggregate_table_name, ' ')), concat('public.', table_name), concat( 'public.', aggregate_table_name)) ;
-      END;
-    END LOOP;
-  END IF;
+    EXECUTE format(        
+      'INSERT INTO "public".%I (schema_name, %s) (SELECT ''%s'' AS schema_name, * FROM %I.%I  %s )',
+      aggregate_table_name,
+      fields_order,
+      schema.schema_name,
+      schema.schema_name, table_name, 
+      filter
+    );
+  END LOOP;
 END
 $$ LANGUAGE plpgsql;

data/lib/zuora_connect/controllers/helpers.rb

@@ -79,6 +79,7 @@ module ZuoraConnect
                 @appinstance = ZuoraConnect::AppInstance.find(app_instance_ids[0])
                 @appinstance.new_session(session: {})
                 @appinstance.cache_app_instance
+                session["appInstance"] = app_instance_ids[0]
               else
                 Rails.logger.fatal("Launch Error: Param Instance didnt match session data")
                 render "zuora_connect/static/invalid_launch_request"
@@ -101,6 +102,7 @@ module ZuoraConnect
               @appinstance = ZuoraConnect::AppInstance.find(params[:app_instance_id].to_i)
               @appinstance.new_session(session: {})
               @appinstance.cache_app_instance
+              session["appInstance"] = params[:app_instance_id].to_i
             else
               render "zuora_connect/static/invalid_launch_request"
               return

data/lib/zuora_connect/version.rb

@@ -1,3 +1,3 @@
 module ZuoraConnect
-  VERSION = "1.7.42"
+  VERSION = "1.7.43"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zuora_connect
 version: !ruby/object:Gem::Version
-  version: 1.7.42
+  version: 1.7.43
 platform: ruby
 authors:
 - Connect Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-28 00:00:00.000000000 Z
+date: 2018-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apartment