cql2 0.2.0__tar.gz → 0.3.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (743) hide show
  1. {cql2-0.2.0 → cql2-0.3.0}/.github/workflows/docs.yml +3 -1
  2. {cql2-0.2.0 → cql2-0.3.0}/.github/workflows/python.yml +1 -1
  3. {cql2-0.2.0 → cql2-0.3.0}/CHANGELOG.md +8 -1
  4. {cql2-0.2.0 → cql2-0.3.0}/Cargo.lock +23 -23
  5. {cql2-0.2.0 → cql2-0.3.0}/Cargo.toml +11 -8
  6. {cql2-0.2.0 → cql2-0.3.0}/PKG-INFO +4 -4
  7. {cql2-0.2.0 → cql2-0.3.0}/README.md +1 -1
  8. {cql2-0.2.0 → cql2-0.3.0}/RELEASING.md +1 -2
  9. {cql2-0.2.0 → cql2-0.3.0}/cli/Cargo.toml +1 -1
  10. {cql2-0.2.0 → cql2-0.3.0}/docs/python.md +4 -0
  11. {cql2-0.2.0 → cql2-0.3.0}/mkdocs.yml +5 -4
  12. {cql2-0.2.0 → cql2-0.3.0}/python/README.md +1 -1
  13. {cql2-0.2.0 → cql2-0.3.0}/python/cql2.pyi +54 -18
  14. {cql2-0.2.0 → cql2-0.3.0}/python/src/lib.rs +24 -10
  15. {cql2-0.2.0 → cql2-0.3.0}/python/tests/test_expr.py +21 -6
  16. {cql2-0.2.0 → cql2-0.3.0}/.github/workflows/ci.yml +0 -0
  17. {cql2-0.2.0 → cql2-0.3.0}/.gitignore +0 -0
  18. {cql2-0.2.0 → cql2-0.3.0}/CONTRIBUTING.md +0 -0
  19. {cql2-0.2.0 → cql2-0.3.0}/LICENSE +0 -0
  20. {cql2-0.2.0 → cql2-0.3.0}/cli/README.md +0 -0
  21. {cql2-0.2.0 → cql2-0.3.0}/cli/src/lib.rs +0 -0
  22. {cql2-0.2.0 → cql2-0.3.0}/cli/src/main.rs +0 -0
  23. {cql2-0.2.0 → cql2-0.3.0}/docs/cli.md +0 -0
  24. {cql2-0.2.0 → cql2-0.3.0}/docs/ds-logo-hor--pos.svg +0 -0
  25. {cql2-0.2.0 → cql2-0.3.0}/docs/favicon.png +0 -0
  26. {cql2-0.2.0 → cql2-0.3.0}/docs/index.md +0 -0
  27. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/clause6_01.json +0 -0
  28. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/clause6_02a.json +0 -0
  29. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/clause6_02b.json +0 -0
  30. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/clause6_02c.json +0 -0
  31. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/clause6_02d.json +0 -0
  32. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/clause6_03.json +0 -0
  33. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/clause7_01.json +0 -0
  34. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/clause7_02.json +0 -0
  35. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/clause7_03a.json +0 -0
  36. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/clause7_03b.json +0 -0
  37. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/clause7_04.json +0 -0
  38. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/clause7_05.json +0 -0
  39. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/clause7_07.json +0 -0
  40. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/clause7_10.json +0 -0
  41. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/clause7_12.json +0 -0
  42. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/clause7_13.json +0 -0
  43. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/clause7_15.json +0 -0
  44. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/clause7_16.json +0 -0
  45. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/clause7_17.json +0 -0
  46. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/clause7_18.json +0 -0
  47. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/clause7_19.json +0 -0
  48. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example01.json +0 -0
  49. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example02.json +0 -0
  50. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example03.json +0 -0
  51. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example04.json +0 -0
  52. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example05a.json +0 -0
  53. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example05b.json +0 -0
  54. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example06a.json +0 -0
  55. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example06b.json +0 -0
  56. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example07.json +0 -0
  57. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example08.json +0 -0
  58. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example09.json +0 -0
  59. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example10.json +0 -0
  60. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example11.json +0 -0
  61. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example12.json +0 -0
  62. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example13.json +0 -0
  63. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example14.json +0 -0
  64. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example15.json +0 -0
  65. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example16.json +0 -0
  66. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example17.json +0 -0
  67. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example18.json +0 -0
  68. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example19.json +0 -0
  69. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example20.json +0 -0
  70. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example21.json +0 -0
  71. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example22.json +0 -0
  72. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example23.json +0 -0
  73. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example24.json +0 -0
  74. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example25.json +0 -0
  75. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example26.json +0 -0
  76. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example27.json +0 -0
  77. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example28.json +0 -0
  78. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example29.json +0 -0
  79. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example30.json +0 -0
  80. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example31.json +0 -0
  81. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example32.json +0 -0
  82. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example33.json +0 -0
  83. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example34.json +0 -0
  84. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example35.json +0 -0
  85. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example36.json +0 -0
  86. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example37.json +0 -0
  87. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example38.json +0 -0
  88. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example39.json +0 -0
  89. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example40.json +0 -0
  90. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example41.json +0 -0
  91. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example42.json +0 -0
  92. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example43.json +0 -0
  93. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example44.json +0 -0
  94. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example45.json +0 -0
  95. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example46.json +0 -0
  96. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example47.json +0 -0
  97. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example48.json +0 -0
  98. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example49.json +0 -0
  99. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example50.json +0 -0
  100. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example51.json +0 -0
  101. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example52.json +0 -0
  102. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example53.json +0 -0
  103. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example54.json +0 -0
  104. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example55.json +0 -0
  105. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example56.json +0 -0
  106. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example57.json +0 -0
  107. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example58.json +0 -0
  108. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example59.json +0 -0
  109. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example60.json +0 -0
  110. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example61.json +0 -0
  111. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example62.json +0 -0
  112. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example63.json +0 -0
  113. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example64.json +0 -0
  114. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example65.json +0 -0
  115. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example66.json +0 -0
  116. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example67.json +0 -0
  117. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example68.json +0 -0
  118. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example69.json +0 -0
  119. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example70.json +0 -0
  120. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example71.json +0 -0
  121. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example72.json +0 -0
  122. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example73.json +0 -0
  123. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example74.json +0 -0
  124. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example75.json +0 -0
  125. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example76.json +0 -0
  126. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example77.json +0 -0
  127. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example78.json +0 -0
  128. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example79.json +0 -0
  129. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example80.json +0 -0
  130. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example81.json +0 -0
  131. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example82.json +0 -0
  132. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example83.json +0 -0
  133. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example84.json +0 -0
  134. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example85.json +0 -0
  135. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/example86.json +0 -0
  136. {cql2-0.2.0 → cql2-0.3.0}/fixtures/json/validate.sh +0 -0
  137. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/clause6_01.txt +0 -0
  138. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/clause6_02a.txt +0 -0
  139. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/clause6_02b.txt +0 -0
  140. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/clause6_02c.txt +0 -0
  141. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/clause6_02d.txt +0 -0
  142. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/clause6_03.txt +0 -0
  143. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/clause7_01.txt +0 -0
  144. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/clause7_02.txt +0 -0
  145. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/clause7_03a.txt +0 -0
  146. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/clause7_03b.txt +0 -0
  147. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/clause7_04.txt +0 -0
  148. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/clause7_05.txt +0 -0
  149. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/clause7_07.txt +0 -0
  150. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/clause7_10.txt +0 -0
  151. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/clause7_12.txt +0 -0
  152. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/clause7_13.txt +0 -0
  153. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/clause7_15.txt +0 -0
  154. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/clause7_16.txt +0 -0
  155. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/clause7_17.txt +0 -0
  156. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/clause7_18.txt +0 -0
  157. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/clause7_19.txt +0 -0
  158. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example01.txt +0 -0
  159. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example02.txt +0 -0
  160. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example03.txt +0 -0
  161. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example04.txt +0 -0
  162. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example05a.txt +0 -0
  163. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example05b.txt +0 -0
  164. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example06a.txt +0 -0
  165. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example06b.txt +0 -0
  166. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example07.txt +0 -0
  167. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example08.txt +0 -0
  168. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example09.txt +0 -0
  169. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example10.txt +0 -0
  170. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example11.txt +0 -0
  171. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example12.txt +0 -0
  172. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example13.txt +0 -0
  173. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example14.txt +0 -0
  174. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example15.txt +0 -0
  175. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example16.txt +0 -0
  176. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example17.txt +0 -0
  177. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example18.txt +0 -0
  178. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example19.txt +0 -0
  179. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example20.txt +0 -0
  180. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example21.txt +0 -0
  181. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example22.txt +0 -0
  182. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example23.txt +0 -0
  183. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example24.txt +0 -0
  184. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example25.txt +0 -0
  185. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example26.txt +0 -0
  186. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example27.txt +0 -0
  187. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example28.txt +0 -0
  188. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example29.txt +0 -0
  189. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example30.txt +0 -0
  190. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example31.txt +0 -0
  191. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example32.txt +0 -0
  192. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example33.txt +0 -0
  193. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example34.txt +0 -0
  194. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example35.txt +0 -0
  195. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example36-alt01.txt +0 -0
  196. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example36.txt +0 -0
  197. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example37.txt +0 -0
  198. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example38-alt01.txt +0 -0
  199. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example38.txt +0 -0
  200. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example39.txt +0 -0
  201. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example40-alt01.txt +0 -0
  202. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example40.txt +0 -0
  203. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example41.txt +0 -0
  204. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example42-alt01.txt +0 -0
  205. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example42.txt +0 -0
  206. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example43-alt01.txt +0 -0
  207. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example43.txt +0 -0
  208. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example44-alt01.txt +0 -0
  209. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example44.txt +0 -0
  210. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example45.txt +0 -0
  211. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example46-alt01.txt +0 -0
  212. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example46.txt +0 -0
  213. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example47.txt +0 -0
  214. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example48.txt +0 -0
  215. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example49-alt01.txt +0 -0
  216. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example49.txt +0 -0
  217. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example50.txt +0 -0
  218. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example51.txt +0 -0
  219. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example52.txt +0 -0
  220. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example53.txt +0 -0
  221. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example54-alt01.txt +0 -0
  222. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example54.txt +0 -0
  223. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example55-alt01.txt +0 -0
  224. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example55.txt +0 -0
  225. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example56.txt +0 -0
  226. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example57.txt +0 -0
  227. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example58.txt +0 -0
  228. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example59.txt +0 -0
  229. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example60.txt +0 -0
  230. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example61.txt +0 -0
  231. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example62.txt +0 -0
  232. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example63.txt +0 -0
  233. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example64.txt +0 -0
  234. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example65.txt +0 -0
  235. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example66.txt +0 -0
  236. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example67.txt +0 -0
  237. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example68.txt +0 -0
  238. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example69.txt +0 -0
  239. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example70.txt +0 -0
  240. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example71.txt +0 -0
  241. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example72.txt +0 -0
  242. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example73.txt +0 -0
  243. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example74.txt +0 -0
  244. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example75.txt +0 -0
  245. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example76.txt +0 -0
  246. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example77.txt +0 -0
  247. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example78.txt +0 -0
  248. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example79.txt +0 -0
  249. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example80.txt +0 -0
  250. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example81.txt +0 -0
  251. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example82.txt +0 -0
  252. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example83.txt +0 -0
  253. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example84.txt +0 -0
  254. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example85-alt01.txt +0 -0
  255. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example85.txt +0 -0
  256. {cql2-0.2.0 → cql2-0.3.0}/fixtures/text/example86.txt +0 -0
  257. {cql2-0.2.0 → cql2-0.3.0}/pyproject.toml +0 -0
  258. {cql2-0.2.0 → cql2-0.3.0}/python/.gitignore +0 -0
  259. {cql2-0.2.0 → cql2-0.3.0}/python/.python-version +0 -0
  260. {cql2-0.2.0 → cql2-0.3.0}/python/Cargo.toml +0 -0
  261. {cql2-0.2.0 → cql2-0.3.0}/python/tests/conftest.py +0 -0
  262. {cql2-0.2.0 → cql2-0.3.0}/rustfmt.toml +0 -0
  263. {cql2-0.2.0 → cql2-0.3.0}/src/cql2.json +0 -0
  264. {cql2-0.2.0 → cql2-0.3.0}/src/cql2.pest +0 -0
  265. {cql2-0.2.0 → cql2-0.3.0}/src/error.rs +0 -0
  266. {cql2-0.2.0 → cql2-0.3.0}/src/expr.rs +0 -0
  267. {cql2-0.2.0 → cql2-0.3.0}/src/geometry.rs +0 -0
  268. {cql2-0.2.0 → cql2-0.3.0}/src/lib.rs +0 -0
  269. {cql2-0.2.0 → cql2-0.3.0}/src/parser.rs +0 -0
  270. {cql2-0.2.0 → cql2-0.3.0}/src/validator.rs +0 -0
  271. {cql2-0.2.0 → cql2-0.3.0}/tests/README.md +0 -0
  272. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause6_01.json +0 -0
  273. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause6_01.txt +0 -0
  274. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause6_02a.json +0 -0
  275. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause6_02a.txt +0 -0
  276. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause6_02b.json +0 -0
  277. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause6_02b.txt +0 -0
  278. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause6_02c.json +0 -0
  279. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause6_02c.txt +0 -0
  280. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause6_02d.json +0 -0
  281. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause6_02d.txt +0 -0
  282. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause6_03.json +0 -0
  283. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause6_03.txt +0 -0
  284. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_01.json +0 -0
  285. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_01.txt +0 -0
  286. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_02.json +0 -0
  287. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_02.txt +0 -0
  288. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_03a.json +0 -0
  289. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_03a.txt +0 -0
  290. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_03b.json +0 -0
  291. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_03b.txt +0 -0
  292. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_04.json +0 -0
  293. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_04.txt +0 -0
  294. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_05.json +0 -0
  295. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_05.txt +0 -0
  296. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_07.json +0 -0
  297. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_07.txt +0 -0
  298. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_10.json +0 -0
  299. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_10.txt +0 -0
  300. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_12.json +0 -0
  301. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_12.txt +0 -0
  302. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_13.json +0 -0
  303. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_13.txt +0 -0
  304. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_15.json +0 -0
  305. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_15.txt +0 -0
  306. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_16.json +0 -0
  307. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_16.txt +0 -0
  308. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_17.json +0 -0
  309. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_17.txt +0 -0
  310. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_18.json +0 -0
  311. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_18.txt +0 -0
  312. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_19.json +0 -0
  313. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/clause7_19.txt +0 -0
  314. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example01.json +0 -0
  315. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example01.txt +0 -0
  316. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example02.json +0 -0
  317. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example02.txt +0 -0
  318. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example03.json +0 -0
  319. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example03.txt +0 -0
  320. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example04.json +0 -0
  321. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example04.txt +0 -0
  322. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example05a.json +0 -0
  323. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example05a.txt +0 -0
  324. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example05b.json +0 -0
  325. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example05b.txt +0 -0
  326. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example06a.json +0 -0
  327. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example06a.txt +0 -0
  328. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example06b.json +0 -0
  329. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example06b.txt +0 -0
  330. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example07.json +0 -0
  331. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example07.txt +0 -0
  332. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example08.json +0 -0
  333. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example08.txt +0 -0
  334. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example09.json +0 -0
  335. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example09.txt +0 -0
  336. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example10.json +0 -0
  337. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example10.txt +0 -0
  338. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example11.json +0 -0
  339. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example11.txt +0 -0
  340. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example12.json +0 -0
  341. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example12.txt +0 -0
  342. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example13.json +0 -0
  343. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example13.txt +0 -0
  344. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example14.json +0 -0
  345. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example14.txt +0 -0
  346. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example15.json +0 -0
  347. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example15.txt +0 -0
  348. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example16.json +0 -0
  349. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example16.txt +0 -0
  350. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example17.json +0 -0
  351. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example17.txt +0 -0
  352. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example18.json +0 -0
  353. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example18.txt +0 -0
  354. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example19.json +0 -0
  355. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example19.txt +0 -0
  356. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example20.json +0 -0
  357. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example20.txt +0 -0
  358. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example21.json +0 -0
  359. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example21.txt +0 -0
  360. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example22.json +0 -0
  361. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example22.txt +0 -0
  362. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example23.json +0 -0
  363. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example23.txt +0 -0
  364. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example24.json +0 -0
  365. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example24.txt +0 -0
  366. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example25.json +0 -0
  367. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example25.txt +0 -0
  368. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example26.json +0 -0
  369. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example26.txt +0 -0
  370. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example27.json +0 -0
  371. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example27.txt +0 -0
  372. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example28.json +0 -0
  373. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example28.txt +0 -0
  374. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example29.json +0 -0
  375. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example29.txt +0 -0
  376. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example30.json +0 -0
  377. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example30.txt +0 -0
  378. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example31.json +0 -0
  379. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example31.txt +0 -0
  380. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example32.json +0 -0
  381. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example32.txt +0 -0
  382. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example33.json +0 -0
  383. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example33.txt +0 -0
  384. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example34.json +0 -0
  385. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example34.txt +0 -0
  386. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example35.json +0 -0
  387. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example35.txt +0 -0
  388. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example36-alt01.json +0 -0
  389. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example36.json +0 -0
  390. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example36.txt +0 -0
  391. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example37.json +0 -0
  392. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example37.txt +0 -0
  393. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example38-alt01.json +0 -0
  394. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example38.json +0 -0
  395. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example38.txt +0 -0
  396. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example39.json +0 -0
  397. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example39.txt +0 -0
  398. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example40-alt01.json +0 -0
  399. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example40.json +0 -0
  400. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example40.txt +0 -0
  401. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example41.json +0 -0
  402. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example41.txt +0 -0
  403. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example42-alt01.json +0 -0
  404. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example42.json +0 -0
  405. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example42.txt +0 -0
  406. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example43-alt01.json +0 -0
  407. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example43.json +0 -0
  408. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example43.txt +0 -0
  409. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example44-alt01.json +0 -0
  410. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example44.json +0 -0
  411. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example44.txt +0 -0
  412. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example45.json +0 -0
  413. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example45.txt +0 -0
  414. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example46-alt01.json +0 -0
  415. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example46.json +0 -0
  416. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example46.txt +0 -0
  417. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example47.json +0 -0
  418. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example47.txt +0 -0
  419. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example48.json +0 -0
  420. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example48.txt +0 -0
  421. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example49-alt01.json +0 -0
  422. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example49.json +0 -0
  423. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example49.txt +0 -0
  424. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example50.json +0 -0
  425. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example50.txt +0 -0
  426. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example51.json +0 -0
  427. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example51.txt +0 -0
  428. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example52.json +0 -0
  429. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example52.txt +0 -0
  430. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example53.json +0 -0
  431. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example53.txt +0 -0
  432. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example54-alt01.json +0 -0
  433. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example54.json +0 -0
  434. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example54.txt +0 -0
  435. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example55-alt01.json +0 -0
  436. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example55.json +0 -0
  437. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example55.txt +0 -0
  438. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example56.json +0 -0
  439. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example56.txt +0 -0
  440. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example57.json +0 -0
  441. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example57.txt +0 -0
  442. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example58.json +0 -0
  443. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example58.txt +0 -0
  444. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example59.json +0 -0
  445. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example59.txt +0 -0
  446. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example60.json +0 -0
  447. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example60.txt +0 -0
  448. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example61.json +0 -0
  449. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example61.txt +0 -0
  450. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example62.json +0 -0
  451. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example62.txt +0 -0
  452. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example63.json +0 -0
  453. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example63.txt +0 -0
  454. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example64.json +0 -0
  455. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example64.txt +0 -0
  456. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example65.json +0 -0
  457. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example65.txt +0 -0
  458. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example66.json +0 -0
  459. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example66.txt +0 -0
  460. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example67.json +0 -0
  461. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example67.txt +0 -0
  462. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example68.json +0 -0
  463. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example68.txt +0 -0
  464. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example69.json +0 -0
  465. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example69.txt +0 -0
  466. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example70.json +0 -0
  467. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example70.txt +0 -0
  468. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example71.json +0 -0
  469. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example71.txt +0 -0
  470. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example72.json +0 -0
  471. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example72.txt +0 -0
  472. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example73.json +0 -0
  473. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example73.txt +0 -0
  474. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example74.json +0 -0
  475. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example74.txt +0 -0
  476. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example75.json +0 -0
  477. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example75.txt +0 -0
  478. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example76.json +0 -0
  479. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example76.txt +0 -0
  480. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example77.json +0 -0
  481. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example77.txt +0 -0
  482. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example78.json +0 -0
  483. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example78.txt +0 -0
  484. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example79.json +0 -0
  485. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example79.txt +0 -0
  486. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example80.json +0 -0
  487. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example80.txt +0 -0
  488. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example81.json +0 -0
  489. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example81.txt +0 -0
  490. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example82.json +0 -0
  491. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example82.txt +0 -0
  492. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example83.json +0 -0
  493. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example83.txt +0 -0
  494. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example84.json +0 -0
  495. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example84.txt +0 -0
  496. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example85-alt01.json +0 -0
  497. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example85.json +0 -0
  498. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example85.txt +0 -0
  499. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example86.json +0 -0
  500. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/json/example86.txt +0 -0
  501. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause6_01.json +0 -0
  502. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause6_01.txt +0 -0
  503. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause6_02a.json +0 -0
  504. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause6_02a.txt +0 -0
  505. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause6_02b.json +0 -0
  506. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause6_02b.txt +0 -0
  507. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause6_02c.json +0 -0
  508. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause6_02c.txt +0 -0
  509. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause6_02d.json +0 -0
  510. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause6_02d.txt +0 -0
  511. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause6_03.json +0 -0
  512. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause6_03.txt +0 -0
  513. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_01.json +0 -0
  514. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_01.txt +0 -0
  515. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_02.json +0 -0
  516. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_02.txt +0 -0
  517. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_03a.json +0 -0
  518. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_03a.txt +0 -0
  519. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_03b.json +0 -0
  520. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_03b.txt +0 -0
  521. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_04.json +0 -0
  522. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_04.txt +0 -0
  523. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_05.json +0 -0
  524. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_05.txt +0 -0
  525. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_07.json +0 -0
  526. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_07.txt +0 -0
  527. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_10.json +0 -0
  528. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_10.txt +0 -0
  529. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_12.json +0 -0
  530. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_12.txt +0 -0
  531. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_13.json +0 -0
  532. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_13.txt +0 -0
  533. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_15.json +0 -0
  534. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_15.txt +0 -0
  535. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_16.json +0 -0
  536. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_16.txt +0 -0
  537. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_17.json +0 -0
  538. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_17.txt +0 -0
  539. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_18.json +0 -0
  540. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_18.txt +0 -0
  541. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_19.json +0 -0
  542. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/clause7_19.txt +0 -0
  543. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example01.json +0 -0
  544. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example01.txt +0 -0
  545. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example02.json +0 -0
  546. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example02.txt +0 -0
  547. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example03.json +0 -0
  548. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example03.txt +0 -0
  549. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example04.json +0 -0
  550. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example04.txt +0 -0
  551. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example05a.json +0 -0
  552. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example05a.txt +0 -0
  553. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example05b.json +0 -0
  554. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example05b.txt +0 -0
  555. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example06a.json +0 -0
  556. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example06a.txt +0 -0
  557. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example06b.json +0 -0
  558. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example06b.txt +0 -0
  559. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example07.json +0 -0
  560. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example07.txt +0 -0
  561. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example08.json +0 -0
  562. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example08.txt +0 -0
  563. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example09.json +0 -0
  564. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example09.txt +0 -0
  565. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example10.json +0 -0
  566. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example10.txt +0 -0
  567. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example11.json +0 -0
  568. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example11.txt +0 -0
  569. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example12.json +0 -0
  570. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example12.txt +0 -0
  571. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example13.json +0 -0
  572. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example13.txt +0 -0
  573. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example14.json +0 -0
  574. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example14.txt +0 -0
  575. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example15.json +0 -0
  576. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example15.txt +0 -0
  577. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example16.json +0 -0
  578. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example16.txt +0 -0
  579. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example17.json +0 -0
  580. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example17.txt +0 -0
  581. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example18.json +0 -0
  582. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example18.txt +0 -0
  583. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example19.json +0 -0
  584. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example19.txt +0 -0
  585. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example20.json +0 -0
  586. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example20.txt +0 -0
  587. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example21.json +0 -0
  588. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example21.txt +0 -0
  589. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example22.json +0 -0
  590. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example22.txt +0 -0
  591. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example23.json +0 -0
  592. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example23.txt +0 -0
  593. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example24.json +0 -0
  594. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example24.txt +0 -0
  595. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example25.json +0 -0
  596. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example25.txt +0 -0
  597. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example26.json +0 -0
  598. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example26.txt +0 -0
  599. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example27.json +0 -0
  600. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example27.txt +0 -0
  601. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example28.json +0 -0
  602. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example28.txt +0 -0
  603. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example29.json +0 -0
  604. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example29.txt +0 -0
  605. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example30.json +0 -0
  606. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example30.txt +0 -0
  607. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example31.json +0 -0
  608. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example31.txt +0 -0
  609. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example32.json +0 -0
  610. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example32.txt +0 -0
  611. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example33.json +0 -0
  612. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example33.txt +0 -0
  613. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example34.json +0 -0
  614. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example34.txt +0 -0
  615. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example35.json +0 -0
  616. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example35.txt +0 -0
  617. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example36-alt01.json +0 -0
  618. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example36-alt01.txt +0 -0
  619. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example36.json +0 -0
  620. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example36.txt +0 -0
  621. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example37.json +0 -0
  622. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example37.txt +0 -0
  623. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example38-alt01.json +0 -0
  624. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example38-alt01.txt +0 -0
  625. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example38.json +0 -0
  626. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example38.txt +0 -0
  627. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example39.json +0 -0
  628. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example39.txt +0 -0
  629. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example40-alt01.json +0 -0
  630. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example40-alt01.txt +0 -0
  631. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example40.json +0 -0
  632. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example40.txt +0 -0
  633. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example41.json +0 -0
  634. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example41.txt +0 -0
  635. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example42-alt01.json +0 -0
  636. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example42-alt01.txt +0 -0
  637. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example42.json +0 -0
  638. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example42.txt +0 -0
  639. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example43-alt01.json +0 -0
  640. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example43-alt01.txt +0 -0
  641. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example43.json +0 -0
  642. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example43.txt +0 -0
  643. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example44-alt01.json +0 -0
  644. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example44-alt01.txt +0 -0
  645. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example44.json +0 -0
  646. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example44.txt +0 -0
  647. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example45.json +0 -0
  648. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example45.txt +0 -0
  649. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example46-alt01.json +0 -0
  650. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example46-alt01.txt +0 -0
  651. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example46.json +0 -0
  652. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example46.txt +0 -0
  653. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example47.json +0 -0
  654. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example47.txt +0 -0
  655. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example48.json +0 -0
  656. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example48.txt +0 -0
  657. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example49-alt01.json +0 -0
  658. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example49-alt01.txt +0 -0
  659. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example49.json +0 -0
  660. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example49.txt +0 -0
  661. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example50.json +0 -0
  662. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example50.txt +0 -0
  663. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example51.json +0 -0
  664. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example51.txt +0 -0
  665. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example52.json +0 -0
  666. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example52.txt +0 -0
  667. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example53.json +0 -0
  668. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example53.txt +0 -0
  669. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example54-alt01.json +0 -0
  670. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example54-alt01.txt +0 -0
  671. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example54.json +0 -0
  672. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example54.txt +0 -0
  673. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example55-alt01.json +0 -0
  674. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example55-alt01.txt +0 -0
  675. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example55.json +0 -0
  676. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example55.txt +0 -0
  677. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example56.json +0 -0
  678. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example56.txt +0 -0
  679. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example57.json +0 -0
  680. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example57.txt +0 -0
  681. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example58.json +0 -0
  682. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example58.txt +0 -0
  683. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example59.json +0 -0
  684. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example59.txt +0 -0
  685. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example60.json +0 -0
  686. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example60.txt +0 -0
  687. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example61.json +0 -0
  688. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example61.txt +0 -0
  689. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example62.json +0 -0
  690. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example62.txt +0 -0
  691. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example63.json +0 -0
  692. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example63.txt +0 -0
  693. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example64.json +0 -0
  694. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example64.txt +0 -0
  695. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example65.json +0 -0
  696. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example65.txt +0 -0
  697. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example66.json +0 -0
  698. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example66.txt +0 -0
  699. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example67.json +0 -0
  700. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example67.txt +0 -0
  701. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example68.json +0 -0
  702. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example68.txt +0 -0
  703. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example69.json +0 -0
  704. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example69.txt +0 -0
  705. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example70.json +0 -0
  706. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example70.txt +0 -0
  707. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example71.json +0 -0
  708. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example71.txt +0 -0
  709. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example72.json +0 -0
  710. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example72.txt +0 -0
  711. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example73.json +0 -0
  712. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example73.txt +0 -0
  713. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example74.json +0 -0
  714. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example74.txt +0 -0
  715. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example75.json +0 -0
  716. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example75.txt +0 -0
  717. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example76.json +0 -0
  718. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example76.txt +0 -0
  719. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example77.json +0 -0
  720. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example77.txt +0 -0
  721. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example78.json +0 -0
  722. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example78.txt +0 -0
  723. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example79.json +0 -0
  724. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example79.txt +0 -0
  725. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example80.json +0 -0
  726. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example80.txt +0 -0
  727. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example81.json +0 -0
  728. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example81.txt +0 -0
  729. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example82.json +0 -0
  730. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example82.txt +0 -0
  731. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example83.json +0 -0
  732. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example83.txt +0 -0
  733. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example84.json +0 -0
  734. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example84.txt +0 -0
  735. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example85-alt01.json +0 -0
  736. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example85-alt01.txt +0 -0
  737. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example85.json +0 -0
  738. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example85.txt +0 -0
  739. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example86.json +0 -0
  740. {cql2-0.2.0 → cql2-0.3.0}/tests/expected/text/example86.txt +0 -0
  741. {cql2-0.2.0 → cql2-0.3.0}/tests/generate-expected +0 -0
  742. {cql2-0.2.0 → cql2-0.3.0}/tests/ogc_tests.rs +0 -0
  743. {cql2-0.2.0 → cql2-0.3.0}/uv.lock +0 -0
@@ -18,6 +18,8 @@ jobs:
18
18
  GIT_COMMITTER_EMAIL: ci-bot@example.com
19
19
  steps:
20
20
  - uses: actions/checkout@v4
21
+ with:
22
+ fetch-depth: 0 # for git describe
21
23
  - uses: Swatinem/rust-cache@v2
22
24
  - uses: astral-sh/setup-uv@v3
23
25
  with:
@@ -25,7 +27,7 @@ jobs:
25
27
  - name: Install Python
26
28
  run: uv python install # we use uv instead of setup-python so we get python-version resolution between our two packages
27
29
  - name: Sync
28
- run: uv sync
30
+ run: uv sync && uv sync --no-dev --inexact --directory python
29
31
  - name: Deploy
30
32
  run: |
31
33
  VERSION=$(git describe --tags --match="v*" --abbrev=0)
@@ -5,7 +5,7 @@ on:
5
5
  branches:
6
6
  - main
7
7
  tags:
8
- - '*'
8
+ - 'v*'
9
9
  paths:
10
10
  - python/**
11
11
  pull_request:
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
6
6
 
7
7
  ## [Unreleased]
8
8
 
9
+ ## [0.3.0] - 2024-10-14
10
+
11
+ ### Changed
12
+
13
+ - Use free functions (instead of staticmethods) in the Python API ([#41](https://github.com/developmentseed/cql2-rs/pull/41))
14
+
9
15
  ## [0.2.0] - 2024-10-10
10
16
 
11
17
  ### Added
@@ -23,6 +29,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
23
29
 
24
30
  Initial release.
25
31
 
26
- [Unreleased]: https://github.com/developmentseed/cql-rs/compare/v0.2.0...main
32
+ [Unreleased]: https://github.com/developmentseed/cql-rs/compare/v0.3.0...main
33
+ [0.3.0]: https://github.com/developmentseed/cql-rs/releases/compare/v0.2.0...v0.3.0
27
34
  [0.2.0]: https://github.com/developmentseed/cql-rs/releases/compare/v0.1.0...v0.2.0
28
35
  [0.1.0]: https://github.com/developmentseed/cql-rs/releases/tag/v0.1.0
@@ -214,7 +214,7 @@ dependencies = [
214
214
 
215
215
  [[package]]
216
216
  name = "cql2"
217
- version = "0.2.0"
217
+ version = "0.3.0"
218
218
  dependencies = [
219
219
  "assert-json-diff",
220
220
  "boon",
@@ -233,7 +233,7 @@ dependencies = [
233
233
 
234
234
  [[package]]
235
235
  name = "cql2-cli"
236
- version = "0.2.0"
236
+ version = "0.3.0"
237
237
  dependencies = [
238
238
  "anyhow",
239
239
  "clap",
@@ -243,7 +243,7 @@ dependencies = [
243
243
 
244
244
  [[package]]
245
245
  name = "cql2-python"
246
- version = "0.2.0"
246
+ version = "0.3.0"
247
247
  dependencies = [
248
248
  "clap",
249
249
  "cql2",
@@ -569,9 +569,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
569
569
 
570
570
  [[package]]
571
571
  name = "pest"
572
- version = "2.7.13"
572
+ version = "2.7.14"
573
573
  source = "registry+https://github.com/rust-lang/crates.io-index"
574
- checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9"
574
+ checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442"
575
575
  dependencies = [
576
576
  "memchr",
577
577
  "thiserror",
@@ -580,9 +580,9 @@ dependencies = [
580
580
 
581
581
  [[package]]
582
582
  name = "pest_derive"
583
- version = "2.7.13"
583
+ version = "2.7.14"
584
584
  source = "registry+https://github.com/rust-lang/crates.io-index"
585
- checksum = "4d3a6e3394ec80feb3b6393c725571754c6188490265c61aaf260810d6b95aa0"
585
+ checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd"
586
586
  dependencies = [
587
587
  "pest",
588
588
  "pest_generator",
@@ -590,9 +590,9 @@ dependencies = [
590
590
 
591
591
  [[package]]
592
592
  name = "pest_generator"
593
- version = "2.7.13"
593
+ version = "2.7.14"
594
594
  source = "registry+https://github.com/rust-lang/crates.io-index"
595
- checksum = "94429506bde1ca69d1b5601962c73f4172ab4726571a59ea95931218cb0e930e"
595
+ checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e"
596
596
  dependencies = [
597
597
  "pest",
598
598
  "pest_meta",
@@ -603,9 +603,9 @@ dependencies = [
603
603
 
604
604
  [[package]]
605
605
  name = "pest_meta"
606
- version = "2.7.13"
606
+ version = "2.7.14"
607
607
  source = "registry+https://github.com/rust-lang/crates.io-index"
608
- checksum = "ac8a071862e93690b6e34e9a5fb8e33ff3734473ac0245b27232222c4906a33f"
608
+ checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d"
609
609
  dependencies = [
610
610
  "once_cell",
611
611
  "pest",
@@ -650,9 +650,9 @@ dependencies = [
650
650
 
651
651
  [[package]]
652
652
  name = "pyo3"
653
- version = "0.22.3"
653
+ version = "0.22.4"
654
654
  source = "registry+https://github.com/rust-lang/crates.io-index"
655
- checksum = "15ee168e30649f7f234c3d49ef5a7a6cbf5134289bc46c29ff3155fa3221c225"
655
+ checksum = "00e89ce2565d6044ca31a3eb79a334c3a79a841120a98f64eea9f579564cb691"
656
656
  dependencies = [
657
657
  "cfg-if",
658
658
  "indoc",
@@ -668,9 +668,9 @@ dependencies = [
668
668
 
669
669
  [[package]]
670
670
  name = "pyo3-build-config"
671
- version = "0.22.3"
671
+ version = "0.22.4"
672
672
  source = "registry+https://github.com/rust-lang/crates.io-index"
673
- checksum = "e61cef80755fe9e46bb8a0b8f20752ca7676dcc07a5277d8b7768c6172e529b3"
673
+ checksum = "d8afbaf3abd7325e08f35ffb8deb5892046fcb2608b703db6a583a5ba4cea01e"
674
674
  dependencies = [
675
675
  "once_cell",
676
676
  "target-lexicon",
@@ -678,9 +678,9 @@ dependencies = [
678
678
 
679
679
  [[package]]
680
680
  name = "pyo3-ffi"
681
- version = "0.22.3"
681
+ version = "0.22.4"
682
682
  source = "registry+https://github.com/rust-lang/crates.io-index"
683
- checksum = "67ce096073ec5405f5ee2b8b31f03a68e02aa10d5d4f565eca04acc41931fa1c"
683
+ checksum = "ec15a5ba277339d04763f4c23d85987a5b08cbb494860be141e6a10a8eb88022"
684
684
  dependencies = [
685
685
  "libc",
686
686
  "pyo3-build-config",
@@ -688,9 +688,9 @@ dependencies = [
688
688
 
689
689
  [[package]]
690
690
  name = "pyo3-macros"
691
- version = "0.22.3"
691
+ version = "0.22.4"
692
692
  source = "registry+https://github.com/rust-lang/crates.io-index"
693
- checksum = "2440c6d12bc8f3ae39f1e775266fa5122fd0c8891ce7520fa6048e683ad3de28"
693
+ checksum = "15e0f01b5364bcfbb686a52fc4181d412b708a68ed20c330db9fc8d2c2bf5a43"
694
694
  dependencies = [
695
695
  "proc-macro2",
696
696
  "pyo3-macros-backend",
@@ -700,9 +700,9 @@ dependencies = [
700
700
 
701
701
  [[package]]
702
702
  name = "pyo3-macros-backend"
703
- version = "0.22.3"
703
+ version = "0.22.4"
704
704
  source = "registry+https://github.com/rust-lang/crates.io-index"
705
- checksum = "1be962f0e06da8f8465729ea2cb71a416d2257dff56cbe40a70d3e62a93ae5d1"
705
+ checksum = "a09b550200e1e5ed9176976d0060cbc2ea82dc8515da07885e7b8153a85caacb"
706
706
  dependencies = [
707
707
  "heck",
708
708
  "proc-macro2",
@@ -1096,9 +1096,9 @@ dependencies = [
1096
1096
 
1097
1097
  [[package]]
1098
1098
  name = "wkt"
1099
- version = "0.11.0"
1099
+ version = "0.11.1"
1100
1100
  source = "registry+https://github.com/rust-lang/crates.io-index"
1101
- checksum = "296937617013271141d1145d9c05861f5ed3b1bc4297e81c692aa3cff9270a9c"
1101
+ checksum = "54f7f1ff4ea4c18936d6cd26a6fd24f0003af37e951a8e0e8b9e9a2d0bd0a46d"
1102
1102
  dependencies = [
1103
1103
  "geo-types",
1104
1104
  "log",
@@ -1,3 +1,14 @@
1
+ [workspace.package]
2
+ version = "0.3.0"
3
+ authors = [
4
+ "David Bitner <bitner@dbspatial.com>",
5
+ "Pete Gadomski <pete.gadomski@gmail.com>",
6
+ ]
7
+ edition = "2021"
8
+ documentation = "https://docs.rs/cql2"
9
+ repository = "https://github.com/developmentseed/cql2-rs"
10
+ license = "MIT"
11
+
1
12
  [package]
2
13
  name = "cql2"
3
14
  version = { workspace = true }
@@ -32,13 +43,5 @@ rstest = "0.23"
32
43
  default-members = [".", "cli"]
33
44
  members = ["python"]
34
45
 
35
- [workspace.package]
36
- version = "0.2.0"
37
- authors = ["David Bitner <bitner@dbspatial.com>"]
38
- edition = "2021"
39
- documentation = "https://docs.rs/cql2"
40
- repository = "https://github.com/developmentseed/cql2-rs"
41
- license = "MIT"
42
-
43
46
  [workspace.dependencies]
44
47
  clap = "4.5"
@@ -1,14 +1,14 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: cql2
3
- Version: 0.2.0
3
+ Version: 0.3.0
4
4
  Classifier: Programming Language :: Rust
5
5
  Classifier: Programming Language :: Python :: Implementation :: CPython
6
6
  Classifier: Programming Language :: Python :: Implementation :: PyPy
7
7
  Summary: Parse, validate, and convert Common Query Language (CQL2) text and JSON
8
8
  Keywords: cql2
9
9
  Home-Page: https://github.com/developmentseed/cql2-rs
10
- Author: David Bitner <bitner@dbspatial.com>
11
- Author-email: David Bitner <bitner@dbspatial.com>
10
+ Author: David Bitner <bitner@dbspatial.com>, Pete Gadomski <pete.gadomski@gmail.com>
11
+ Author-email: David Bitner <bitner@dbspatial.com>, Pete Gadomski <pete.gadomski@gmail.com>
12
12
  License: MIT
13
13
  Requires-Python: >=3.9
14
14
  Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
@@ -29,7 +29,7 @@ Then:
29
29
  ```python
30
30
  expr = Expr("landsat:scene_id = 'LC82030282019133LGN00'")
31
31
  # or
32
- expr = Expr.from_path("fixtures/text/example01.txt")
32
+ expr = cql2.parse_file("fixtures/text/example01.txt")
33
33
 
34
34
  s = expr.to_text()
35
35
  d = expr.to_json()
@@ -10,7 +10,7 @@ Parse, validate, and convert [Common Query Language (CQL2)](https://www.ogc.org/
10
10
 
11
11
  ```toml
12
12
  [dependencies]
13
- cql = "0.2"
13
+ cql = "0.3"
14
14
  ```
15
15
 
16
16
  Then:
@@ -12,5 +12,4 @@ Then:
12
12
  4. Update each README
13
13
  5. Open a PR
14
14
  6. Once approved, merge the PR
15
- 7. (if releasing the main crate) Run `cargo release -p cql2`, then `cargo release -p cql2 --execute`
16
- 8. (if releasing the cli crate) run `cargo release -p cql2-cli`, then `cargo release -p cql2-cli --execute`
15
+ 7. `cargo release -p cql2 --execute`, then `cargo release -p cql2-cli --execute`
@@ -14,7 +14,7 @@ keywords = ["cql2"]
14
14
  [dependencies]
15
15
  anyhow = "1.0"
16
16
  clap = { workspace = true, features = ["derive"] }
17
- cql2 = { path = "..", version = "0.2.0" }
17
+ cql2 = { path = "..", version = "0.3.0" }
18
18
  serde_json = "1.0"
19
19
 
20
20
  [[bin]]
@@ -9,6 +9,10 @@ python -m pip install cql2
9
9
 
10
10
  ## API
11
11
 
12
+ ::: cql2.parse_file
13
+ ::: cql2.parse_json
14
+ ::: cql2.parse_text
12
15
  ::: cql2.Expr
13
16
  ::: cql2.SqlQuery
17
+ ::: cql2.ParseError
14
18
  ::: cql2.ValidationError
@@ -46,13 +46,14 @@ plugins:
46
46
  python:
47
47
  options:
48
48
  allow_inspection: false
49
- show_root_heading: true
50
- separate_signature: false
51
- docstring_style: google
52
49
  docstring_section_style: list
50
+ docstring_style: google
51
+ merge_init_into_class: true
52
+ separate_signature: false
53
+ show_root_heading: true
54
+ show_source: false
53
55
  show_symbol_type_toc: true
54
56
  signature_crossrefs: true
55
- merge_init_into_class: true
56
57
  docstring_options:
57
58
  ignore_init_summary: false
58
59
  markdown_extensions:
@@ -13,7 +13,7 @@ Then:
13
13
  ```python
14
14
  expr = Expr("landsat:scene_id = 'LC82030282019133LGN00'")
15
15
  # or
16
- expr = Expr.from_path("fixtures/text/example01.txt")
16
+ expr = cql2.parse_file("fixtures/text/example01.txt")
17
17
 
18
18
  s = expr.to_text()
19
19
  d = expr.to_json()
@@ -1,31 +1,55 @@
1
1
  from typing import Any
2
2
  from os import PathLike
3
3
 
4
- class SqlQuery:
5
- """A SQL query"""
4
+ def parse_file(path: PathLike | str) -> Expr:
5
+ """Parses CQL2 from a filesystem path.
6
6
 
7
- query: str
8
- """The query, with parameterized fields."""
7
+ Args:
8
+ path (PathLike | str): The input path
9
9
 
10
- params: list[str]
11
- """The parameters, to use for binding."""
10
+ Returns:
11
+ Expr: The CQL2 expression
12
12
 
13
- class Expr:
14
- @staticmethod
15
- def from_path(path: PathLike | str) -> Expr:
16
- """Reads CQL2 from a filesystem path.
13
+ Examples:
14
+ >>> from cql2 import Expr
15
+ >>> expr = Expr.parse_file("fixtures/text/example01.txt")
16
+ """
17
17
 
18
- Args:
19
- path (PathLike | str): The input path
18
+ def parse_text(s: str) -> Expr:
19
+ """Parses cql2-text.
20
20
 
21
- Returns:
22
- Expr: The CQL2 expression
21
+ Args:
22
+ s (str): The cql2-text
23
23
 
24
- Examples:
25
- >>> from cql2 import Expr
26
- >>> expr = Expr.from_path("fixtures/text/example01.txt")
27
- """
24
+ Returns:
25
+ Expr: The CQL2 expression
26
+
27
+ Raises:
28
+ ParseError: Raised if the string does not parse as cql2-text
29
+
30
+ Examples:
31
+ >>> from cql2 import Expr
32
+ >>> expr = Expr.parse_text("landsat:scene_id = 'LC82030282019133LGN00'")
33
+ """
34
+
35
+ def parse_json(s: str) -> Expr:
36
+ """Parses cql2-json.
28
37
 
38
+ Args:
39
+ s (str): The cql2-json string
40
+
41
+ Returns:
42
+ Expr: The CQL2 expression
43
+
44
+ Raises:
45
+ ParseError: Raised if the string does not parse as cql2-json
46
+
47
+ Examples:
48
+ >>> from cql2 import Expr
49
+ >>> expr = Expr.parse_json('{"op":"=","args":[{"property":"landsat:scene_id"},"LC82030282019133LGN00"]}')
50
+ """
51
+
52
+ class Expr:
29
53
  def __init__(self, cql2: str | dict[str, Any]) -> None:
30
54
  """A CQL2 expression.
31
55
 
@@ -94,5 +118,17 @@ class Expr:
94
118
  ['LC82030282019133LGN00']
95
119
  """
96
120
 
121
+ class SqlQuery:
122
+ """A SQL query"""
123
+
124
+ query: str
125
+ """The query, with parameterized fields."""
126
+
127
+ params: list[str]
128
+ """The parameters, to use for binding."""
129
+
130
+ class ParseError(Exception):
131
+ """An error raised when cql2 parsing fails."""
132
+
97
133
  class ValidationError(Exception):
98
134
  """An error raised when cql2 json-schema validation fails."""
@@ -6,6 +6,7 @@ use pyo3::{
6
6
  use std::path::PathBuf;
7
7
 
8
8
  create_exception!(cql2, ValidationError, PyException);
9
+ create_exception!(cql2, ParseError, PyException);
9
10
 
10
11
  /// Crate-specific error enum.
11
12
  enum Error {
@@ -30,15 +31,27 @@ struct SqlQuery {
30
31
  params: Vec<String>,
31
32
  }
32
33
 
34
+ #[pyfunction]
35
+ fn parse_file(path: PathBuf) -> Result<Expr> {
36
+ ::cql2::parse_file(path).map(Expr).map_err(Error::from)
37
+ }
38
+
39
+ #[pyfunction]
40
+ fn parse_json(s: &str) -> PyResult<Expr> {
41
+ ::cql2::parse_json(s)
42
+ .map(Expr)
43
+ .map_err(|err| ParseError::new_err(err.to_string()))
44
+ }
45
+
46
+ #[pyfunction]
47
+ fn parse_text(s: &str) -> PyResult<Expr> {
48
+ ::cql2::parse_text(s)
49
+ .map(Expr)
50
+ .map_err(|err| ParseError::new_err(err.to_string()))
51
+ }
52
+
33
53
  #[pymethods]
34
54
  impl Expr {
35
- /// Parses a CQL2 expression from a file path.
36
- #[staticmethod]
37
- fn from_path(path: PathBuf) -> Result<Expr> {
38
- ::cql2::parse_file(path).map(Expr).map_err(Error::from)
39
- }
40
-
41
- /// Parses a CQL2 expression.
42
55
  #[new]
43
56
  fn new(cql2: Bound<'_, PyAny>) -> Result<Self> {
44
57
  if let Ok(s) = cql2.extract::<&str>() {
@@ -58,17 +71,14 @@ impl Expr {
58
71
  }
59
72
  }
60
73
 
61
- /// Converts this expression to a cql2-json dictionary.
62
74
  fn to_json<'py>(&self, py: Python<'py>) -> Result<Bound<'py, PyAny>> {
63
75
  pythonize::pythonize(py, &self.0).map_err(Error::from)
64
76
  }
65
77
 
66
- /// Converts this expression to cql2-text.
67
78
  fn to_text(&self) -> Result<String> {
68
79
  self.0.to_text().map_err(Error::from)
69
80
  }
70
81
 
71
- /// Converts this expression to SQL query.
72
82
  fn to_sql(&self) -> Result<SqlQuery> {
73
83
  self.0.to_sql().map(SqlQuery::from).map_err(Error::from)
74
84
  }
@@ -137,6 +147,10 @@ fn cql2(py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
137
147
  m.add_class::<Expr>()?;
138
148
  m.add_class::<SqlQuery>()?;
139
149
  m.add_function(wrap_pyfunction!(main, m)?)?;
150
+ m.add_function(wrap_pyfunction!(parse_file, m)?)?;
151
+ m.add_function(wrap_pyfunction!(parse_text, m)?)?;
152
+ m.add_function(wrap_pyfunction!(parse_json, m)?)?;
153
+ m.add("ParseError", py.get_type_bound::<ParseError>())?;
140
154
  m.add("ValidationError", py.get_type_bound::<ValidationError>())?;
141
155
  Ok(())
142
156
  }
@@ -1,21 +1,36 @@
1
+ import json
1
2
  from pathlib import Path
3
+ from typing import Any
2
4
 
3
5
  import pytest
4
- from cql2 import Expr, ValidationError
6
+ import cql2
7
+ from cql2 import Expr, ParseError, ValidationError
5
8
 
6
9
 
7
- def test_from_path(fixtures: Path) -> None:
8
- Expr.from_path(fixtures / "text" / "example01.txt")
10
+ def test_parse_file(fixtures: Path) -> None:
11
+ cql2.parse_file(fixtures / "text" / "example01.txt")
9
12
 
10
13
 
11
- def test_from_path_str(fixtures: Path) -> None:
12
- Expr.from_path(str(fixtures / "text" / "example01.txt"))
14
+ def test_parse_file_str(fixtures: Path) -> None:
15
+ cql2.parse_file(str(fixtures / "text" / "example01.txt"))
13
16
 
14
17
 
15
18
  def test_init(example01_text: str) -> None:
16
19
  Expr(example01_text)
17
20
 
18
21
 
22
+ def test_parse_json(example01_text: str, example01_json: dict[str, Any]) -> None:
23
+ cql2.parse_json(json.dumps(example01_json))
24
+ with pytest.raises(ParseError):
25
+ cql2.parse_json(example01_text)
26
+
27
+
28
+ def test_parse_text(example01_text: str, example01_json: dict[str, Any]) -> None:
29
+ cql2.parse_text(example01_text)
30
+ with pytest.raises(ParseError):
31
+ cql2.parse_text(json.dumps(example01_json))
32
+
33
+
19
34
  def test_to_json(example01_text: str) -> None:
20
35
  Expr(example01_text).to_json() == {
21
36
  "op": "=",
@@ -23,7 +38,7 @@ def test_to_json(example01_text: str) -> None:
23
38
  }
24
39
 
25
40
 
26
- def test_to_text(example01_json: str) -> None:
41
+ def test_to_text(example01_json: dict[str, Any]) -> None:
27
42
  Expr(example01_json).to_text() == "landsat:scene_id = 'LC82030282019133LGN00'"
28
43
 
29
44
 
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes