mirror of
https://github.com/dadosfera/maestro.git
synced 2026-09-30 20:19:07 +00:00
Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
110021ac24 | ||
|
|
84218c128a | ||
|
|
d642a8d823 | ||
|
|
740540d4dc |
@@ -65,7 +65,7 @@ describe('ConnectionTestService catalog cache', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('maps cached columns to the existing table metadata contract', async () => {
|
it('maps cached columns and derives references from the engine allowlist', async () => {
|
||||||
connectionsApiService.proxy.mockResolvedValue({
|
connectionsApiService.proxy.mockResolvedValue({
|
||||||
columns: [
|
columns: [
|
||||||
{
|
{
|
||||||
@@ -73,6 +73,16 @@ describe('ConnectionTestService catalog cache', () => {
|
|||||||
data_type: 'bigint',
|
data_type: 'bigint',
|
||||||
is_primary_key: true,
|
is_primary_key: true,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
column_name: 'name',
|
||||||
|
data_type: 'varchar',
|
||||||
|
is_primary_key: false,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
platformApiService.proxy.mockResolvedValue({
|
||||||
|
allowed_datatypes: [
|
||||||
|
{ engine: 'postgresql', allowed_datatypes: ['bigint', 'timestamp'] },
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -92,13 +102,10 @@ describe('ConnectionTestService catalog cache', () => {
|
|||||||
{
|
{
|
||||||
table_name: 'customers',
|
table_name: 'customers',
|
||||||
columns: [
|
columns: [
|
||||||
{
|
{ name: 'id', type: 'bigint', is_primary_key: true },
|
||||||
name: 'id',
|
{ name: 'name', type: 'varchar', is_primary_key: false },
|
||||||
type: 'bigint',
|
|
||||||
is_primary_key: true,
|
|
||||||
},
|
|
||||||
],
|
],
|
||||||
references: [],
|
references: [{ name: 'id', type: 'bigint', is_primary_key: true }],
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
@@ -107,6 +114,39 @@ describe('ConnectionTestService catalog cache', () => {
|
|||||||
'/connection_catalog/config-id/schemas/public/tables/customers/columns',
|
'/connection_catalog/config-id/schemas/public/tables/customers/columns',
|
||||||
user,
|
user,
|
||||||
);
|
);
|
||||||
|
expect(platformApiService.proxy).toHaveBeenCalledWith(
|
||||||
|
'GET',
|
||||||
|
'/jobs/jdbc/configs/allowed_datatypes',
|
||||||
|
user,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns empty references when the allowlist call fails', async () => {
|
||||||
|
connectionsApiService.proxy.mockResolvedValue({
|
||||||
|
columns: [{ column_name: 'id', data_type: 'bigint', is_primary_key: true }],
|
||||||
|
});
|
||||||
|
platformApiService.proxy.mockRejectedValue(new Error('platform down'));
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.getTableMetadata(
|
||||||
|
{
|
||||||
|
connection_id: 'config-id',
|
||||||
|
plugin: 'postgresql',
|
||||||
|
schema: 'public',
|
||||||
|
table_list: ['customers'],
|
||||||
|
},
|
||||||
|
user,
|
||||||
|
),
|
||||||
|
).resolves.toEqual({
|
||||||
|
operation_result: true,
|
||||||
|
tables_metadata: [
|
||||||
|
{
|
||||||
|
table_name: 'customers',
|
||||||
|
columns: [{ name: 'id', type: 'bigint', is_primary_key: true }],
|
||||||
|
references: [],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('submits a catalog refresh without holding the request open', async () => {
|
it('submits a catalog refresh without holding the request open', async () => {
|
||||||
|
|||||||
@@ -187,6 +187,20 @@ export class ConnectionTestService {
|
|||||||
body: GetTableMetadataReq,
|
body: GetTableMetadataReq,
|
||||||
user: RequestUser,
|
user: RequestUser,
|
||||||
): Promise<GetTableMetadataRes> {
|
): Promise<GetTableMetadataRes> {
|
||||||
|
// Columns eligible as the incremental reference field are the ones whose
|
||||||
|
// data type is allowed for this engine (e.g. int/date/timestamp). The
|
||||||
|
// allowlist is owned by the platform API, keyed by engine === plugin.
|
||||||
|
const allowedByEngine = await this.platformApiService
|
||||||
|
.proxy('GET', '/jobs/jdbc/configs/allowed_datatypes', user)
|
||||||
|
.catch(() => null);
|
||||||
|
const allowedDataTypes: string[] =
|
||||||
|
allowedByEngine?.allowed_datatypes?.find(
|
||||||
|
(datatypes) => datatypes.engine === body.plugin,
|
||||||
|
)?.allowed_datatypes ?? [];
|
||||||
|
const allowedSet = new Set(
|
||||||
|
allowedDataTypes.map((type) => type.toLowerCase()),
|
||||||
|
);
|
||||||
|
|
||||||
const tables_metadata = await Promise.all(
|
const tables_metadata = await Promise.all(
|
||||||
body.table_list.map(async (table_name) => {
|
body.table_list.map(async (table_name) => {
|
||||||
const result = await this.connectionsApiService.proxy(
|
const result = await this.connectionsApiService.proxy(
|
||||||
@@ -196,14 +210,18 @@ export class ConnectionTestService {
|
|||||||
`/tables/${encodeURIComponent(table_name)}/columns`,
|
`/tables/${encodeURIComponent(table_name)}/columns`,
|
||||||
user,
|
user,
|
||||||
);
|
);
|
||||||
|
const columns = result.columns.map((column) => ({
|
||||||
|
name: column.column_name,
|
||||||
|
type: column.data_type,
|
||||||
|
is_primary_key: column.is_primary_key,
|
||||||
|
}));
|
||||||
|
const references = columns.filter((column) =>
|
||||||
|
allowedSet.has(String(column.type).toLowerCase()),
|
||||||
|
);
|
||||||
return {
|
return {
|
||||||
table_name,
|
table_name,
|
||||||
columns: result.columns.map((column) => ({
|
columns,
|
||||||
name: column.column_name,
|
references,
|
||||||
type: column.data_type,
|
|
||||||
is_primary_key: column.is_primary_key,
|
|
||||||
})),
|
|
||||||
references: [],
|
|
||||||
};
|
};
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user