Skip to content

armgit / dbx

Public Imported from GitHub
0

25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。

fix(oscar): use limit pagination for table data pages

t8y2c06a563f6982
diff --git a/crates/dbx-sql-dialect/src/sql_dialect/capabilities.rs b/crates/dbx-sql-dialect/src/sql_dialect/capabilities.rs
index 983fb25db5..007b523a6d 100644
--- a/crates/dbx-sql-dialect/src/sql_dialect/capabilities.rs
+++ b/crates/dbx-sql-dialect/src/sql_dialect/capabilities.rs
@@ -119,9 +119,18 @@ pub fn pagination_strategy(database_type: Option<DatabaseType>, context: Paginat
// introduced in 12c. ROWNUM remains compatible with the supported 11g
// baseline while still providing a bounded read and user query pagination (#12789).
Some(DatabaseType::Oracle) => TablePaginationStrategy::Rownum,
- Some(DatabaseType::Oscar)
- if matches!(context, PaginationContext::TablePreview | PaginationContext::BoundedRead) =>
- {
+ // OSCAR (神通) rejects a statement that mixes its ROWNUM pseudo-column
+ // with a LIMIT. The JDBC agent caps every table-data statement with
+ // `Statement.setMaxRows()`, which the OSCAR driver forwards as a row
+ // limit, so a ROWNUM-wrapped later page (its inner bound is
+ // `offset + limit`, above the driver cap) collides. OSCAR supports
+ // `LIMIT n OFFSET m` directly, so table previews use that single
+ // pagination form instead of ROWNUM. Bounded reads (export, compare,
+ // transfer) do not set the driver cap, so they keep ROWNUM.
+ Some(DatabaseType::Oscar) if matches!(context, PaginationContext::TablePreview) => {
+ TablePaginationStrategy::LimitOffset
+ }
+ Some(DatabaseType::Oscar) if matches!(context, PaginationContext::BoundedRead) => {
TablePaginationStrategy::Rownum
}
Some(DatabaseType::Oscar) => TablePaginationStrategy::Unbounded,
diff --git a/crates/dbx-sql-dialect/src/sql_dialect/table_select.rs b/crates/dbx-sql-dialect/src/sql_dialect/table_select.rs
index d808d4c0bf..16f71c363f 100644
--- a/crates/dbx-sql-dialect/src/sql_dialect/table_select.rs
+++ b/crates/dbx-sql-dialect/src/sql_dialect/table_select.rs
@@ -929,6 +929,9 @@ pub(super) fn build_select_columns(
// can carry dozens of tags and fields — a full column list turns the
// generated SQL into a wall of names, while InfluxQL supports `*`
// natively and users can narrow the projection by editing the SQL.
+ // OSCAR table previews keep their explicit projection: switching the
+ // pagination form from ROWNUM to LIMIT/OFFSET must not also widen a
+ // generated page to every column (#13515).
if !matches!(
database_type,
Some(
@@ -937,6 +940,7 @@ pub(super) fn build_select_columns(
| DatabaseType::Impala
| DatabaseType::Argo
| DatabaseType::Transwarp
+ | DatabaseType::Oscar
)
) {
return "*".to_string();
diff --git a/crates/dbx-sql-dialect/src/sql_dialect/tests.rs b/crates/dbx-sql-dialect/src/sql_dialect/tests.rs
index 91f006c6f2..b744381ca4 100644
--- a/crates/dbx-sql-dialect/src/sql_dialect/tests.rs
+++ b/crates/dbx-sql-dialect/src/sql_dialect/tests.rs
@@ -246,7 +246,7 @@ fn maps_table_pagination_strategy_by_database_type() {
assert_eq!(table_pagination_strategy(Some(DatabaseType::OceanbaseOracle)), TablePaginationStrategy::Rownum);
assert_eq!(table_pagination_strategy(Some(DatabaseType::Questdb)), TablePaginationStrategy::QuestDbLimit);
assert_eq!(table_pagination_strategy(Some(DatabaseType::Oracle)), TablePaginationStrategy::Rownum);
- assert_eq!(table_pagination_strategy(Some(DatabaseType::Oscar)), TablePaginationStrategy::Rownum);
+ assert_eq!(table_pagination_strategy(Some(DatabaseType::Oscar)), TablePaginationStrategy::LimitOffset);
assert_eq!(table_pagination_strategy(Some(DatabaseType::Cassandra)), TablePaginationStrategy::AgentMaxRows);
assert_eq!(
pagination_strategy(Some(DatabaseType::Cassandra), PaginationContext::BoundedRead),
@@ -278,6 +278,38 @@ fn maps_table_pagination_strategy_by_database_type() {
assert_eq!(table_pagination_strategy(None), TablePaginationStrategy::LimitOffset);
}
+#[test]
+fn oscar_table_data_pages_use_one_limit_pagination_form_without_rownum() {
+ let options = TableDataSelectSqlOptions {
+ database_type: Some(DatabaseType::Oscar),
+ schema: Some("SYSDBA".to_string()),
+ table_name: "USERS".to_string(),
+ table_type: Some("TABLE".to_string()),
+ primary_keys: vec!["ID".to_string()],
+ columns: vec!["ID".to_string(), "NAME".to_string()],
+ order_by: Some("\"ID\" ASC".to_string()),
+ limit: Some(100),
+ offset: Some(0),
+ ..Default::default()
+ };
+
+ // OSCAR rejects a statement that combines ROWNUM with a LIMIT. The JDBC
+ // agent always caps table-data statements with setMaxRows(), so table
+ // previews must not also wrap the statement in ROWNUM: a later page's
+ // ROWNUM bound (offset + limit) exceeds the driver cap and the server
+ // reports "rownum and limit cannot be mixed" (#13515).
+ let first_page = build_table_data_select_sql(options.clone());
+ assert_eq!(first_page, "SELECT \"ID\", \"NAME\" FROM \"SYSDBA\".\"USERS\" ORDER BY \"ID\" ASC LIMIT 100;");
+ assert!(!first_page.to_ascii_uppercase().contains("ROWNUM"), "{first_page}");
+
+ let second_page = build_table_data_select_sql(TableDataSelectSqlOptions { offset: Some(100), ..options });
+ assert_eq!(
+ second_page,
+ "SELECT \"ID\", \"NAME\" FROM \"SYSDBA\".\"USERS\" ORDER BY \"ID\" ASC LIMIT 100 OFFSET 100;"
+ );
+ assert!(!second_page.to_ascii_uppercase().contains("ROWNUM"), "{second_page}");
+}
+
#[test]
fn cassandra_table_data_pagination_uses_the_agent_cursor() {
for offset in [0, 100, 200] {