fix: handle version number field renames substrait-io/substrait#362

rs/src/parse/plan.rs

@@ -107,9 +107,15 @@ fn parse_producer_id(x: &String, y: &mut context::Context) -> diagnostic::Result
 /// Parse a version node.
 fn parse_version(x: &substrait::Version, y: &mut context::Context) -> diagnostic::Result<()> {
     // Parse the version information.
-    let major = proto_primitive_field!(x, y, major).1.unwrap_or_default() as u64;
-    let minor = proto_primitive_field!(x, y, minor).1.unwrap_or_default() as u64;
-    let patch = proto_primitive_field!(x, y, patch).1.unwrap_or_default() as u64;
+    let major = proto_primitive_field!(x, y, major_number)
+        .1
+        .unwrap_or_default() as u64;
+    let minor = proto_primitive_field!(x, y, minor_number)
+        .1
+        .unwrap_or_default() as u64;
+    let patch = proto_primitive_field!(x, y, patch_number)
+        .1
+        .unwrap_or_default() as u64;
     let version = semver::Version::new(major, minor, patch);
     if version == semver::Version::new(0, 0, 0) {
         diagnostic!(y, Error, Versioning, "invalid plan version (0.0.0)");

rs/src/resources/substrait-version

@@ -1 +1 @@
-0.18.0
+0.18.0-2-g4170bf1

tests/tests/version/current-version.yaml

@@ -1,10 +1,10 @@
 name: version-current
 diags:
-- { code: 0007, min: e } # Make all versioning messages errors; there shouldn't be any
-- { code: 5001, max: i } # Disable missing root relation diag
+  - { code: 0007, min: e } # Make all versioning messages errors; there shouldn't be any
+  - { code: 5001, max: i } # Disable missing root relation diag
 plan:
   __test:
-  - level: i
+    - level: i
   version:
-    minor: 18
+    minorNumber: 18
     producer: validator-test

tests/tests/version/incompatible-version.yaml

@@ -1,11 +1,11 @@
 name: version-incompatible
 diags:
-- { code: 0007 } # Disable the default override for versioning diags
-- { code: 5001, max: i } # Disable missing root relation diag
+  - { code: 0007 } # Disable the default override for versioning diags
+  - { code: 5001, max: i } # Disable missing root relation diag
 plan:
   __test:
-  - level: i
+    - level: i
   version:
-    major: 1
+    majorNumber: 1
     producer: validator-test
-    __test: [ diag: { level: w, code: 0007, msg: "*version*is not compatible*" } ]
+    __test: [diag: { level: w, code: 0007, msg: "*version*is not compatible*" }]

tests/tests/version/invalid-hash.yaml

@@ -1,13 +1,18 @@
 name: version-invalid-hash
 diags:
-- { code: 0007 } # Disable the default override for versioning diags
-- { code: 5001, max: i } # Disable missing root relation diag
+  - { code: 0007 } # Disable the default override for versioning diags
+  - { code: 5001, max: i } # Disable missing root relation diag
 plan:
   __test:
-  - level: iw
+    - level: iw
   version:
-    minor: 1
+    minorNumber: 1
     gitHash: foobar
     gitHash__test:
-    - diag: { level: e, code: 0002, msg: "*40-character lowercase hexadecimal string*" }
+      - diag:
+          {
+            level: e,
+            code: 0002,
+            msg: "*40-character lowercase hexadecimal string*",
+          }
     producer: validator-test

tests/tests/version/unknown-version.yaml

@@ -1,11 +1,19 @@
 name: version-unknown
 diags:
-- { code: 0007 } # Disable the default override for versioning diags
-- { code: 5001, max: i } # Disable missing root relation diag
+  - { code: 0007 } # Disable the default override for versioning diags
+  - { code: 5001, max: i } # Disable missing root relation diag
 plan:
   __test:
-  - level: i
+    - level: i
   version:
-    minor: 1
+    minorNumber: 1
     producer: validator-test
-    __test: [ diag: { level: w, code: 0007, msg: "*cannot automatically determine*compat*" } ]
+    __test:
+      [
+        diag:
+          {
+            level: w,
+            code: 0007,
+            msg: "*cannot automatically determine*compat*",
+          },
+      ]

tests/tests/version/valid-hash.yaml

@@ -1,13 +1,13 @@
 name: version-valid-hash
 diags:
-- { code: 0007 } # Disable the default override for versioning diags
-- { code: 5001, max: i } # Disable missing root relation diag
+  - { code: 0007 } # Disable the default override for versioning diags
+  - { code: 5001, max: i } # Disable missing root relation diag
 plan:
   __test:
-  - level: iw
+    - level: iw
   version:
-    minor: 1
+    minorNumber: 1
     gitHash: "0123456789012345678901234567890123456789"
     gitHash__test:
-    - diag: { level: w, code: 0007, msg: "*git hash was specified*" }
+      - diag: { level: w, code: 0007, msg: "*git hash was specified*" }
     producer: validator-test