Fixes #19688 - Added Postgres Functions Ingestion (#20188)

ingestion/src/metadata/ingestion/source/database/postgres/metadata.py

@@ -60,6 +60,7 @@ from metadata.ingestion.source.database.postgres.models import PostgresStoredPro
 from metadata.ingestion.source.database.postgres.queries import (
     POSTGRES_GET_ALL_TABLE_PG_POLICY,
     POSTGRES_GET_DB_NAMES,
+    POSTGRES_GET_FUNCTIONS,
     POSTGRES_GET_STORED_PROCEDURES,
     POSTGRES_GET_TABLE_NAMES,
     POSTGRES_PARTITION_DETAILS,
@@ -273,10 +274,10 @@ class PostgresSource(CommonDbSourceService, MultiDBSource):
                 )
             )
 
-    def get_stored_procedures(self) -> Iterable[PostgresStoredProcedure]:
-        """List stored procedures"""
-        if self.source_config.includeStoredProcedures:
-            results = self.engine.execute(POSTGRES_GET_STORED_PROCEDURES).all()
+    def _get_stored_procedures_internal(
+        self, query: str
+    ) -> Iterable[PostgresStoredProcedure]:
+        results = self.engine.execute(query).all()
         for row in results:
             try:
                 stored_procedure = PostgresStoredProcedure.model_validate(
@@ -293,6 +294,14 @@ class PostgresSource(CommonDbSourceService, MultiDBSource):
                     )
                 )
 
+    def get_stored_procedures(self) -> Iterable[PostgresStoredProcedure]:
+        """List stored procedures"""
+        if self.source_config.includeStoredProcedures:
+            yield from self._get_stored_procedures_internal(
+                POSTGRES_GET_STORED_PROCEDURES
+            )
+            yield from self._get_stored_procedures_internal(POSTGRES_GET_FUNCTIONS)
+
     def yield_stored_procedure(
         self, stored_procedure
     ) -> Iterable[Either[CreateStoredProcedureRequest]]:
@@ -312,6 +321,7 @@ class PostgresSource(CommonDbSourceService, MultiDBSource):
                     database_name=self.context.get().database,
                     schema_name=self.context.get().database_schema,
                 ),
+                storedProcedureType=stored_procedure.procedure_type,
             )
             yield Either(right=stored_procedure_request)
             self.register_record_stored_proc_request(stored_procedure_request)

ingestion/src/metadata/ingestion/source/database/postgres/models.py

@@ -23,3 +23,4 @@ class PostgresStoredProcedure(BaseModel):
     schema: str = Field(alias="schema_name")
     definition: str
     language: Optional[str] = None
+    procedure_type: Optional[str] = Field(None, alias="procedure_type")

ingestion/src/metadata/ingestion/source/database/postgres/queries.py

@@ -217,8 +217,25 @@ POSTGRES_GET_STORED_PROCEDURES = """
         nspname AS schema_name,
         proargtypes AS argument_types,
         prorettype::regtype AS return_type,
-        prosrc AS definition
+        prosrc AS definition,
+        'StoredProcedure' as procedure_type
     FROM pg_proc
     JOIN pg_namespace ON pg_proc.pronamespace = pg_namespace.oid
     WHERE prokind = 'p';
 """
+
+POSTGRES_GET_FUNCTIONS = """
+SELECT
+    proname AS procedure_name,
+    nspname AS schema_name,
+    proargtypes AS argument_types,
+    prorettype :: regtype AS return_type,
+    prosrc AS definition,
+    'Function' as procedure_type
+FROM
+    pg_proc
+    JOIN pg_namespace ON pg_proc.pronamespace = pg_namespace.oid
+WHERE
+    prokind = 'f'
+    and pg_namespace.nspname NOT IN ('pg_catalog', 'information_schema');
+"""

openmetadata-spec/src/main/resources/json/schema/entity/data/storedProcedure.json

@@ -6,7 +6,9 @@
   "description": "A `StoredProcedure` entity that contains the set of code statements with an assigned name  and is defined in a `Database Schema`.\"",
   "type": "object",
   "javaType": "org.openmetadata.schema.entity.data.StoredProcedure",
-  "javaInterfaces": ["org.openmetadata.schema.EntityInterface"],
+  "javaInterfaces": [
+    "org.openmetadata.schema.EntityInterface"
+  ],
   "definitions": {
     "storedProcedureType": {
       "javaType": "org.openmetadata.schema.type.StoredProcedureType",
@@ -16,7 +18,8 @@
       "enum": [
         "StoredProcedure",
         "UDF",
-        "StoredPackage"
+        "StoredPackage",
+        "Function"
       ],
       "javaEnums": [
         {
@@ -27,6 +30,9 @@
         },
         {
           "name": "StoredPackage"
+        },
+        {
+          "name": "Function"
         }
       ]
     },

openmetadata-ui/src/main/resources/ui/src/generated/entity/data/storedProcedure.ts

@@ -501,6 +501,7 @@ export enum Language {
  * This schema defines the type of the type of Procedures
  */
 export enum StoredProcedureType {
+    Function = "Function",
     StoredPackage = "StoredPackage",
     StoredProcedure = "StoredProcedure",
     Udf = "UDF",