fix: Parsing for qualifiers with colon characters (#1277)

* Fix parsing for qualifiers with colon characters * Update ci.yaml * fix: Support names with no qualifier * revert: remove workflow_dispatch * fix: Update test to check null qualifiers instead of undefined * fix: Respect column names without qualifiers * fix: Clean up for lint errors * fix: Remove remaining trailing space * revert: "fix: Update test to check null qualifiers instead of undefined" This reverts commit 1275dd5. * fix: Allow undefined qualifiers in ParsedColumn * test: Add test for qualifier names with colons --------- Co-authored-by: danieljbruce <[email protected]>
googleapis · May 24, 2023 · b80f533 · b80f533
1 parent 5c7c5ae
commit b80f533
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/mutation.ts b/src/mutation.ts
@@ -32,7 +32,7 @@ export type Value = string | number | boolean;
 
 export interface ParsedColumn {
  family: string | null;
- qualifier: string | null;
+ qualifier: string | null | undefined;
 }
 export interface ConvertFromBytesOptions {
  userOptions?: ConvertFromBytesUserOptions;
@@ -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: undefined,
+ };
+ }
 
  return {
- family: parts[0],
- qualifier: parts[1],
+ family: columnName.slice(0, colonIdx),
+ qualifier: columnName.slice(colonIdx + 1),
  };
  }
 

diff --git a/test/mutation.ts b/test/mutation.ts
@@ -465,6 +465,13 @@ describe('Bigtable/Mutation', () => {
  assert.strictEqual(parsed.family, 'a');
  assert.strictEqual(parsed.qualifier, undefined);
  });
+
+ it('should parse a qualifier name with colons', () => {
+ const parsed = Mutation.parseColumnName('a:b:c');
+
+ assert.strictEqual(parsed.family, 'a');
+ assert.strictEqual(parsed.qualifier, 'b:c');
+ });
  });
 
  describe('toProto', () => {