Skip to content

More adapter fixes #115

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

Merged
Flux159 merged 1 commit into from
Aug 30, 2025
Merged

More adapter fixes #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 41 additions & 8 deletions src/spanner/adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,8 @@ function cleanParamsForSpanner(
if (!params) return undefined;

const cleaned: Record<string, any> = {};
let hasKeys = false;

for (const key in params) {
if (Object.prototype.hasOwnProperty.call(params, key)) {
const hint = typeHints?.[key];
Expand All @@ -199,9 +201,12 @@ function cleanParamsForSpanner(
} else {
cleaned[key] = params[key];
}
hasKeys = true;
}
}
return cleaned;

// Return undefined if params is empty to avoid sending empty object to Spanner
return hasKeys ? cleaned : undefined;
}

// Helper function to automatically infer Spanner types from JavaScript values
Expand Down Expand Up @@ -488,9 +493,13 @@ export class SpannerAdapter implements DatabaseAdapter {
try {
const updateOptions: any = {
sql,
params: cleanedParams,
};

// Only add params if they exist
if (cleanedParams !== undefined) {
updateOptions.params = cleanedParams;
}

// Add types if provided
if (types) {
updateOptions.types = types;
Expand Down Expand Up @@ -587,10 +596,14 @@ export class SpannerAdapter implements DatabaseAdapter {

const queryOptions: any = {
sql,
params: cleanedParams,
json: true,
};

// Only add params if they exist
if (cleanedParams !== undefined) {
queryOptions.params = cleanedParams;
}

// Add types if provided
if (types) {
queryOptions.types = types;
Expand Down Expand Up @@ -674,10 +687,14 @@ export class SpannerAdapter implements DatabaseAdapter {
try {
const queryOptions: any = {
sql,
params: cleanedParams,
json: true,
};

// Only add params if they exist
if (cleanedParams !== undefined) {
queryOptions.params = cleanedParams;
}

// Add types if provided
if (types) {
queryOptions.types = types;
Expand Down Expand Up @@ -753,9 +770,13 @@ export class SpannerAdapter implements DatabaseAdapter {

const updateOptions: any = {
sql: sqlCmd,
params: cleanedParams,
};

// Only add params if they exist
if (cleanedParams !== undefined) {
updateOptions.params = cleanedParams;
}

// Add types if provided
if (types) {
updateOptions.types = types;
Expand Down Expand Up @@ -789,10 +810,14 @@ export class SpannerAdapter implements DatabaseAdapter {

const queryOptions: any = {
sql: sqlQuery,
params: cleanedParams,
json: true,
};

// Only add params if they exist
if (cleanedParams !== undefined) {
queryOptions.params = cleanedParams;
}

// Add types if provided
if (types) {
queryOptions.types = types;
Expand Down Expand Up @@ -852,9 +877,13 @@ export class SpannerAdapter implements DatabaseAdapter {

const updateOptions: any = {
sql: cmdSql,
params: cleanedParams,
};

// Only add params if they exist
if (cleanedParams !== undefined) {
updateOptions.params = cleanedParams;
}

// Add types if provided
if (types) {
updateOptions.types = types;
Expand Down Expand Up @@ -885,10 +914,14 @@ export class SpannerAdapter implements DatabaseAdapter {

const queryOptions: any = {
sql: querySql,
params: cleanedParams,
json: true,
};

// Only add params if they exist
if (cleanedParams !== undefined) {
queryOptions.params = cleanedParams;
}

// Add types if provided
if (types) {
queryOptions.types = types;
Expand Down
49 changes: 41 additions & 8 deletions test/spanner/adapter-type-hints.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ class TestableSpannerAdapter {
if (!params) return undefined;

const cleaned: Record<string, any> = {};
let hasKeys = false;

for (const key in params) {
if (Object.prototype.hasOwnProperty.call(params, key)) {
const hint = typeHints?.[key];
Expand All @@ -121,9 +123,12 @@ class TestableSpannerAdapter {
} else {
cleaned[key] = params[key];
}
hasKeys = true;
}
}
return cleaned;

// Return undefined if params is empty to avoid sending empty object to Spanner
return hasKeys ? cleaned : undefined;
}

// Helper function to automatically infer Spanner types from JavaScript values
Expand Down Expand Up @@ -213,10 +218,14 @@ class TestableSpannerAdapter {

const queryOptions: any = {
sql,
params: cleanedParams,
json: true,
};

// Only add params if they exist
if (cleanedParams !== undefined) {
queryOptions.params = cleanedParams;
}

// Add types if provided or inferred
if (mergedHints) {
queryOptions.types = mergedHints;
Expand Down Expand Up @@ -244,9 +253,13 @@ class TestableSpannerAdapter {
async (transaction: any) => {
const updateOptions: any = {
sql,
params: cleanedParams,
};

// Only add params if they exist
if (cleanedParams !== undefined) {
updateOptions.params = cleanedParams;
}

// Add types if provided or inferred
if (mergedHints) {
updateOptions.types = mergedHints;
Expand Down Expand Up @@ -278,10 +291,14 @@ class TestableSpannerAdapter {
async (transaction: any) => {
const queryOptions: any = {
sql,
params: cleanedParams,
json: true,
};

// Only add params if they exist
if (cleanedParams !== undefined) {
queryOptions.params = cleanedParams;
}

// Add types if provided or inferred
if (mergedHints) {
queryOptions.types = mergedHints;
Expand Down Expand Up @@ -311,9 +328,13 @@ class TestableSpannerAdapter {
const cleanedParams = this.cleanParamsForSpanner(paramsCmd, mergedHints);
const updateOptions: any = {
sql: sqlCmd,
params: cleanedParams,
};

// Only add params if they exist
if (cleanedParams !== undefined) {
updateOptions.params = cleanedParams;
}

if (mergedHints) {
updateOptions.types = mergedHints;
updateOptions.paramTypes = mergedHints;
Expand All @@ -331,10 +352,14 @@ class TestableSpannerAdapter {
const cleanedParams = this.cleanParamsForSpanner(paramsQuery, mergedHints);
const queryOptions: any = {
sql: sqlQuery,
params: cleanedParams,
json: true,
};

// Only add params if they exist
if (cleanedParams !== undefined) {
queryOptions.params = cleanedParams;
}

if (mergedHints) {
queryOptions.types = mergedHints;
queryOptions.paramTypes = mergedHints;
Expand Down Expand Up @@ -368,9 +393,13 @@ class TestableSpannerAdapter {
const cleanedParams = this.cleanParamsForSpanner(cmdParams, mergedHints);
const updateOptions: any = {
sql: cmdSql,
params: cleanedParams,
};

// Only add params if they exist
if (cleanedParams !== undefined) {
updateOptions.params = cleanedParams;
}

if (mergedHints) {
updateOptions.types = mergedHints;
updateOptions.paramTypes = mergedHints;
Expand All @@ -388,10 +417,14 @@ class TestableSpannerAdapter {
const cleanedParams = this.cleanParamsForSpanner(queryParams, mergedHints);
const queryOptions: any = {
sql: querySql,
params: cleanedParams,
json: true,
};

// Only add params if they exist
if (cleanedParams !== undefined) {
queryOptions.params = cleanedParams;
}

if (mergedHints) {
queryOptions.types = mergedHints;
queryOptions.paramTypes = mergedHints;
Expand Down