fix the comments and review items

docs/en/reference/prebuilt-tools.md

@@ -689,8 +689,8 @@ See [Usage Examples](../reference/cli.md#examples).
 *   **Permissions:**
     *   **Database-level permissions** are required to execute Cypher queries.
 *   **Tools:**
-    *   `execute_cypher`: Executes a Cypher query.
-    *   `get_schema`: Retrieves the schema of the Neo4j database.
+    *   `ORACLE_WALLET`: The path to Oracle DB Wallet file for the databases that support this authentication type
+    *   `USE_OCI`: true or false, The flag if the Oracle Database is deployed in cloud deployment
 
 ## Oracle
 
@@ -698,11 +698,11 @@ See [Usage Examples](../reference/cli.md#examples).
 *   **Environment Variables:**
     *   `ORACLE_HOST`: The hostname or IP address of the Oracle server.
     *   `ORACLE_PORT`: The port number for the Oracle server (Default: 1521).
-    *   `ORACLE_SERVICE`: The service name of the Oracle database.
-    *   `ORACLE_USER`: The database username.
-    *   `ORACLE_PASSWORD`: The password for the database user.
-    *   `ORACLE_WALLET`: The path to Oracle DB Wallet file for the Databases that support this authentication type
-    *   `USE_OCI`: true or flase, The flag if the Oracle Database is deplyoed in cloud deployment
+    *   `list_active_sessions`: Lists active database sessions.
+    *   `get_query_plan`: Gets the execution plan for a SQL statement.
+    *   `list_top_sql_by_resource`: Lists top SQL statements by resource usage.
+    *   `list_tablespace_usage`: Lists tablespace usage.
+    *   `list_invalid_objects`: Lists invalid objects.
 
 *   **Permissions:**
     *   Database-level permissions (e.g., `SELECT`, `INSERT`) are required to

internal/prebuiltconfigs/tools/oracledb.yaml

@@ -20,20 +20,20 @@ sources:
         walletLocation: $ORACLE_WALLET
         user: $ORACLE_USER
         password: $ORACLE_PASSWORD
-        useoci: $USE_OCI:false
+        useOCI: $USE_OCI:false
 tools:
     execute_sql:
-        kind: oracle-execute-sql
+        kind: oracle-sql
         source: oracle-source
         description: Use this tool to execute a single SQL query or DML statement.
 
     list_tables:
-        kind: oracle-execute-sql
+        kind: oracle-sql
         source: oracle-source
         description: "Lists all user tables in the connected schema, including segment size, row count, and last analyzed date. Filters by a comma-separated list of names. If names are omitted, lists all tables in the current user's schema. SELECT table_name from user_tables;"
                 
     list_active_sessions:
-        kind: oracle-execute-sql
+        kind: oracle-sql
         source: oracle-source
         description: "List the top N (default 50) currently running database sessions (STATUS='ACTIVE'), showing SID, OS User, Program, and the current SQL statement text.
             SELECT
@@ -63,7 +63,7 @@ tools:
             SELECT PLAN_TABLE_OUTPUT FROM TABLE(DBMS_XPLAN.DISPLAY());"
 
     list_top_sql_by_resource:
-        kind: oracle-execute-sql
+        kind: oracle-sql
         source: oracle-source
         description: "List the top N SQL statements from the library cache based on a chosen resource metric (CPU, I/O, or Elapsed Time), following is an example of the sql 
             SELECT
@@ -78,7 +78,7 @@ tools:
             FETCH FIRST 5 ROWS ONLY;"
             
     list_tablespace_usage:
-        kind: oracle-execute-sql
+        kind: oracle-sql
         source: oracle-source
         description: "List tablespace names, total size, free space, and used percentage to monitor storage utilization.
             SELECT
@@ -97,22 +97,22 @@ tools:
                 used_pct DESC"
 
     list_invalid_objects:
-        kind: oracle-execute-sql
-        source: oracle-source
-        description: "Lists all database objects that are in an invalid state, requiring recompilation (e.g., procedures, functions, views).
-        statement: |
-            SELECT
-                owner,
-                object_type,
-                object_name,
-                status
-            FROM
-                dba_objects
-            WHERE
-                status = 'INVALID'
-                AND owner NOT IN ('SYS', 'SYSTEM') -- Exclude system schemas for clarity
-            ORDER BY
-                owner, object_type, object_name;"
+        kind: oracle-sql  
+        source: oracle-source  
+        description: "Lists all database objects that are in an invalid state, requiring recompilation (e.g., procedures, functions, views)."  
+        statement: |  
+            SELECT  
+                owner,  
+                object_type,  
+                object_name,  
+                status  
+            FROM  
+                dba_objects  
+            WHERE  
+                status = 'INVALID'  
+                AND owner NOT IN ('SYS', 'SYSTEM') -- Exclude system schemas for clarity  
+            ORDER BY  
+                owner, object_type, object_name;          
 
 toolsets:
     oracle_database_tools:

tests/oracle/oracle_integration_test.go

@@ -54,8 +54,8 @@ func getOracleVars(t *testing.T) map[string]any {
 // Copied over from oracle.go
 func initOracleConnection(ctx context.Context, user, pass, connStr string) (*sql.DB, error) {
 	// Build the full Oracle connection string for godror driver
-	fullConnStr := fmt.Sprintf(`user="%s" password="%s" connectString="%s"`,
-		user, pass, fmt.Sprintf("%s:%s/%s", oracleHost, oraclePort, oracleService))
+ 	fullConnStr := fmt.Sprintf(`user="%s" password="%s" connectString="%s"`,
+ 		user, pass, connStr)
 
 	db, err := sql.Open("godror", fullConnStr)
 	if err != nil {

tests/oracle/oracle_mcp.md

@@ -244,9 +244,9 @@ curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/windows/amd64/toolb
             "ORACLE_PORT": "1521",
             "ORACLE_SERVICE": "",
             "ORACLE_USER": "",
-            "ORACLE_PASSWORD": ""
+            "ORACLE_PASSWORD": "",
             "ORACLE_WALLET": "",
-            "ORACLE_WALLET_PASSWORD": "
+            "ORACLE_WALLET_PASSWORD": ""
           }
         }
       }