From 19e2a21444756fa7e046b84481668728001e93d6 Mon Sep 17 00:00:00 2001
From: Krzysztof Kotlarek <kotlarek.krzysztof@gmail.com>
Date: Thu, 3 Sep 2020 16:34:29 +1000
Subject: [PATCH] FIX: improve queries migration to persist IDs

---
 ...0810053843_create_data_explorer_queries.rb | 47 ++++---------------
 1 file changed, 10 insertions(+), 37 deletions(-)

diff --git a/db/migrate/20200810053843_create_data_explorer_queries.rb b/db/migrate/20200810053843_create_data_explorer_queries.rb
index 6bd469e..4324851 100644
--- a/db/migrate/20200810053843_create_data_explorer_queries.rb
+++ b/db/migrate/20200810053843_create_data_explorer_queries.rb
@@ -24,41 +24,6 @@ class CreateDataExplorerQueries < ActiveRecord::Migration[6.0]
       INSERT INTO data_explorer_queries(id, name, description, sql, user_id, last_run_at, hidden, created_at, updated_at)
       SELECT
         (replace(key, 'q:',''))::integer,
-        value::json->>'name',
-        value::json->>'description',
-        value::json->>'sql',
-        CASE WHEN (value::json->'created_by')::text = 'null' THEN
-          null
-        WHEN (value::json->'created_by')::text = '""' THEN
-          null
-        WHEN (value::jsonb ? 'created_by') THEN
-          (value::json->>'created_by')::integer
-        ELSE
-          null
-        END,
-        CASE WHEN (value::json->'last_run_at')::text = 'null' THEN 
-          null
-        WHEN (value::json->'last_run_at')::text = '""' THEN
-          null
-        ELSE
-          (value::json->'last_run_at')::text::timestamptz
-        END,
-        CASE WHEN (value::json->'hidden')::text = 'null' THEN
-          false
-        WHEN (value::jsonb ? 'hidden') THEN
-          (value::json->'hidden')::text::boolean
-        ELSE
-          false
-        END,
-        :now,
-        :now
-      FROM plugin_store_rows
-      WHERE plugin_name = 'discourse-data-explorer' AND type_name = 'JSON' AND (replace(key, 'q:',''))::integer < 0
-    SQL
-
-    DB.exec <<~SQL, now: Time.zone.now
-      INSERT INTO data_explorer_queries(name, description, sql, user_id, last_run_at, hidden, created_at, updated_at)
-      SELECT
         value::json->>'name',
         value::json->>'description',
         value::json->>'sql',
@@ -88,7 +53,7 @@ class CreateDataExplorerQueries < ActiveRecord::Migration[6.0]
         :now,
         :now
       FROM plugin_store_rows
-      WHERE plugin_name = 'discourse-data-explorer' AND type_name = 'JSON' AND (replace(key, 'q:',''))::integer > 0
+      WHERE plugin_name = 'discourse-data-explorer' AND type_name = 'JSON'
     SQL
 
     DB.query("SELECT * FROM plugin_store_rows WHERE plugin_name = 'discourse-data-explorer' AND type_name = 'JSON'").each do |row|
@@ -100,11 +65,19 @@ class CreateDataExplorerQueries < ActiveRecord::Migration[6.0]
       json['group_ids'].each do |group_id|
         next if group_id.blank? || query_id.blank?
         DB.exec <<~SQL
-          INSERT INTO data_explorer_query_groups(query_id, group_id) 
+          INSERT INTO data_explorer_query_groups(query_id, group_id)
           VALUES(#{query_id}, #{group_id})
         SQL
       end
     end
+
+    DB.exec <<~SQL
+      SELECT
+        setval(
+          pg_get_serial_sequence('data_explorer_queries', 'id'),
+          (select max(id) from data_explorer_queries)
+        );
+    SQL
   end
 
   def down