allow comments in datasources and generators

prisma · Mar 24, 2020 · 8cec25a · 8cec25a
1 parent 89d2f3b
commit 8cec25a
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 11 deletions.
diff --git a/libs/datamodel/core/src/ast/parser/datamodel.pest b/libs/datamodel/core/src/ast/parser/datamodel.pest
@@ -116,12 +116,12 @@ enum_declaration = { doc_comment* ~ ENUM_KEYWORD ~ identifier ~ BLOCK_OPEN ~ (en
 // Source block
 // ######################################
 key_value = { identifier ~ "=" ~ expression ~ NEWLINE }
-source_block = { doc_comment* ~ DATASOURCE_KEYWORD ~ identifier ~ BLOCK_OPEN ~ key_value* ~ BLOCK_CLOSE }
+source_block = { doc_comment* ~ DATASOURCE_KEYWORD ~ identifier ~ BLOCK_OPEN ~ (key_value | doc_comment)* ~ BLOCK_CLOSE }
 
 // ######################################
 // Generator block
 // ######################################
-generator_block = { doc_comment* ~ GENERATOR_KEYWORD ~ identifier ~ BLOCK_OPEN ~ key_value* ~ BLOCK_CLOSE }
+generator_block = { doc_comment* ~ GENERATOR_KEYWORD ~ identifier ~ BLOCK_OPEN ~ (key_value | doc_comment)* ~ BLOCK_CLOSE }
 
 // ######################################
 // Datamodel

diff --git a/libs/datamodel/core/tests/base/comments.rs b/libs/datamodel/core/tests/base/comments.rs
@@ -19,9 +19,7 @@ fn parse_comments_without_crasing_or_loosing_info() {
     let schema = parse(dml);
     let user_model = schema.assert_has_model("User");
     user_model.assert_is_embedded(false);
-    user_model
-        .assert_has_field("id")
-        .assert_base_type(&ScalarType::Int);
+    user_model.assert_has_field("id").assert_base_type(&ScalarType::Int);
     user_model
         .assert_has_field("firstName")
         .assert_base_type(&ScalarType::String);
@@ -43,9 +41,7 @@ fn accept_a_comment_at_the_end() {
     let schema = parse(dml);
     let user_model = schema.assert_has_model("User");
     user_model.assert_is_embedded(false);
-    user_model
-        .assert_has_field("id")
-        .assert_base_type(&ScalarType::Int);
+    user_model.assert_has_field("id").assert_base_type(&ScalarType::Int);
 }
 
 #[test]
@@ -59,9 +55,7 @@ fn accept_a_doc_comment_at_the_end() {
     let schema = parse(dml);
     let user_model = schema.assert_has_model("User");
     user_model.assert_is_embedded(false);
-    user_model
-        .assert_has_field("id")
-        .assert_base_type(&ScalarType::Int);
+    user_model.assert_has_field("id").assert_base_type(&ScalarType::Int);
 }
 
 #[test]
@@ -78,3 +72,35 @@ fn comments_must_work_in_enums() {
     // must not crash
     let _ = parse(dml);
 }
+
+#[test]
+fn comments_in_a_generator_must_work() {
+    let dml = r#"
+    generator gen {
+        provider  = "predefined-generator"
+        platforms = ["darwin"]
+        // platforms is deprecated
+    }
+    "#;
+
+    // must not crash
+    let _ = parse(dml);
+}
+
+#[test]
+fn comments_in_a_datasource_must_work() {
+    let dml = r#"
+        datasource db {
+            provider = "postgresql"
+            // Like, postgresql://user:password@localhost:5432/database/schema
+            url      = env("PARCEL_PG_URL")
+        }
+    "#;
+    std::env::set_var(
+        "PARCEL_PG_URL",
+        "postgresql://user:password@localhost:5432/database/schema",
+    );
+
+    // must not crash
+    let _ = parse(dml);
+}