#434

backend/app/services/counts_state_query.rb

@@ -201,17 +201,16 @@ class CountsStateQuery
   end
 
   def listing
-    path = quote("$.#{ JSON.generate(@language) }.name")
     catalog = <<~SQL
       , tag_counts AS (
         SELECT membership.kind, membership.tag_id, COUNT(*) AS post_count
         FROM pairs membership GROUP BY membership.kind, membership.tag_id
       ), catalog AS (
-        SELECT 'internal' AS kind, tag_id,
-          COALESCE(JSON_UNQUOTE(JSON_EXTRACT(names, #{ path })), name) AS name,
+        SELECT 'internal' AS kind, tag_id, name, names,
           deprecated_at FROM tag_at WHERE event_type <> 'discard'
         UNION ALL
-        SELECT tc.kind, tc.tag_id, external_version.name, NULL AS deprecated_at
+        SELECT tc.kind, tc.tag_id, external_version.name, JSON_OBJECT() AS names,
+          NULL AS deprecated_at
         FROM tag_counts tc
         LEFT JOIN tag_at internal_version
           ON tc.kind = 'internal' AND internal_version.tag_id = tc.tag_id
@@ -235,12 +234,13 @@ class CountsStateQuery
                       ['c.kind ASC', 'c.tag_id ASC'])
     rows = @connection.select_all(<<~SQL)
       #{ prefix }
-      SELECT c.kind, c.tag_id, c.name, c.deprecated_at,
+      SELECT c.kind, c.tag_id, c.name, c.names, c.deprecated_at,
         COALESCE(n.post_count, 0) AS post_count #{ source } #{ where }
       ORDER BY #{ order } LIMIT #{ @limit } OFFSET #{ (@page - 1) * @limit }
     SQL
     { count: total, group_count: total, state_rows: rows.map do |row|
         { kind: row['kind'], tag_id: row['tag_id'], name: row['name'],
+          names: row['names'].is_a?(String) ? JSON.parse(row['names']) : row['names'],
           deprecated: row['deprecated_at']&.iso8601,
           count: available?(@post_start, @at) ? row['post_count'].to_i : nil,
           at: @at.iso8601(6) }