Skip to content
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

Jump to bottom

fix: Parsing for qualifiers with colon characters #1277

Merged
merged 13 commits into from
May 24, 2023
Merged

fix: Parsing for qualifiers with colon characters #1277

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
05bd487
Fix parsing for qualifiers with colon characters
KDB223 May 12, 2023
2af973f
Update ci.yaml
KDB223 May 12, 2023
083c619
fix: Support names with no qualifier
KDB223 May 12, 2023
c54a84e
revert: remove workflow_dispatch
KDB223 May 12, 2023
1275dd5
fix: Update test to check null qualifiers instead of undefined
KDB223 May 12, 2023
96cc9bb
fix: Respect column names without qualifiers
KDB223 May 12, 2023
e982463
fix: Clean up for lint errors
KDB223 May 15, 2023
4a8f4c3
fix: Remove remaining trailing space
KDB223 May 15, 2023
39fdf60
revert: "fix: Update test to check null qualifiers instead of undefined"
KDB223 May 17, 2023
4c76fff
fix: Allow undefined qualifiers in ParsedColumn
KDB223 May 17, 2023
26df87e
test: Add test for qualifier names with colons
KDB223 May 17, 2023
92e15be
Merge branch 'main' into main
KDB223 May 21, 2023
2ad8883
Merge branch 'main' into main
danieljbruce May 23, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/mutation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,11 +380,19 @@ export class Mutation {
* @private
*/
static parseColumnName(columnName: string): ParsedColumn {
const parts = columnName.split(':');
const colonIdx = columnName.indexOf(':');

if (colonIdx === -1) {
// columnName does not contain ':'
return {
family: columnName,
qualifier: null,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recommend setting qualifier to undefined so that this code works the same way as before when the string doesn't contain a colon.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried that too, however the ParsedColumn interface does not declare undefined as an acceptable type for qualifier at https://github.com/googleapis/nodejs-bigtable/blob/main/src/mutation.ts#L35.

Adding undefined here would solve this:

export interface ParsedColumn {
  family: string | null;
  qualifier: string | null | undefined;
}
};
}

return {
family: parts[0],
qualifier: parts[1],
family: columnName.slice(0, colonIdx),
qualifier: columnName.slice(colonIdx + 1),
};
}

Expand Down
2 changes: 1 addition & 1 deletion test/mutation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ describe('Bigtable/Mutation', () => {
const parsed = Mutation.parseColumnName('a');

assert.strictEqual(parsed.family, 'a');
assert.strictEqual(parsed.qualifier, undefined);
assert.strictEqual(parsed.qualifier, null);
});
});

Expand Down
Loading