From a81b610efb4499c0229ab5be5ffdd221dccad656 Mon Sep 17 00:00:00 2001 From: AmaseCocoa Date: Fri, 9 Aug 2024 20:10:02 +0900 Subject: [PATCH 1/3] Added test if pyproject.toml exists --- tests/test_config.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/test_config.py b/tests/test_config.py index c5fe9386f..b78620c1f 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -40,6 +40,22 @@ def test_no_file(testdir: Testdir) -> None: config = Config.load(path) assert isinstance(config.prisma_version, str) +def test_with_file(testdir: Testdir) -> None: + """Can works config from pyproject.toml successfully""" + path = Path('pyproject.toml') + testdir.makefile( + '.toml', + pyproject=dedent( + """ + [tool.prisma] + prisma_version = '~' + """ + ), + ) + + assert path.exists() + config = Config.load(path) + assert config.home_dir == '~' def test_loading(testdir: Testdir) -> None: """Config loading overrides defaults""" From 423f3217994a373857be56d55080cc8392c40760 Mon Sep 17 00:00:00 2001 From: AmaseCocoa Date: Fri, 9 Aug 2024 20:16:57 +0900 Subject: [PATCH 2/3] Revert "Added test if pyproject.toml exists" This reverts commit a81b610efb4499c0229ab5be5ffdd221dccad656. --- tests/test_config.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/tests/test_config.py b/tests/test_config.py index b78620c1f..c5fe9386f 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -40,22 +40,6 @@ def test_no_file(testdir: Testdir) -> None: config = Config.load(path) assert isinstance(config.prisma_version, str) -def test_with_file(testdir: Testdir) -> None: - """Can works config from pyproject.toml successfully""" - path = Path('pyproject.toml') - testdir.makefile( - '.toml', - pyproject=dedent( - """ - [tool.prisma] - prisma_version = '~' - """ - ), - ) - - assert path.exists() - config = Config.load(path) - assert config.home_dir == '~' def test_loading(testdir: Testdir) -> None: """Config loading overrides defaults""" From 914df466f80fd1f2be5330f279de4c1714492807 Mon Sep 17 00:00:00 2001 From: AmaseCocoa Date: Sat, 10 Aug 2024 19:15:47 +0900 Subject: [PATCH 3/3] Force packaged_schema.write_text to use utf-8 --- src/prisma/generator/generator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/prisma/generator/generator.py b/src/prisma/generator/generator.py index 2e1aaafba..05561c139 100644 --- a/src/prisma/generator/generator.py +++ b/src/prisma/generator/generator.py @@ -238,7 +238,7 @@ def generate(self, data: PythonData) -> None: # package so we can use it to instantiate the query engine packaged_schema = rootdir / 'schema.prisma' if not is_same_path(data.schema_path, packaged_schema): - packaged_schema.write_text(data.datamodel) + packaged_schema.write_text(data.datamodel, encoding='utf-8') params = data.to_params()