Address comments

wlliu · wlliu · commit 0196241f8b40 · 2022-10-03T14:42:32.000-07:00
diff --git a/spanner_orm/field.py b/spanner_orm/field.py
@@ -320,13 +320,13 @@ def field_type_from_ddl(ddl: str) -> FieldType:
     return Float()
   elif ddl == 'STRING(MAX)':
     return String()
-  elif (match := re.fullmatch(r'STRING\((([0-9]+))\)', ddl)) is not None:
+  elif (match := re.fullmatch(r'STRING\(([0-9]+)\)', ddl)) is not None:
     return String(int(match.group(1)))
   elif ddl == 'TIMESTAMP':
     return Timestamp()
   elif ddl == 'BYTES(MAX)':
     return BytesBase64()
-  elif (match := re.fullmatch(r'BYTES\((([0-9]+))\)', ddl)) is not None:
+  elif (match := re.fullmatch(r'BYTES\(([0-9]+)\)', ddl)) is not None:
     return BytesBase64(int(match.group(1)))
   elif (match := re.fullmatch(r'ARRAY<(.*)>', ddl)) is not None:
     return Array(field_type_from_ddl(match.group(1)))
diff --git a/spanner_orm/tests/field_test.py b/spanner_orm/tests/field_test.py
@@ -117,7 +117,7 @@ def test_field_type_validate_type_error(
       (field.Boolean(), field.Boolean(), True),
       (field.Boolean(), field.String(), False),
       (field.String(10), field.String(20), True),
-      (field.String(), field.String(), True),
+      (field.String(), field.String(10), True),
       (field.Array(field.Integer()), field.Array(field.Integer()), False),
       (field.Array(field.Integer()), field.Integer(), False),
   )

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ def test_field_type_validate_type_error(`
`117`	`117`	`(field.Boolean(), field.Boolean(), True),`
`118`	`118`	`(field.Boolean(), field.String(), False),`
`119`	`119`	`(field.String(10), field.String(20), True),`
`120`		`- (field.String(), field.String(), True),`
	`120`	`+ (field.String(), field.String(10), True),`
`121`	`121`	`(field.Array(field.Integer()), field.Array(field.Integer()), False),`
`122`	`122`	`(field.Array(field.Integer()), field.Integer(), False),`
`123`	`123`	`)`