Fix parse errors when property pattern is explicit. (#125)

* Fix parse errors when property pattern is explicit. * Fix test for regex datatypes. The regex needs to be declared between quotes, otherwise it will be considered a normal string. * Remove redundant code.
koxudaxi · May 6, 2020 · e979f13 · e979f13
1 parent 8afd441
commit e979f13
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/datamodel_code_generator/model/pydantic/types.py b/datamodel_code_generator/model/pydantic/types.py
@@ -134,6 +134,8 @@ def get_data_float_type(types: Types, **kwargs: Any) -> DataType:
 def get_data_str_type(types: Types, **kwargs: Any) -> DataType:
     data_type_kwargs = transform_kwargs(kwargs, string_kwargs)
     if data_type_kwargs:
+        if 'regex' in data_type_kwargs:
+            data_type_kwargs['regex'] = f'\'{data_type_kwargs["regex"]}\''
         return DataType(
             type='constr',
             is_func=True,

diff --git a/tests/model/pydantic/test_types.py b/tests/model/pydantic/test_types.py
@@ -136,7 +136,7 @@ def test_get_data_float_type(types, params, data_type):
             DataType(
                 type='constr',
                 is_func=True,
-                kwargs={'regex': '^abc'},
+                kwargs={'regex': "'^abc'"},
                 imports_=[IMPORT_CONSTR],
             ),
         ),