14 files changed
+58
-13
No files matched your search
@@ -2270,6 +2270,7 @@ watch(
|
|||||||
redis_key_separator: config.redis_key_separator ?? ":",
|
redis_key_separator: config.redis_key_separator ?? ":",
|
||||||
redis_scan_page_size: config.redis_scan_page_size ?? REDIS_SCAN_PAGE_SIZE_DEFAULT,
|
redis_scan_page_size: config.redis_scan_page_size ?? REDIS_SCAN_PAGE_SIZE_DEFAULT,
|
||||||
etcd_endpoints: config.etcd_endpoints || "",
|
etcd_endpoints: config.etcd_endpoints || "",
|
||||||
|
gbase_server: config.gbase_server || "",
|
||||||
informix_server: config.informix_server || "",
|
informix_server: config.informix_server || "",
|
||||||
external_config: config.external_config,
|
external_config: config.external_config,
|
||||||
attached_databases: config.attached_databases || [],
|
attached_databases: config.attached_databases || [],
|
||||||
|
|||||||
@@ -4576,6 +4576,7 @@ async function applyOrderBySearch() {
|
|||||||
if (!tableMeta) return;
|
if (!tableMeta) return;
|
||||||
const sql = await buildTableSelectSql({
|
const sql = await buildTableSelectSql({
|
||||||
databaseType: resolvedDatabaseType.value,
|
databaseType: resolvedDatabaseType.value,
|
||||||
|
driverProfile: props.connectionId ? connectionStore.getConfig(props.connectionId)?.driver_profile : undefined,
|
||||||
identifierQuote: connectionStore.connectionIdentifierQuote?.(props.connectionId),
|
identifierQuote: connectionStore.connectionIdentifierQuote?.(props.connectionId),
|
||||||
catalog: tableMeta.catalog,
|
catalog: tableMeta.catalog,
|
||||||
database: tableMeta.database,
|
database: tableMeta.database,
|
||||||
@@ -4610,6 +4611,7 @@ async function applyWhereFilter() {
|
|||||||
if (!tableMeta) return;
|
if (!tableMeta) return;
|
||||||
const sql = await buildTableSelectSql({
|
const sql = await buildTableSelectSql({
|
||||||
databaseType: resolvedDatabaseType.value,
|
databaseType: resolvedDatabaseType.value,
|
||||||
|
driverProfile: props.connectionId ? connectionStore.getConfig(props.connectionId)?.driver_profile : undefined,
|
||||||
identifierQuote: connectionStore.connectionIdentifierQuote?.(props.connectionId),
|
identifierQuote: connectionStore.connectionIdentifierQuote?.(props.connectionId),
|
||||||
catalog: tableMeta.catalog,
|
catalog: tableMeta.catalog,
|
||||||
database: tableMeta.database,
|
database: tableMeta.database,
|
||||||
|
|||||||
@@ -1179,6 +1179,7 @@ async function openNewQuery(row: ObjectBrowserRow) {
|
|||||||
tabId,
|
tabId,
|
||||||
await buildTableSelectSql({
|
await buildTableSelectSql({
|
||||||
databaseType: effectiveDatabaseType.value,
|
databaseType: effectiveDatabaseType.value,
|
||||||
|
driverProfile: props.connection.driver_profile,
|
||||||
identifierQuote: connectionStore.connectionIdentifierQuote?.(props.connection.id),
|
identifierQuote: connectionStore.connectionIdentifierQuote?.(props.connection.id),
|
||||||
catalog: props.catalog,
|
catalog: props.catalog,
|
||||||
database: props.database,
|
database: props.database,
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ export function useDataGridActions(activeTab: ComputedRef<QueryTab | undefined>)
|
|||||||
const realColumns = tab.tableMeta?.columns.length ? tab.tableMeta.columns : undefined;
|
const realColumns = tab.tableMeta?.columns.length ? tab.tableMeta.columns : undefined;
|
||||||
return buildTableSelectSql({
|
return buildTableSelectSql({
|
||||||
databaseType: effectiveDbType,
|
databaseType: effectiveDbType,
|
||||||
|
driverProfile: config?.driver_profile,
|
||||||
identifierQuote: connectionStore.connectionIdentifierQuote?.(tab.connectionId),
|
identifierQuote: connectionStore.connectionIdentifierQuote?.(tab.connectionId),
|
||||||
database: tableMeta?.database,
|
database: tableMeta?.database,
|
||||||
schema: tableMeta?.schema,
|
schema: tableMeta?.schema,
|
||||||
|
|||||||
@@ -109,6 +109,7 @@ async function openTableTarget(target: NavigationTarget, options: { tableInfoTab
|
|||||||
const primaryKeys = editableRowIdentifierColumns(effectiveDbType, columns, undefined, targetTableType);
|
const primaryKeys = editableRowIdentifierColumns(effectiveDbType, columns, undefined, targetTableType);
|
||||||
const sql = await buildTableSelectSql({
|
const sql = await buildTableSelectSql({
|
||||||
databaseType: effectiveDbType,
|
databaseType: effectiveDbType,
|
||||||
|
driverProfile: config.driver_profile,
|
||||||
identifierQuote,
|
identifierQuote,
|
||||||
schema: tableSchema,
|
schema: tableSchema,
|
||||||
catalog: target.catalog,
|
catalog: target.catalog,
|
||||||
@@ -137,6 +138,7 @@ async function openTableTarget(target: NavigationTarget, options: { tableInfoTab
|
|||||||
}
|
}
|
||||||
const sql = await buildTableSelectSql({
|
const sql = await buildTableSelectSql({
|
||||||
databaseType: effectiveDbType,
|
databaseType: effectiveDbType,
|
||||||
|
driverProfile: config.driver_profile,
|
||||||
identifierQuote,
|
identifierQuote,
|
||||||
schema: tableSchema,
|
schema: tableSchema,
|
||||||
catalog: target.catalog,
|
catalog: target.catalog,
|
||||||
@@ -180,6 +182,7 @@ async function openTableTarget(target: NavigationTarget, options: { tableInfoTab
|
|||||||
if (fellBackToLimitZero) {
|
if (fellBackToLimitZero) {
|
||||||
const emptySql = await buildTableSelectSql({
|
const emptySql = await buildTableSelectSql({
|
||||||
databaseType: effectiveDbType,
|
databaseType: effectiveDbType,
|
||||||
|
driverProfile: config.driver_profile,
|
||||||
identifierQuote,
|
identifierQuote,
|
||||||
schema: tableSchema,
|
schema: tableSchema,
|
||||||
catalog: target.catalog,
|
catalog: target.catalog,
|
||||||
@@ -224,6 +227,7 @@ async function openTableTarget(target: NavigationTarget, options: { tableInfoTab
|
|||||||
if (!fellBackToLimitZero && !firstQueryFailed && (useRowId || config.db_type === "tdengine")) {
|
if (!fellBackToLimitZero && !firstQueryFailed && (useRowId || config.db_type === "tdengine")) {
|
||||||
const newSql = await buildTableSelectSql({
|
const newSql = await buildTableSelectSql({
|
||||||
databaseType: effectiveDbType,
|
databaseType: effectiveDbType,
|
||||||
|
driverProfile: config.driver_profile,
|
||||||
identifierQuote,
|
identifierQuote,
|
||||||
schema: tableSchema,
|
schema: tableSchema,
|
||||||
catalog: target.catalog,
|
catalog: target.catalog,
|
||||||
|
|||||||
@@ -307,6 +307,7 @@ export function useSidebarDataOpenRuntime() {
|
|||||||
const includeRowId = usesSyntheticRowIdKey(effectiveDbType, primaryKeys, tableType);
|
const includeRowId = usesSyntheticRowIdKey(effectiveDbType, primaryKeys, tableType);
|
||||||
const sql = await buildTableSelectSql({
|
const sql = await buildTableSelectSql({
|
||||||
databaseType: effectiveDbType,
|
databaseType: effectiveDbType,
|
||||||
|
driverProfile: config?.driver_profile,
|
||||||
identifierQuote: connectionStore.connectionIdentifierQuote?.(node.connectionId),
|
identifierQuote: connectionStore.connectionIdentifierQuote?.(node.connectionId),
|
||||||
schema: tableSchema,
|
schema: tableSchema,
|
||||||
database: node.database,
|
database: node.database,
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
import { readFileSync } from "node:fs";
|
||||||
|
import { describe, expect, it } from "vitest";
|
||||||
|
|
||||||
|
const dialogSource = readFileSync(new URL("../../../components/connection/ConnectionDialog.vue", import.meta.url), "utf8");
|
||||||
|
|
||||||
|
describe("GBase 8s connection dialog", () => {
|
||||||
|
it("hydrates DBSERVERNAME when editing a saved connection", () => {
|
||||||
|
expect(dialogSource).toContain('gbase_server: config.gbase_server || ""');
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -35,13 +35,13 @@ describe("qualifiedTableName — SQLite attached databases", () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
describe("qualifiedTableName — GBase 8s", () => {
|
describe("qualifiedTableName — GBase 8s", () => {
|
||||||
it("keeps the owner unquoted when the driver reports no identifier quote support", () => {
|
it("omits the metadata owner for GBase 8s table data", () => {
|
||||||
expect(qualifiedTableName({ databaseType: "informix", identifierQuote: "", schema: "gbasedbt", tableName: "connection_smoke" })).toBe("gbasedbt.connection_smoke");
|
expect(qualifiedTableName({ databaseType: "informix", driverProfile: "gbase8s", identifierQuote: "", schema: "gbasedbt", tableName: "connection_smoke" })).toBe("connection_smoke");
|
||||||
expect(quoteTableDataIdentifier("informix", "connection_smoke", "")).toBe("connection_smoke");
|
expect(quoteTableDataIdentifier("informix", "connection_smoke", "")).toBe("connection_smoke");
|
||||||
});
|
});
|
||||||
|
|
||||||
it("keeps native Informix qualification when no driver capability was loaded", () => {
|
it("keeps native Informix owner qualification", () => {
|
||||||
expect(qualifiedTableName({ databaseType: "informix", schema: "gbasedbt", tableName: "connection_smoke" })).toBe("gbasedbt.connection_smoke");
|
expect(qualifiedTableName({ databaseType: "informix", identifierQuote: "", schema: "gbasedbt", tableName: "connection_smoke" })).toBe("gbasedbt.connection_smoke");
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -46,6 +46,7 @@ export interface BuildExportInsertStatementsOptions {
|
|||||||
|
|
||||||
export interface BuildExportPageSqlOptions {
|
export interface BuildExportPageSqlOptions {
|
||||||
databaseType?: DatabaseType;
|
databaseType?: DatabaseType;
|
||||||
|
driverProfile?: string;
|
||||||
identifierQuote?: string;
|
identifierQuote?: string;
|
||||||
schema?: string;
|
schema?: string;
|
||||||
tableName: string;
|
tableName: string;
|
||||||
@@ -79,6 +80,7 @@ export function buildInsertStatements(options: BuildExportInsertStatementsOption
|
|||||||
export async function buildExportPageSql(options: BuildExportPageSqlOptions): Promise<string> {
|
export async function buildExportPageSql(options: BuildExportPageSqlOptions): Promise<string> {
|
||||||
return buildTableSelectSql({
|
return buildTableSelectSql({
|
||||||
databaseType: options.databaseType,
|
databaseType: options.databaseType,
|
||||||
|
driverProfile: options.driverProfile,
|
||||||
identifierQuote: options.identifierQuote,
|
identifierQuote: options.identifierQuote,
|
||||||
schema: options.schema,
|
schema: options.schema,
|
||||||
tableName: options.tableName,
|
tableName: options.tableName,
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { isExplicitlyQuotedSqlIdentifier, quoteGaussDbJdbcIdentifier } from "@/l
|
|||||||
|
|
||||||
export interface BuildTableSelectSqlOptions {
|
export interface BuildTableSelectSqlOptions {
|
||||||
databaseType?: DatabaseType;
|
databaseType?: DatabaseType;
|
||||||
|
driverProfile?: string;
|
||||||
identifierQuote?: string;
|
identifierQuote?: string;
|
||||||
schema?: string;
|
schema?: string;
|
||||||
tableName: string;
|
tableName: string;
|
||||||
@@ -50,8 +51,11 @@ function quoteCypherIdentifier(name: string): string {
|
|||||||
return `\`${name.replace(/`/g, "``")}\``;
|
return `\`${name.replace(/`/g, "``")}\``;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function qualifiedTableName(options: Pick<BuildTableSelectSqlOptions, "databaseType" | "identifierQuote" | "schema" | "tableName" | "catalog" | "database">): string {
|
export function qualifiedTableName(options: Pick<BuildTableSelectSqlOptions, "databaseType" | "driverProfile" | "identifierQuote" | "schema" | "tableName" | "catalog" | "database">): string {
|
||||||
const { databaseType, identifierQuote, schema, tableName, catalog, database } = options;
|
const { databaseType, driverProfile, identifierQuote, schema, tableName, catalog, database } = options;
|
||||||
|
if (databaseType === "informix" && driverProfile?.trim().toLowerCase() === "gbase8s") {
|
||||||
|
return quoteTableDataIdentifier(databaseType, tableName, identifierQuote);
|
||||||
|
}
|
||||||
// Doris / StarRocks multi-catalog: address external-catalog tables with the
|
// Doris / StarRocks multi-catalog: address external-catalog tables with the
|
||||||
// 3-part `catalog.database.table` form, which the engines accept directly.
|
// 3-part `catalog.database.table` form, which the engines accept directly.
|
||||||
if (catalog && catalog !== "internal" && (databaseType === "doris" || databaseType === "starrocks")) {
|
if (catalog && catalog !== "internal" && (databaseType === "doris" || databaseType === "starrocks")) {
|
||||||
|
|||||||
@@ -2383,6 +2383,7 @@ export const useQueryStore = defineStore("query", () => {
|
|||||||
try {
|
try {
|
||||||
const sql = await buildTableSelectSql({
|
const sql = await buildTableSelectSql({
|
||||||
databaseType: effectiveDbType,
|
databaseType: effectiveDbType,
|
||||||
|
driverProfile: conn?.driver_profile,
|
||||||
identifierQuote,
|
identifierQuote,
|
||||||
database: tableMeta.database,
|
database: tableMeta.database,
|
||||||
schema: tableMeta.schema,
|
schema: tableMeta.schema,
|
||||||
@@ -5098,6 +5099,7 @@ export const useQueryStore = defineStore("query", () => {
|
|||||||
while (true) {
|
while (true) {
|
||||||
const sql = await api.buildTableSelectSql({
|
const sql = await api.buildTableSelectSql({
|
||||||
databaseType: effectiveDbType,
|
databaseType: effectiveDbType,
|
||||||
|
driverProfile: conn?.driver_profile,
|
||||||
identifierQuote,
|
identifierQuote,
|
||||||
database: tableMeta.database,
|
database: tableMeta.database,
|
||||||
schema: tableMeta.schema,
|
schema: tableMeta.schema,
|
||||||
|
|||||||
@@ -21,6 +21,13 @@ pub fn build_count_table_sql(database_type: Option<DatabaseType>, schema: Option
|
|||||||
|
|
||||||
pub fn build_table_data_select_sql(options: TableDataSelectSqlOptions) -> String {
|
pub fn build_table_data_select_sql(options: TableDataSelectSqlOptions) -> String {
|
||||||
let database_type = options.database_type;
|
let database_type = options.database_type;
|
||||||
|
let schema = if database_type == Some(DatabaseType::Informix)
|
||||||
|
&& options.driver_profile.as_deref().is_some_and(|profile| profile.eq_ignore_ascii_case("gbase8s"))
|
||||||
|
{
|
||||||
|
None
|
||||||
|
} else {
|
||||||
|
options.schema.as_deref()
|
||||||
|
};
|
||||||
let limit = options.limit.unwrap_or(100);
|
let limit = options.limit.unwrap_or(100);
|
||||||
if database_type == Some(DatabaseType::Neo4j) {
|
if database_type == Some(DatabaseType::Neo4j) {
|
||||||
return build_neo4j_table_select_sql(&options, limit);
|
return build_neo4j_table_select_sql(&options, limit);
|
||||||
@@ -31,17 +38,12 @@ pub fn build_table_data_select_sql(options: TableDataSelectSqlOptions) -> String
|
|||||||
|
|
||||||
// Doris / StarRocks multi-catalog: prefix the catalog for external-catalog tables.
|
// Doris / StarRocks multi-catalog: prefix the catalog for external-catalog tables.
|
||||||
let table = if uses_connection_identifier_quote(database_type, options.identifier_quote.as_deref()) {
|
let table = if uses_connection_identifier_quote(database_type, options.identifier_quote.as_deref()) {
|
||||||
table_data_qualified_table_name(
|
table_data_qualified_table_name(database_type, schema, &options.table_name, options.identifier_quote.as_deref())
|
||||||
database_type,
|
|
||||||
options.schema.as_deref(),
|
|
||||||
&options.table_name,
|
|
||||||
options.identifier_quote.as_deref(),
|
|
||||||
)
|
|
||||||
} else {
|
} else {
|
||||||
qualified_table_name_with_catalog(
|
qualified_table_name_with_catalog(
|
||||||
database_type,
|
database_type,
|
||||||
options.catalog.as_deref(),
|
options.catalog.as_deref(),
|
||||||
options.schema.as_deref(),
|
schema,
|
||||||
options.database.as_deref(),
|
options.database.as_deref(),
|
||||||
&options.table_name,
|
&options.table_name,
|
||||||
)
|
)
|
||||||
@@ -502,6 +504,7 @@ mod tests {
|
|||||||
) -> TableDataSelectSqlOptions {
|
) -> TableDataSelectSqlOptions {
|
||||||
TableDataSelectSqlOptions {
|
TableDataSelectSqlOptions {
|
||||||
database_type: Some(database_type),
|
database_type: Some(database_type),
|
||||||
|
driver_profile: None,
|
||||||
identifier_quote: None,
|
identifier_quote: None,
|
||||||
schema: None,
|
schema: None,
|
||||||
table_name: table.to_string(),
|
table_name: table.to_string(),
|
||||||
|
|||||||
@@ -370,6 +370,18 @@ fn builds_table_data_where_and_schema_queries() {
|
|||||||
}),
|
}),
|
||||||
"SELECT * FROM \"App Schema\".\"ANALYZE\" LIMIT 100;"
|
"SELECT * FROM \"App Schema\".\"ANALYZE\" LIMIT 100;"
|
||||||
);
|
);
|
||||||
|
assert_eq!(
|
||||||
|
build_table_data_select_sql(TableDataSelectSqlOptions {
|
||||||
|
database_type: Some(DatabaseType::Informix),
|
||||||
|
driver_profile: Some("gbase8s".to_string()),
|
||||||
|
identifier_quote: Some(String::new()),
|
||||||
|
schema: Some("gbasedbt".to_string()),
|
||||||
|
table_name: "connection_smoke".to_string(),
|
||||||
|
limit: Some(100),
|
||||||
|
..Default::default()
|
||||||
|
}),
|
||||||
|
"SELECT FIRST 100 * FROM connection_smoke"
|
||||||
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
build_table_data_select_sql(TableDataSelectSqlOptions {
|
build_table_data_select_sql(TableDataSelectSqlOptions {
|
||||||
database_type: Some(DatabaseType::Informix),
|
database_type: Some(DatabaseType::Informix),
|
||||||
|
|||||||
@@ -22,6 +22,8 @@ pub struct TableDataSelectSqlOptions {
|
|||||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||||
pub database_type: Option<DatabaseType>,
|
pub database_type: Option<DatabaseType>,
|
||||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||||
|
pub driver_profile: Option<String>,
|
||||||
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||||
pub identifier_quote: Option<String>,
|
pub identifier_quote: Option<String>,
|
||||||
#[serde(default, skip_serializing_if = "Option::is_none")]
|
#[serde(default, skip_serializing_if = "Option::is_none")]
|
||||||
pub schema: Option<String>,
|
pub schema: Option<String>,
|
||||||
|
|||||||
Reference in new issue
Block a user