fix(sqlserver): support GO in SQL file execution

This commit is contained in:
t8y2 committed 2026-07-10 23:06:52 +08:00
1 parent cb5ed9baf8
commit b5f462f8e0
3 files changed
+165 -12

No files matched your search

+28 -3
View File
@@ -974,6 +974,7 @@ fn split_sql_batch_ranges(sql: &str, profile: SqlDialectProfile) -> Vec<SqlState
let mut current_start = 0;
let lines: Vec<&str> = sql.split('\n').collect();
let mut offset = 0;
let mut scanner = SqlScanner::with_profile(profile);
for line in &lines {
let line_start = offset;
@@ -981,15 +982,23 @@ fn split_sql_batch_ranges(sql: &str, profile: SqlDialectProfile) -> Vec<SqlState
offset = line_end + 1; // +1 for the '\n'
let trimmed = line.trim();
if profile.supports_go_batch_separator
let is_batch_separator = profile.supports_go_batch_separator
&& !scanner.is_masked()
&& (trimmed.eq_ignore_ascii_case("go")
|| trimmed.to_ascii_lowercase().starts_with("go ") && trimmed[2..].trim().is_empty())
{
|| trimmed.to_ascii_lowercase().starts_with("go ") && trimmed[2..].trim().is_empty());
if is_batch_separator {
push_batch_range(&mut batches, sql, current_start, line_start);
current_start = line_end.min(sql.len());
if current_start < sql.len() && sql.as_bytes()[current_start] == b'\n' {
current_start += 1;
}
} else {
for (relative_idx, ch) in line.char_indices() {
scanner.step(sql, line_start + relative_idx, ch);
}
}
if line_end < sql.len() {
scanner.step(sql, line_end, '\n');
}
}
@@ -2741,6 +2750,22 @@ mod tests {
assert_eq!(super::split_sql_batches("SELECT 1\nGO"), vec!["SELECT 1"]);
}
#[test]
fn split_batches_keeps_go_inside_multiline_string() {
assert_eq!(
super::split_sql_batches("SELECT 'first line\nGO\nlast line';\nGO\nSELECT 2"),
vec!["SELECT 'first line\nGO\nlast line';", "SELECT 2"]
);
}
#[test]
fn split_batches_keeps_go_inside_block_comment() {
assert_eq!(
super::split_sql_batches("SELECT 1;\n/*\nGO\n*/\nSELECT 2;\nGO\nSELECT 3;"),
vec!["SELECT 1;\n/*\nGO\n*/\nSELECT 2;", "SELECT 3;"]
);
}
// --- DELIMITER support ---
#[test]
+55 -8
View File
@@ -10,9 +10,9 @@ use crate::query::{
QueryExecutionOptions,
};
use crate::sql::{
optimize_sql_file_import_statements, prepare_sql_file_statement, statement_summary, SqlFileImportStatement,
SqlFileImportStatementKind, SqlFileProgress, SqlFileRequest, SqlFileStatementAction, SqlFileStatus,
SqlParsingOptions, SqlStatementSplitter,
optimize_sql_file_import_statements, prepare_sql_file_statement, split_sql_batches, statement_summary,
SqlFileImportStatement, SqlFileImportStatementKind, SqlFileProgress, SqlFileRequest, SqlFileStatementAction,
SqlFileStatus, SqlParsingOptions, SqlStatementSplitter,
};
use crate::types::QueryResult;
@@ -232,11 +232,8 @@ pub async fn execute_sql_file_content(
mut emit: impl FnMut(SqlFileProgress),
) -> Result<(), String> {
let import_target = sql_file_import_target(state, &request.connection_id).await;
let options =
import_target.as_ref().map(|target| SqlParsingOptions::for_database_type(target.db_type)).unwrap_or_default();
let mut splitter = SqlStatementSplitter::with_options(options);
let mut statements = splitter.push_chunk(file_content);
statements.extend(splitter.finish());
let statements =
split_sql_file_import_statements(file_content, import_target.as_ref().map(|target| target.db_type));
let planned_statements = optimize_sql_file_import_statements(
&statements,
@@ -258,6 +255,20 @@ pub async fn execute_sql_file_content(
.await
}
fn split_sql_file_import_statements(file_content: &str, db_type: Option<DatabaseType>) -> Vec<String> {
if db_type == Some(DatabaseType::SqlServer) {
// GO is a client-side batch delimiter, not T-SQL. SQL Server module DDL
// must also remain a complete batch because procedure bodies contain semicolons.
return split_sql_batches(file_content);
}
let options = db_type.map(SqlParsingOptions::for_database_type).unwrap_or_default();
let mut splitter = SqlStatementSplitter::with_options(options);
let mut statements = splitter.push_chunk(file_content);
statements.extend(splitter.finish());
statements
}
#[allow(clippy::too_many_arguments)]
pub fn sql_file_progress(
execution_id: &str,
@@ -900,6 +911,42 @@ mod tests {
use super::*;
use crate::models::connection::DatabaseType;
#[test]
fn sqlserver_sql_file_splits_go_batches_without_sending_delimiters() {
let statements = split_sql_file_import_statements(
"CREATE TABLE dbo.items (id INT);\nGO\nINSERT INTO dbo.items VALUES (1);\nGO\nSELECT * FROM dbo.items;",
Some(DatabaseType::SqlServer),
);
assert_eq!(
statements,
vec!["CREATE TABLE dbo.items (id INT);", "INSERT INTO dbo.items VALUES (1);", "SELECT * FROM dbo.items;"]
);
assert!(statements
.iter()
.all(|statement| !statement.lines().any(|line| line.trim().eq_ignore_ascii_case("go"))));
}
#[test]
fn sqlserver_sql_file_keeps_module_body_in_one_batch() {
let statements = split_sql_file_import_statements(
"CREATE PROCEDURE dbo.demo AS\nBEGIN\n SELECT 1;\n SELECT 2;\nEND\nGO\nSELECT 3;",
Some(DatabaseType::SqlServer),
);
assert_eq!(statements.len(), 2);
assert_eq!(statements[0], "CREATE PROCEDURE dbo.demo AS\nBEGIN\n SELECT 1;\n SELECT 2;\nEND");
assert_eq!(statements[1], "SELECT 3;");
}
#[test]
fn non_sqlserver_sql_file_keeps_statement_splitting_behavior() {
assert_eq!(
split_sql_file_import_statements("SELECT 1; SELECT 2;", Some(DatabaseType::Postgres)),
vec!["SELECT 1", "SELECT 2"]
);
}
#[test]
fn stop_on_error_returns_err_with_terminal_error_progress() {
let decision = statement_error_decision(