Bot automated sync from Dataforge Cloud using commit cb20f0fbe3e50b9dd17c1d370c951531db668637

Author: DF Bitbucket Bot

database/code/meta/u-utility/u_get_next_relation_path.sql

@@ -20,6 +20,7 @@ DECLARE
 	v_ret_relation_ids int[] := '{}';
 	v_reverse_flag boolean;
 	v_max_length int;
+	v_alt_cardinality_paths_exist boolean = false;
 BEGIN
 
 in_start_path := COALESCE(in_start_path,'{}'::int[]);
@@ -84,6 +85,7 @@ IF v_max_level IS NULL THEN
 		RETURN json_build_object('error',format('Remove aggregation or add OVER clause. Target source `%s`', meta.u_get_source_name(in_to_source_id) ));
 	END IF;
 ELSE
+	v_alt_cardinality_paths_exist = EXISTS(SELECT 1 FROM _paths WHERE cardinality != in_cardinality);
 	DELETE FROM _paths WHERE cardinality != in_cardinality;
 END IF;
 
@@ -120,7 +122,8 @@ FOR v_level IN 1 .. v_max_level LOOP
 		ELSE	
 			v_next_relation_id := null;
 		END IF;
-		RETURN json_build_object('path',v_ret_path,'complete', true, 'relation_ids',v_ret_relation_ids, 'next', v_next_relation_id);
+		RETURN json_build_object('path',v_ret_path,'complete', true, 'relation_ids',v_ret_relation_ids, 'next', v_next_relation_id,
+			'alt_cardinality_path_exist',v_alt_cardinality_paths_exist);
 	END IF;
 END LOOP;
 

database/code/meta/u-utility/u_get_source_name.sql

@@ -1,14 +1,29 @@
 
-CREATE OR REPLACE FUNCTION meta.u_get_source_name(in_source_id int)
+CREATE OR REPLACE FUNCTION meta.u_get_source_name(in_source_id int, templatize_flag boolean = false)
  RETURNS text
  LANGUAGE plpgsql
 AS $function$
 
+DECLARE
+	v_source_template_id int;
+	v_source_name text;
+
 BEGIN
-	
-RETURN COALESCE(
-	(SELECT s.source_name FROM meta.source s WHERE s.source_id = in_source_id),
-	format('Unknown source_id=%s', in_source_id));
+	SELECT s.source_name, s.source_template_id
+	INTO v_source_name, v_source_template_id 
+	FROM meta.source s WHERE s.source_id = in_source_id;
+
+	IF v_source_name IS NULL THEN
+		RETURN format('Unknown source_id=%s', in_source_id);
+	END IF;
+
+	IF NOT templatize_flag OR v_source_template_id IS NULL THEN
+		RETURN v_source_name;
+	END IF;
+
+	RETURN COALESCE(
+		(SELECT object_name FROM meta.object_template t WHERE t.object_template_id = v_source_template_id),
+		format('Unknown source_template_id=%s', v_source_template_id));
 
 END;