refactor: move DBMS_OUTPUT from ivorysql_ora to plisql

rophy · rophy · commit 26ba887c7245 · 2025-12-01T20:23:31.000Z
Move DBMS_OUTPUT package to plisql extension for clean module dependencies:

- ivorysql_ora no longer depends on plisql for PACKAGE syntax
- DBMS_OUTPUT now lives in plisql alongside future DBMS_UTILITY
- Change VARCHAR2 to TEXT (casts exist for transparency)
- Enable Oracle mode in initdb when loading plisql extension
- Update tests to use TEXT type
diff --git a/contrib/ivorysql_ora/Makefile b/contrib/ivorysql_ora/Makefile
@@ -25,7 +25,6 @@ OBJS = \
 	src/builtin_functions/datetime_datatype_functions.o \
 	src/builtin_functions/numeric_datatype_functions.o \
 	src/builtin_functions/misc_functions.o \
-	src/builtin_functions/dbms_output.o \
 	src/merge/ora_merge.o \
 	src/sysview/sysview_functions.o \
 	src/xml_functions/ora_xml_functions.o
diff --git a/contrib/ivorysql_ora/ivorysql_ora_merge_sqls b/contrib/ivorysql_ora/ivorysql_ora_merge_sqls
@@ -1,5 +1,4 @@
 src/datatype/datatype
 src/builtin_functions/builtin_functions
-src/builtin_functions/dbms_output
 src/sysview/sysview
 src/xml_functions/xml_functions
diff --git a/contrib/ivorysql_ora/src/builtin_functions/dbms_output--1.0.sql b/contrib/ivorysql_ora/src/builtin_functions/dbms_output--1.0.sql
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -2091,7 +2091,10 @@ load_plpgsql(FILE *cmdfd)
 static void
 load_plisql(FILE *cmdfd)
 {
+	/* Switch to oracle mode to allow CREATE PACKAGE in extension SQL */
+	PG_CMD_PUTS("set ivorysql.compatible_mode to oracle;\n\n");
 	PG_CMD_PUTS("CREATE EXTENSION plisql;\n\n");
+	PG_CMD_PUTS("set ivorysql.compatible_mode to pg;\n\n");
 }
 
 static void
diff --git a/src/pl/plisql/src/Makefile b/src/pl/plisql/src/Makefile
@@ -40,6 +40,7 @@ rpath =
 OBJS = \
 	$(WIN32RES) \
 	pl_comp.o \
+	pl_dbms_output.o \
 	pl_exec.o \
 	pl_funcs.o \
 	pl_gram.o \
diff --git a/src/pl/plisql/src/expected/plisql_dbms_output.out b/src/pl/plisql/src/expected/plisql_dbms_output.out
@@ -1,7 +1,7 @@
 --
 -- Tests for DBMS_OUTPUT package
 --
--- Note: Use Oracle data types (VARCHAR2, INTEGER) for OUT parameters in Oracle mode
+-- Note: DBMS_OUTPUT uses TEXT type for string parameters
 --
 -- Enable output with default buffer size
 CALL dbms_output.enable();
@@ -191,9 +191,9 @@ CALL dbms_output.put_line('Second enable');
 CALL dbms_output.enable();
 CALL dbms_output.put_line('Before final disable');
 CALL dbms_output.disable();
--- Test GET_LINE (use Oracle types: VARCHAR2, INTEGER)
+-- Test GET_LINE
 DECLARE
-    line VARCHAR2;
+    line TEXT;
     status INTEGER;
 BEGIN
     dbms_output.enable();
@@ -207,9 +207,9 @@ END;
 /
 NOTICE:  Line: Test GET_LINE, Status: 0
 NOTICE:  Empty line: <NULL>, Status: 1
--- Test GET_LINES (use Oracle types: VARCHAR2[], INTEGER)
+-- Test GET_LINES
 DECLARE
-    lines VARCHAR2[];
+    lines TEXT[];
     numlines INTEGER := 10;
 BEGIN
     dbms_output.enable();
diff --git a/src/pl/plisql/src/expected/plisql_nested_subproc2.out b/src/pl/plisql/src/expected/plisql_nested_subproc2.out
@@ -3996,11 +3996,6 @@ begin
 end;
 /
 INFO:  var1 = 2
-ERROR:  schema "dbms_output" does not exist
-LINE 1: CALL dbms_output.put_line('xiexie')
-             ^
-QUERY:  CALL dbms_output.put_line('xiexie')
-CONTEXT:  PL/iSQL function inline_code_block line 5 at CALL
 create or replace function test.test_f(id integer) return integer is
   var1 integer;
   function test_f(id integer) return integer;
diff --git a/src/pl/plisql/src/pl_dbms_output.c b/src/pl/plisql/src/pl_dbms_output.c
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * dbms_output.c
+ * pl_dbms_output.c
  *
  * This file contains the native implementation of Oracle's DBMS_OUTPUT
  * package for IvorySQL.
  *
  * Provides session-level buffering for PUT_LINE, PUT, NEW_LINE,
  * GET_LINE, and GET_LINES functions with full Oracle compatibility.
  *
- * contrib/ivorysql_ora/src/builtin_functions/dbms_output.c
+ * src/pl/plisql/src/pl_dbms_output.c
  *
  *-------------------------------------------------------------------------
  */
@@ -406,7 +406,7 @@ ora_dbms_output_new_line(PG_FUNCTION_ARGS)
  * ora_dbms_output_get_line
  *
  * Retrieve one line from buffer.
- * Returns: (line VARCHAR2, status INTEGER)
+ * Returns: (line TEXT, status INTEGER)
  * - status = 0: success, line contains data
  * - status = 1: no more lines, line is NULL (Oracle behavior)
  */
@@ -452,7 +452,7 @@ ora_dbms_output_get_line(PG_FUNCTION_ARGS)
  *
  * Retrieve multiple lines from buffer.
  * Input: numlines (max lines to retrieve)
- * Returns: (lines VARCHAR2[], actual_count INTEGER)
+ * Returns: (lines TEXT[], actual_count INTEGER)
  * - actual_count is set to number of lines actually retrieved
  */
 Datum
diff --git a/src/pl/plisql/src/plisql--1.0.sql b/src/pl/plisql/src/plisql--1.0.sql
@@ -21,3 +21,113 @@
 ALTER LANGUAGE plisql OWNER TO @extowner@;
 
 COMMENT ON LANGUAGE plisql IS 'PL/iSQL procedural language';
+
+--
+-- DBMS_OUTPUT Package
+--
+-- Oracle-compatible output buffering package.
+-- Provides PUT_LINE, PUT, NEW_LINE, GET_LINE, and GET_LINES functions.
+--
+
+-- Register C functions
+CREATE FUNCTION sys.ora_dbms_output_enable(buffer_size INTEGER DEFAULT 20000)
+RETURNS VOID
+AS 'MODULE_PATHNAME', 'ora_dbms_output_enable'
+LANGUAGE C VOLATILE;
+
+CREATE FUNCTION sys.ora_dbms_output_disable()
+RETURNS VOID
+AS 'MODULE_PATHNAME', 'ora_dbms_output_disable'
+LANGUAGE C VOLATILE;
+
+CREATE FUNCTION sys.ora_dbms_output_put_line(a TEXT)
+RETURNS VOID
+AS 'MODULE_PATHNAME', 'ora_dbms_output_put_line'
+LANGUAGE C VOLATILE;
+
+CREATE FUNCTION sys.ora_dbms_output_put(a TEXT)
+RETURNS VOID
+AS 'MODULE_PATHNAME', 'ora_dbms_output_put'
+LANGUAGE C VOLATILE;
+
+CREATE FUNCTION sys.ora_dbms_output_new_line()
+RETURNS VOID
+AS 'MODULE_PATHNAME', 'ora_dbms_output_new_line'
+LANGUAGE C VOLATILE;
+
+-- Create composite types for GET_LINE and GET_LINES return values
+CREATE TYPE sys.dbms_output_line AS (
+    line TEXT,
+    status INTEGER
+);
+
+CREATE TYPE sys.dbms_output_lines AS (
+    lines TEXT[],
+    numlines INTEGER
+);
+
+CREATE FUNCTION sys.ora_dbms_output_get_line()
+RETURNS sys.dbms_output_line
+AS 'MODULE_PATHNAME', 'ora_dbms_output_get_line'
+LANGUAGE C VOLATILE;
+
+CREATE FUNCTION sys.ora_dbms_output_get_lines(numlines INTEGER)
+RETURNS sys.dbms_output_lines
+AS 'MODULE_PATHNAME', 'ora_dbms_output_get_lines'
+LANGUAGE C VOLATILE;
+
+-- Create DBMS_OUTPUT package
+CREATE OR REPLACE PACKAGE dbms_output IS
+    PROCEDURE enable(buffer_size INTEGER DEFAULT 20000);
+    PROCEDURE disable;
+    PROCEDURE put_line(a TEXT);
+    PROCEDURE put(a TEXT);
+    PROCEDURE new_line;
+    PROCEDURE get_line(line OUT TEXT, status OUT INTEGER);
+    PROCEDURE get_lines(lines OUT TEXT[], numlines IN OUT INTEGER);
+END dbms_output;
+
+CREATE OR REPLACE PACKAGE BODY dbms_output IS
+
+    PROCEDURE enable(buffer_size INTEGER DEFAULT NULL) IS
+    BEGIN
+        PERFORM sys.ora_dbms_output_enable(buffer_size);
+    END;
+
+    PROCEDURE disable IS
+    BEGIN
+        PERFORM sys.ora_dbms_output_disable();
+    END;
+
+    PROCEDURE put_line(a TEXT) IS
+    BEGIN
+        PERFORM sys.ora_dbms_output_put_line(a);
+    END;
+
+    PROCEDURE put(a TEXT) IS
+    BEGIN
+        PERFORM sys.ora_dbms_output_put(a);
+    END;
+
+    PROCEDURE new_line IS
+    BEGIN
+        PERFORM sys.ora_dbms_output_new_line();
+    END;
+
+    PROCEDURE get_line(line OUT TEXT, status OUT INTEGER) IS
+        result sys.dbms_output_line;
+    BEGIN
+        SELECT * INTO result FROM sys.ora_dbms_output_get_line();
+        line := result.line;
+        status := result.status;
+    END;
+
+    PROCEDURE get_lines(lines OUT TEXT[], numlines IN OUT INTEGER) IS
+        result sys.dbms_output_lines;
+    BEGIN
+        SELECT * INTO result FROM sys.ora_dbms_output_get_lines(numlines);
+        lines := result.lines;
+        numlines := result.numlines;
+    END;
+
+END dbms_output;
diff --git a/src/pl/plisql/src/sql/plisql_dbms_output.sql b/src/pl/plisql/src/sql/plisql_dbms_output.sql
@@ -1,7 +1,7 @@
 --
 -- Tests for DBMS_OUTPUT package
 --
--- Note: Use Oracle data types (VARCHAR2, INTEGER) for OUT parameters in Oracle mode
+-- Note: DBMS_OUTPUT uses TEXT type for string parameters
 --
 
 -- Enable output with default buffer size
@@ -207,9 +207,9 @@ CALL dbms_output.enable();
 CALL dbms_output.put_line('Before final disable');
 CALL dbms_output.disable();
 
--- Test GET_LINE (use Oracle types: VARCHAR2, INTEGER)
+-- Test GET_LINE
 DECLARE
-    line VARCHAR2;
+    line TEXT;
     status INTEGER;
 BEGIN
     dbms_output.enable();
@@ -222,9 +222,9 @@ BEGIN
 END;
 /
 
--- Test GET_LINES (use Oracle types: VARCHAR2[], INTEGER)
+-- Test GET_LINES
 DECLARE
-    lines VARCHAR2[];
+    lines TEXT[];
     numlines INTEGER := 10;
 BEGIN
     dbms_output.enable();

Original file line number	Diff line number	Diff line change
`@@ -2091,7 +2091,10 @@ load_plpgsql(FILE *cmdfd)`
`2091`	`2091`	`static void`
`2092`	`2092`	`load_plisql(FILE *cmdfd)`
`2093`	`2093`	`{`
	`2094`	`+ /* Switch to oracle mode to allow CREATE PACKAGE in extension SQL */`
	`2095`	`+ PG_CMD_PUTS("set ivorysql.compatible_mode to oracle;\n\n");`
`2094`	`2096`	`PG_CMD_PUTS("CREATE EXTENSION plisql;\n\n");`
	`2097`	`+ PG_CMD_PUTS("set ivorysql.compatible_mode to pg;\n\n");`
`2095`	`2098`	`}`
`2096`	`2099`
`2097`	`2100`	`static void`
Original file line number	Diff line number	Diff line change
`@@ -13,15 +13,15 @@`
`13`	`13`	`* See the License for the specific language governing permissions and`
`14`	`14`	`* limitations under the License.`
`15`	`15`	`*`
`16`		`- * dbms_output.c`
	`16`	`+ * pl_dbms_output.c`
`17`	`17`	`*`
`18`	`18`	`* This file contains the native implementation of Oracle's DBMS_OUTPUT`
`19`	`19`	`* package for IvorySQL.`
`20`	`20`	`*`
`21`	`21`	`* Provides session-level buffering for PUT_LINE, PUT, NEW_LINE,`
`22`	`22`	`* GET_LINE, and GET_LINES functions with full Oracle compatibility.`
`23`	`23`	`*`
`24`		`- * contrib/ivorysql_ora/src/builtin_functions/dbms_output.c`
	`24`	`+ * src/pl/plisql/src/pl_dbms_output.c`
`25`	`25`	`*`
`26`	`26`	`*-------------------------------------------------------------------------`
`27`	`27`	`*/`
`@@ -406,7 +406,7 @@ ora_dbms_output_new_line(PG_FUNCTION_ARGS)`
`406`	`406`	`* ora_dbms_output_get_line`
`407`	`407`	`*`
`408`	`408`	`* Retrieve one line from buffer.`
`409`		`- * Returns: (line VARCHAR2, status INTEGER)`
	`409`	`+ * Returns: (line TEXT, status INTEGER)`
`410`	`410`	`* - status = 0: success, line contains data`
`411`	`411`	`* - status = 1: no more lines, line is NULL (Oracle behavior)`
`412`	`412`	`*/`
`@@ -452,7 +452,7 @@ ora_dbms_output_get_line(PG_FUNCTION_ARGS)`
`452`	`452`	`*`
`453`	`453`	`* Retrieve multiple lines from buffer.`
`454`	`454`	`* Input: numlines (max lines to retrieve)`
`455`		`- * Returns: (lines VARCHAR2[], actual_count INTEGER)`
	`455`	`+ * Returns: (lines TEXT[], actual_count INTEGER)`
`456`	`456`	`* - actual_count is set to number of lines actually retrieved`
`457`	`457`	`*/`
`458`	`458`	`Datum`