Merge branch 'DBTOOLS-1601-add-records-processing' into 'master'

DBTOOLS-1601 added records processing

See merge request codekeeper/pgcodekeeper-core!76

Author: AXEPOH

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+- Added analysis of functions returning the RECORD type.
+
 ### Changed
 
 ### Fixed

CHANGELOG.ru.md

@@ -9,6 +9,8 @@
 
 ### Добавлено
 
+- Добавлен анализ функций, возвращающих тип RECORD.
+
 ### Изменено
 
 ### Исправлено

src/main/antlr4/org/pgcodekeeper/core/parsers/antlr/pg/generated/SQLParser.g4

@@ -3853,8 +3853,12 @@ from_primary
         (AS from_function_column_def
         | AS? alias=identifier (LEFT_PAREN column_alias+=identifier (COMMA column_alias+=identifier)* RIGHT_PAREN | from_function_column_def)?
         )?
-    | LATERAL? ROWS FROM LEFT_PAREN function_call (AS from_function_column_def)? (COMMA function_call (AS from_function_column_def)?)* RIGHT_PAREN
-    (WITH ORDINALITY)? (AS? identifier (LEFT_PAREN identifier (COMMA identifier)* RIGHT_PAREN)?)?
+    | from_rows_with_alias
+    ;
+    
+from_rows_with_alias
+    : LATERAL? ROWS FROM LEFT_PAREN function_call (AS from_function_column_def)? (COMMA function_call (AS from_function_column_def)?)* RIGHT_PAREN
+          (WITH ORDINALITY)? (AS? alias=identifier (LEFT_PAREN column_alias+=identifier (COMMA column_alias+=identifier)* RIGHT_PAREN)?)?
     ;
 
 alias_clause

src/main/java/org/pgcodekeeper/core/parsers/antlr/pg/expr/Select.java

@@ -530,13 +530,11 @@ private void from(From_itemContext fromItem) {
             }
         } else if ((primary = fromItem.from_primary()) != null) {
             Alias_clauseContext alias = primary.alias_clause();
-            List<Function_callContext> functions = primary.function_call();
             Schema_qualified_nameContext table;
             Table_subqueryContext subquery;
 
-            if (!functions.isEmpty()) {
-                functions.forEach(e -> function(e, primary.alias));
-            } else if ((table = primary.schema_qualified_name()) != null) {
+            fromFunctionCommon(primary);
+            if ((table = primary.schema_qualified_name()) != null) {
                 addNameReference(table, alias);
                 if (primary.TABLESAMPLE() != null) {
                     ValueExpr vex = new ValueExpr(this);
@@ -571,20 +569,62 @@ private void from(From_itemContext fromItem) {
         }
     }
 
-    private void function(Function_callContext function, IdentifierContext alias) {
+    private void fromFunctionCommon(From_primaryContext from) {
         boolean oldLateral = lateralAllowed;
         try {
-            lateralAllowed = true;
+            if (from.function_call() != null) {
+                function(from.function_call(), from.alias, from.from_function_column_def());
+            } else if (from.from_rows_with_alias() != null) {
+                fromRowsFunction(from.from_rows_with_alias());
+            }
+        } finally {
+            lateralAllowed = oldLateral;
+        }
+    }
+
+    private void fromRowsFunction(From_rows_with_aliasContext fromRows) {
+        for (var function : fromRows.function_call()) {
             ValueExpr vexFunc = new ValueExpr(this);
             Pair<String, String> func = vexFunc.function(function);
             if (func.getFirst() != null) {
-                String funcAlias = alias == null ? func.getFirst() : alias.getText();
-                addReference(funcAlias, null);
-                complexNamespace.put(funcAlias,
-                        List.of(new Pair<>(funcAlias, func.getSecond())));
+                String funcName = func.getFirst();
+                addReference(funcName, null);
             }
-        } finally {
-            lateralAllowed = oldLateral;
+        }
+
+        List<Pair<String, String>> colPairs = new ArrayList<>();
+        fromRows.column_alias
+                .forEach(identifier -> colPairs.add(new ModPair<>(identifier.getText(), TypesSetManually.COLUMN)));
+
+        if (!fromRows.from_function_column_def().isEmpty()) {
+            // safe to take any since they all must have the same types
+            var cols = fromRows.from_function_column_def(0);
+            for (int i = 0; i < cols.column_alias.size() && i < colPairs.size(); i++) {
+                colPairs.set(i, new Pair<>(colPairs.get(i).getFirst(), cols.data_type().get(i).getText()));
+            }
+        }
+
+        var alias = fromRows.alias.getText();
+        addReference(alias, null);
+        complexNamespace.put(alias, colPairs);
+    }
+
+    private void function(Function_callContext function, IdentifierContext alias,
+                          From_function_column_defContext definition) {
+        ValueExpr vexFunc = new ValueExpr(this);
+        Pair<String, String> func = vexFunc.function(function);
+        if (func.getFirst() != null) {
+            String funcAlias = alias == null ? func.getFirst() : alias.getText();
+            addReference(funcAlias, null);
+            List<Pair<String, String>> colPairs = new ArrayList<>();
+            if (definition != null) {
+                for (int i = 0; i < definition.column_alias.size(); i++) {
+                    colPairs.add(new Pair<>(definition.column_alias.get(i).getText(), definition.data_type().get(i).getText()));
+                }
+            } else {
+                colPairs.add(new Pair<>(funcAlias, func.getSecond()));
+            }
+            complexNamespace.put(funcAlias, colPairs);
         }
     }
 }

src/main/java/org/pgcodekeeper/core/parsers/antlr/pg/rulectx/Vex.java

@@ -26,8 +26,7 @@
 
 /**
  * Merging wrapper for vex/vex_b.
- * Provides a unified interface for working with PostgreSQL value expressions
- * that can be either regular expressions (vex) or boolean expressions (vex_b).
+ * Provides a unified interface for working with PostgreSQL value expressions.
  *
  * @author levsha_aa
  */

src/test/resources/org/pgcodekeeper/core/it/parser/pg/check_types_cols_view_extended_diff.sql

@@ -89,4 +89,35 @@ Schema: public
      c2 - public.test_composite1
      c3 - public.test_composite
      c4 - public.complex
-     c5 - double precision
+     c5 - double precision
+
+  View: test_record_view1
+    RelationColumns : 
+     id - INT
+     desc - TEXT
+     data - NUMERIC
+     id_test - INT
+     description - TEXT
+     value - NUMERIC
+
+  View: test_record_view2
+    RelationColumns : 
+     id_test - INT
+     description_test - TEXT
+     value_test - NUMERIC
+     id - INT
+
+  View: test_record_view3
+    RelationColumns : 
+     id - INT
+     new_id - INT
+     new_description - TEXT
+     new_value - NUMERIC
+
+  View: test_record_view4
+    RelationColumns : 
+     id - INT
+     descr - TEXT
+     new_id - INT
+     new_description - TEXT
+     new_value - NUMERIC

src/test/resources/org/pgcodekeeper/core/it/parser/pg/check_types_cols_view_extended_new.sql

@@ -51,6 +51,30 @@ CREATE FUNCTION tester.f2(p double precision) RETURNS real
 CREATE FUNCTION tester.f2(p text) RETURNS integer
     LANGUAGE plpgsql
     AS $$begin return 'text'; end;$$;
+    
+CREATE FUNCTION public.get_simple_record() RETURNS RECORD 
+    LANGUAGE plpgsql
+    AS $$
+declare
+    result RECORD;
+begin
+    result.id := 1;
+    result.name := 'Test User';
+    result.score := 100.5;
+    return result;
+end;$$;
+
+CREATE FUNCTION public.get_another_record() RETURNS RECORD 
+    LANGUAGE plpgsql
+    AS $$
+declare
+    rec RECORD;
+begin
+    result.intt := 25;
+    result.str := 'str';
+    result.numm := 100.5;
+    return rec;
+end;$$;
 
 CREATE TABLE public.mytable (
     col1 integer,
@@ -241,4 +265,27 @@ CREATE VIEW public.testview AS
    (item).test.t as c3,
    (item).test.t.r as c4,
    (item).test.t.r.r AS c5
-   FROM public.on_hand;
+   FROM public.on_hand;
+   
+CREATE VIEW public.test_record_view1 AS
+ SELECT simple_data.id_test as id,
+   simple_data.description as desc,
+   simple_data.value as data,
+   *
+   FROM public.get_simple_record() AS simple_data(id_test INT, description TEXT, value NUMERIC);
+   
+CREATE VIEW public.test_record_view2 AS
+ SELECT *, get_simple_record.id_test as id
+   FROM public.get_simple_record() AS (id_test INT, description_test TEXT, value_test NUMERIC);
+
+CREATE VIEW public.test_record_view3 AS
+SELECT t.new_id as id, * FROM ROWS FROM (
+    public.get_simple_record() AS (id_test INT, description_test TEXT, value_test NUMERIC),
+    public.get_another_record() AS (id INT, description TEXT, value NUMERIC)
+) AS t(new_id, new_description, new_value);
+
+CREATE VIEW public.test_record_view4 AS
+SELECT t.new_id as id, t.new_description as descr, t.* FROM ROWS FROM (
+    public.get_simple_record() AS (id_test INT, description_test TEXT, value_test NUMERIC),
+    public.get_another_record() AS (id INT, description TEXT, value NUMERIC)
+) AS t(new_id, new_description, new_value);