Skip to content

Make nested EXEC SQL available #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: develop
Choose a base branch
from
Draft

Make nested EXEC SQL available #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47c36bf
Expand and translate EXEC SQL written in the INCLUDE file
tsh-hashimoto Jul 28, 2025
29ef393
Add new test to include.at
tsh-hashimoto Jul 28, 2025
789d0b4
fix to avoid accesing NULL pointer
tsh-hashimoto Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ocesql/ppout.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2027,6 +2027,13 @@ void ppoutput(char *ppin,char *ppout,struct cb_exec_list *head){
com_readline(readfile, inbuff, &lineNUM, &EOFflg);
if(strstr(inbuff, INC_START_MARK) != NULL ||
strstr(inbuff, INC__END__MARK) != NULL){
if(head && l != NULL && lineNUM - l->endLine == 1) {
if(strcmp(l->commandName, "WORKING_END") != 0){
ppbuff(l);
}
if (l->next != NULL)
l = l->next;
}
continue;
}

Expand Down
126 changes: 125 additions & 1 deletion tests/basic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,7 @@ at_help_all="1;connect-disconnect.at:1;connect and disconnect statement test;;
21;include.at:488;use include with extension(normal file: quoted, newline);;
22;include.at:536;use include with extension(sqlca.cbl: quoted);;
23;include.at:591;use include with extension(sqlca.cbl: quoted, newline);;
24;include.at:650;nested EXEC SQL;;
"
# List of the all the test groups.
at_groups_all=`printf "%s\n" "$at_help_all" | sed 's/;.*//'`
Expand All @@ -646,7 +647,7 @@ at_fn_validate_ranges ()
for at_grp
do
eval at_value=\$$at_grp
if test $at_value -lt 1 || test $at_value -gt 23; then
if test $at_value -lt 1 || test $at_value -gt 24; then
printf "%s\n" "invalid test group: $at_value" >&2
exit 1
fi
Expand Down Expand Up @@ -5840,3 +5841,126 @@ printf "%s\n" "$at_setup_line" >"$at_check_line_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
#AT_STOP_23
#AT_START_24
at_fn_group_banner 24 'include.at:650' \
"nested EXEC SQL" " "
at_xfail=no
(
printf "%s\n" "24. $at_setup_line: testing $at_desc ..."
$at_traceon


cat >A <<'_ATEOF'
EXEC SQL
INSERT INTO A (ID, NAME)
VALUES (:WS-ID, :WS-NAME)
END-EXEC.
_ATEOF


cat >prog.cbl <<'_ATEOF'

IDENTIFICATION DIVISION.
******************************************************************
PROGRAM-ID. prog.
******************************************************************
DATA DIVISION.
******************************************************************
WORKING-STORAGE SECTION.
EXEC SQL BEGIN DECLARE SECTION END-EXEC.
01 WS-ID PIC X(10).
01 WS-NAME PIC X(50).
EXEC SQL END DECLARE SECTION END-EXEC.
EXEC SQL INCLUDE SQLCA END-EXEC.
******************************************************************
PROCEDURE DIVISION.
EXEC SQL INCLUDE A END-EXEC.
STOP RUN.
_ATEOF


cat >prog.txt <<'_ATEOF'

IDENTIFICATION DIVISION.
******************************************************************
PROGRAM-ID. prog.
******************************************************************
DATA DIVISION.
******************************************************************
WORKING-STORAGE SECTION.
OCESQL*EXEC SQL BEGIN DECLARE SECTION END-EXEC.
01 WS-ID PIC X(10).
01 WS-NAME PIC X(50).
OCESQL*EXEC SQL END DECLARE SECTION END-EXEC.
OCESQL*EXEC SQL INCLUDE SQLCA END-EXEC.
OCESQL copy "sqlca.cbl".
******************************************************************
OCESQL*
OCESQL 01 SQ0001.
OCESQL 02 FILLER PIC X(042) VALUE "INSERT INTO A (ID, NAME) VALUE"
OCESQL & "S ( $1, $2 )".
OCESQL 02 FILLER PIC X(1) VALUE X"00".
OCESQL*
PROCEDURE DIVISION.
OCESQL* EXEC SQL INCLUDE A END-EXEC.
OCESQL* EXEC SQL
OCESQL* INSERT INTO A (ID, NAME)
OCESQL* VALUES (:WS-ID, :WS-NAME)
OCESQL* END-EXEC.
OCESQL CALL "OCESQLStartSQL"
OCESQL END-CALL
OCESQL CALL "OCESQLSetSQLParams" USING
OCESQL BY VALUE 16
OCESQL BY VALUE 10
OCESQL BY VALUE 0
OCESQL BY REFERENCE WS-ID
OCESQL END-CALL
OCESQL CALL "OCESQLSetSQLParams" USING
OCESQL BY VALUE 16
OCESQL BY VALUE 50
OCESQL BY VALUE 0
OCESQL BY REFERENCE WS-NAME
OCESQL END-CALL
OCESQL CALL "OCESQLExecParams" USING
OCESQL BY REFERENCE SQLCA
OCESQL BY REFERENCE SQ0001
OCESQL BY VALUE 2
OCESQL END-CALL
OCESQL CALL "OCESQLEndSQL"
OCESQL END-CALL.
STOP RUN.
_ATEOF


{ set +x
printf "%s\n" "$at_srcdir/include.at:728: ocesql prog.cbl prog.cob > /dev/null"
at_fn_check_prepare_trace "include.at:728"
( $at_check_trace; ocesql prog.cbl prog.cob > /dev/null
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
at_fn_check_status 0 $at_status "$at_srcdir/include.at:728"
$at_failed && at_fn_log_failure
$at_traceon; }

{ set +x
printf "%s\n" "$at_srcdir/include.at:729: diff prog.cob prog.txt"
at_fn_check_prepare_trace "include.at:729"
( $at_check_trace; diff prog.cob prog.txt
) >>"$at_stdout" 2>>"$at_stderr" 5>&-
at_status=$? at_failed=false
$at_check_filter
at_fn_diff_devnull "$at_stderr" || at_failed=:
at_fn_diff_devnull "$at_stdout" || at_failed=:
at_fn_check_status 0 $at_status "$at_srcdir/include.at:729"
$at_failed && at_fn_log_failure
$at_traceon; }


set +x
$at_times_p && times >"$at_times_file"
) 5>&1 2>&1 7>&- | eval $at_tee_pipe
read at_status <"$at_status_file"
#AT_STOP_24
83 changes: 83 additions & 0 deletions tests/basic.src/include.at
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,3 +646,86 @@ OCESQL*
])

AT_CLEANUP

AT_SETUP([nested EXEC SQL])

AT_DATA([A], [ EXEC SQL
INSERT INTO A (ID, NAME)
VALUES (:WS-ID, :WS-NAME)
END-EXEC.
])

AT_DATA([prog.cbl], [
IDENTIFICATION DIVISION.
******************************************************************
PROGRAM-ID. prog.
******************************************************************
DATA DIVISION.
******************************************************************
WORKING-STORAGE SECTION.
EXEC SQL BEGIN DECLARE SECTION END-EXEC.
01 WS-ID PIC X(10).
01 WS-NAME PIC X(50).
EXEC SQL END DECLARE SECTION END-EXEC.
EXEC SQL INCLUDE SQLCA END-EXEC.
******************************************************************
PROCEDURE DIVISION.
EXEC SQL INCLUDE A END-EXEC.
STOP RUN.
])

AT_DATA([prog.txt], [
IDENTIFICATION DIVISION.
******************************************************************
PROGRAM-ID. prog.
******************************************************************
DATA DIVISION.
******************************************************************
WORKING-STORAGE SECTION.
OCESQL*EXEC SQL BEGIN DECLARE SECTION END-EXEC.
01 WS-ID PIC X(10).
01 WS-NAME PIC X(50).
OCESQL*EXEC SQL END DECLARE SECTION END-EXEC.
OCESQL*EXEC SQL INCLUDE SQLCA END-EXEC.
OCESQL copy "sqlca.cbl".
******************************************************************
OCESQL*
OCESQL 01 SQ0001.
OCESQL 02 FILLER PIC X(042) VALUE "INSERT INTO A (ID, NAME) VALUE"
OCESQL & "S ( $1, $2 )".
OCESQL 02 FILLER PIC X(1) VALUE X"00".
OCESQL*
PROCEDURE DIVISION.
OCESQL* EXEC SQL INCLUDE A END-EXEC.
OCESQL* EXEC SQL
OCESQL* INSERT INTO A (ID, NAME)
OCESQL* VALUES (:WS-ID, :WS-NAME)
OCESQL* END-EXEC.
OCESQL CALL "OCESQLStartSQL"
OCESQL END-CALL
OCESQL CALL "OCESQLSetSQLParams" USING
OCESQL BY VALUE 16
OCESQL BY VALUE 10
OCESQL BY VALUE 0
OCESQL BY REFERENCE WS-ID
OCESQL END-CALL
OCESQL CALL "OCESQLSetSQLParams" USING
OCESQL BY VALUE 16
OCESQL BY VALUE 50
OCESQL BY VALUE 0
OCESQL BY REFERENCE WS-NAME
OCESQL END-CALL
OCESQL CALL "OCESQLExecParams" USING
OCESQL BY REFERENCE SQLCA
OCESQL BY REFERENCE SQ0001
OCESQL BY VALUE 2
OCESQL END-CALL
OCESQL CALL "OCESQLEndSQL"
OCESQL END-CALL.
STOP RUN.
])

AT_CHECK([ocesql prog.cbl prog.cob > /dev/null], [0])
AT_CHECK([diff prog.cob prog.txt], [0])

AT_CLEANUP