From 2bd39074767b6d4bac5c7f954032c08cc6b174e2 Mon Sep 17 00:00:00 2001 From: Sourav Roy Date: Wed, 20 Nov 2024 19:34:48 +0000 Subject: [PATCH] Fix oracle db stored procedure call --- .../db2rest/rest/oracle/OracleProcedureControllerTest.java | 7 +++---- api-rest/src/test/resources/oracle/oracle-sakila.sql | 2 +- .../db2rest/jdbc/core/service/JdbcProcedureService.java | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/api-rest/src/test/java/com/homihq/db2rest/rest/oracle/OracleProcedureControllerTest.java b/api-rest/src/test/java/com/homihq/db2rest/rest/oracle/OracleProcedureControllerTest.java index f98128b0..ebf2204e 100644 --- a/api-rest/src/test/java/com/homihq/db2rest/rest/oracle/OracleProcedureControllerTest.java +++ b/api-rest/src/test/java/com/homihq/db2rest/rest/oracle/OracleProcedureControllerTest.java @@ -18,8 +18,7 @@ @TestClassOrder(ClassOrderer.OrderAnnotation.class) @Order(250) class OracleProcedureControllerTest extends OracleBaseIntegrationTest { - - @Disabled + @Test @DisplayName("Execute stored procedure on oracle db") void execute() throws Exception { @@ -36,8 +35,8 @@ void execute() throws Exception { .content(json)) .andExpect(status().isOk()) .andExpect(jsonPath("$", instanceOf(Map.class))) - .andExpect(jsonPath("$.*", hasSize(2))) - .andExpect(jsonPath("$.rentalRate", equalTo(0.99))) + .andExpect(jsonPath("$.*", hasSize(1))) + .andExpect(jsonPath("$.P_RENTAL_RATE", equalTo(0.99))) //.andDo(print()) .andDo(document("oracle-execute-procedure")); } diff --git a/api-rest/src/test/resources/oracle/oracle-sakila.sql b/api-rest/src/test/resources/oracle/oracle-sakila.sql index db4698bc..a3b2b3b9 100644 --- a/api-rest/src/test/resources/oracle/oracle-sakila.sql +++ b/api-rest/src/test/resources/oracle/oracle-sakila.sql @@ -779,4 +779,4 @@ WHEN OTHERS THEN RAISE_APPLICATION_ERROR(-20002, 'Error getting rental rate: ' || SQLERRM); END GetMovieRentalRateProc; -/ + diff --git a/rdbms-support/src/main/java/com/homihq/db2rest/jdbc/core/service/JdbcProcedureService.java b/rdbms-support/src/main/java/com/homihq/db2rest/jdbc/core/service/JdbcProcedureService.java index 0d9932af..a59c867c 100644 --- a/rdbms-support/src/main/java/com/homihq/db2rest/jdbc/core/service/JdbcProcedureService.java +++ b/rdbms-support/src/main/java/com/homihq/db2rest/jdbc/core/service/JdbcProcedureService.java @@ -35,7 +35,6 @@ public Map execute(String dbId, String subRoutineName, Map doExecuteInternal(JdbcTemplate jdbcTemplate, String subRoutineName, Map inParams) { jdbcTemplate.setResultsMapCaseInsensitive(true); - SqlParameterSource in = new MapSqlParameterSource().addValues(inParams); try { return new SimpleJdbcCall(jdbcTemplate).withProcedureName(subRoutineName).execute(inParams);