FIX: improve queries migration to persist IDs

db/migrate/20200810053843_create_data_explorer_queries.rb

@@ -53,42 +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.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',
-        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.query("SELECT * FROM plugin_store_rows WHERE plugin_name = 'discourse-data-explorer' AND type_name = 'JSON'").each do |row|
@@ -105,6 +70,14 @@ class CreateDataExplorerQueries < ActiveRecord::Migration[6.0]
         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