Skip to content

Fix SET TERM handling in SQL execution #45

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
Copilot wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Fix SET TERM handling in SQL execution #45

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
238a006
Initial plan
Copilot Jan 20, 2026
2286d04
Fix SET TERM handling by routing to isql_execute
Copilot Jan 20, 2026
389e45b
Skip SQL splitting when SET TERM is detected
Copilot Jan 20, 2026
ad6d071
Address code review feedback - improve SET TERM detection
Copilot Jan 20, 2026
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
70 changes: 41 additions & 29 deletions sql.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,41 +99,53 @@
// remove empty lines from userinput and put the statements into $lines[]
if (isset($_POST['sql_run']) ||
isset($_POST['sql_execute'])) {
$lines = explode(';', $sql_script);

//remove whitespace and empty lines
foreach ($lines as $idx => $cmd) {
$cmd = trim($cmd);
if ($cmd == '') {
array_splice($lines, $idx, 1);
continue;
}
$lines[$idx] = $cmd;

$isql_flag = false;

// check if script contains SET TERM command - must use isql
if (preg_match('/\bSET\s+TERM\s+/i', $sql_script)) {
$isql_flag = true;
$lines = array($sql_script);
}

// If SET TERM is detected, don't split - execute the whole script via isql
if (!$isql_flag) {
$lines = explode(';', $sql_script);

//remove whitespace and empty lines
foreach ($lines as $idx => $cmd) {
$cmd = trim($cmd);
if ($cmd == '') {
array_splice($lines, $idx, 1);
continue;
}
$lines[$idx] = $cmd;

// execute the whole script through isql, if it contains a CREATE DATABASE, PROCEDURE or TRIGGER
if (preg_match('/^CREATE(\s)+(DATABASE|SCHEMA|PROCEDURE|TRIGGER)/i', $cmd)) {
$isql_flag = true;
// execute the whole script through isql, if it contains a CREATE DATABASE, PROCEDURE or TRIGGER
if (preg_match('/^CREATE(\s)+(DATABASE|SCHEMA|PROCEDURE|TRIGGER)/i', $cmd)) {
$isql_flag = true;

if ($cmd{(strlen($cmd) - 1)} != ';') {
$lines[$idx] .= ';';
if ($cmd[strlen($cmd) - 1] != ';') {
$lines[$idx] .= ';';
}
}
}

// empty the sql buffer if the script contains one or more select statements
if (strncasecmp('select', $cmd, 6) == 0) {
$s_sql['buffer'] = '';
// empty the sql buffer if the script contains one or more select statements
if (strncasecmp('select', $cmd, 6) == 0) {
$s_sql['buffer'] = '';
}
}
}

// make sure that there are no disabled commands in the script
if (is_array($SQL_DISABLE) && count($SQL_DISABLE) > 0
&& ($s_login['user'] != 'SYSDBA' || SYSDBA_GET_ALL === false)) {
foreach ($SQL_DISABLE as $disable) {
$len = strlen($disable);
foreach ($lines as $line) {
if (strncasecmp($disable, $line, $len) == 0) {
$error = sprintf($ERRORS['DISABLED_CMD'], $disable);
break 2;
// make sure that there are no disabled commands in the script
if (is_array($SQL_DISABLE) && count($SQL_DISABLE) > 0
&& ($s_login['user'] != 'SYSDBA' || SYSDBA_GET_ALL === false)) {
foreach ($SQL_DISABLE as $disable) {
$len = strlen($disable);
foreach ($lines as $line) {
if (strncasecmp($disable, $line, $len) == 0) {
$error = sprintf($ERRORS['DISABLED_CMD'], $disable);
break 2;
}
}
}
}
Expand Down