db: Re-add in-between modifications to migrations

statisticsnorway · Nov 14, 2024 · c3f87d7 · c3f87d7
1 parent 1e4dda3
commit c3f87d7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/migrations/0019_create_view_time_context.up.sql b/migrations/0019_create_view_time_context.up.sql
@@ -11,9 +11,9 @@ CREATE VIEW public.time_context
   , name_when_query
   , name_when_input
   , scope
-  , valid_on
   , valid_from
   , valid_to
+  , valid_on
   , code         -- Exposing the code for ordering
   , path         -- Exposing the path for ordering
   ) AS
@@ -23,9 +23,9 @@ WITH combined_data AS (
   ,      name_when_query                       AS name_when_query
   ,      name_when_input                       AS name_when_input
   ,      scope                                 AS scope
-  ,      valid_on                              AS valid_on
   ,      valid_from                            AS valid_from
   ,      valid_to                              AS valid_to
+  ,      valid_on                              AS valid_on
   ,      code                                  AS code  -- Specific order column for relative_period
   ,      NULL::public.LTREE                    AS path  -- Null for path as not applicable here
   FROM public.relative_period_with_time
@@ -51,4 +51,4 @@ WITH combined_data AS (
 )
 SELECT *
 FROM combined_data
-ORDER BY type, code, path;
+ORDER BY type, code, path;
diff --git a/migrations/0089_create_function_stat_for_unit_hierarchy.up.sql b/migrations/0089_create_function_stat_for_unit_hierarchy.up.sql
@@ -7,14 +7,7 @@ CREATE OR REPLACE FUNCTION public.stat_for_unit_hierarchy(
     WITH ordered_data AS (
     SELECT
         to_jsonb(sfu.*)
-        - 'value_int' - 'value_float' - 'value_string' - 'value_bool'
         || jsonb_build_object('stat_definition', to_jsonb(sd.*))
-        || CASE sd.type
-            WHEN 'int' THEN jsonb_build_object(sd.code, sfu.value_int)
-            WHEN 'float' THEN jsonb_build_object(sd.code, sfu.value_float)
-            WHEN 'string' THEN jsonb_build_object(sd.code, sfu.value_string)
-            WHEN 'bool' THEN jsonb_build_object(sd.code, sfu.value_bool)
-           END
         || (SELECT public.data_source_hierarchy(sfu.data_source_id))
         AS data
     FROM public.stat_for_unit AS sfu
@@ -32,4 +25,4 @@ SELECT CASE
     ELSE jsonb_build_object('stat_for_unit',data)
     END
   FROM data_list;
-$$;
+$$;