Added storeproceduretype and test method

open-metadata · Dec 16, 2024 · 5fc5cac · 5fc5cac
1 parent 458adb0
commit 5fc5cac
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 3 deletions.
diff --git a/ingestion/src/metadata/ingestion/source/database/oracle/metadata.py b/ingestion/src/metadata/ingestion/source/database/oracle/metadata.py
@@ -24,6 +24,7 @@
 from metadata.generated.schema.entity.data.storedProcedure import (
     Language,
     StoredProcedureCode,
+    StoredProcedureType,
 )
 from metadata.generated.schema.entity.data.table import TableType
 from metadata.generated.schema.entity.services.connections.database.oracleConnection import (
@@ -227,14 +228,18 @@ def yield_stored_procedure(
         self, stored_procedure: OracleStoredObject
     ) -> Iterable[Either[CreateStoredProcedureRequest]]:
         """Prepare the stored procedure payload"""
-
         try:
             stored_procedure_request = CreateStoredProcedureRequest(
                 name=EntityName(stored_procedure.name),
                 storedProcedureCode=StoredProcedureCode(
                     language=Language.SQL,
                     code=stored_procedure.definition,
                 ),
+                storedProcedureType=(
+                    StoredProcedureType.StoredPackage
+                    if stored_procedure.procedure_type == "StoredPackage"
+                    else StoredProcedureType.StoredProcedure
+                ),
                 owners=self.metadata.get_reference_by_name(
                     name=stored_procedure.owner.lower(), is_owner=True
                 ),

diff --git a/ingestion/src/metadata/ingestion/source/database/oracle/models.py b/ingestion/src/metadata/ingestion/source/database/oracle/models.py
@@ -15,7 +15,7 @@ class OracleStoredObject(BaseModel):
         None, description="Will only be informed for non-SQL routines."
     )
     owner: str
-    procedure_type: Optional[str] = Field(None, alias="PROCEDURE_TYPE")
+    procedure_type: Optional[str] = Field(None, alias="procedure_type")
 
 
 class FetchObject(BaseModel):

diff --git a/ingestion/tests/unit/topology/database/test_oracle.py b/ingestion/tests/unit/topology/database/test_oracle.py
@@ -24,7 +24,10 @@
 )
 from metadata.generated.schema.entity.data.database import Database
 from metadata.generated.schema.entity.data.databaseSchema import DatabaseSchema
-from metadata.generated.schema.entity.data.storedProcedure import StoredProcedureCode
+from metadata.generated.schema.entity.data.storedProcedure import (
+    StoredProcedureCode,
+    StoredProcedureType,
+)
 from metadata.generated.schema.entity.services.connections.metadata.openMetadataConnection import (
     OpenMetadataConnection,
 )
@@ -107,6 +110,14 @@
     name="sample_procedure",
     definition="SAMPLE_SQL_TEXT",
     owner="sample_stored_prcedure_owner",
+    procedure_type="StoredProcedure",
+)
+
+MOCK_STORED_PACKAGE = OracleStoredObject(
+    name="sample_package",
+    definition="SAMPLE_SQL_TEXT",
+    owner="sample_stored_package_owner",
+    procedure_type="StoredPackage",
 )
 
 EXPECTED_DATABASE = [
@@ -154,6 +165,28 @@
         owners=None,
         tags=None,
         storedProcedureCode=StoredProcedureCode(language="SQL", code="SAMPLE_SQL_TEXT"),
+        storedProcedureType=StoredProcedureType.StoredProcedure,
+        databaseSchema=FullyQualifiedEntityName(
+            "oracle_source_test.sample_database.sample_schema"
+        ),
+        extension=None,
+        dataProducts=None,
+        sourceUrl=None,
+        domain=None,
+        lifeCycle=None,
+        sourceHash=None,
+    )
+]
+
+EXPECTED_STORED_PACKAGE = [
+    CreateStoredProcedureRequest(
+        name=EntityName("sample_package"),
+        displayName=None,
+        description=None,
+        owners=None,
+        tags=None,
+        storedProcedureCode=StoredProcedureCode(language="SQL", code="SAMPLE_SQL_TEXT"),
+        storedProcedureType=StoredProcedureType.StoredPackage,
         databaseSchema=FullyQualifiedEntityName(
             "oracle_source_test.sample_database.sample_schema"
         ),
@@ -221,3 +254,9 @@ def test_yield_stored_procedure(self):
             either.right
             for either in self.oracle.yield_stored_procedure(MOCK_STORED_PROCEDURE)
         ]
+
+    def test_yield_stored_package(self):
+        assert EXPECTED_STORED_PACKAGE == [
+            either.right
+            for either in self.oracle.yield_stored_procedure(MOCK_STORED_PACKAGE)
+        ]