alf-core 0.14.0 → 0.15.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (436) hide show
  1. data/CHANGELOG.md +10 -0
  2. data/Gemfile +2 -8
  3. data/Gemfile.lock +9 -17
  4. data/examples/operators/frame.alf +2 -0
  5. data/lib/alf-core.rb +24 -22
  6. data/lib/{alf-adapter/alf → alf}/adapter.rb +0 -0
  7. data/lib/{alf-adapter/alf → alf}/adapter/connection.rb +4 -10
  8. data/lib/{alf-adapter/alf → alf}/adapter/connection/schema_cached.rb +0 -0
  9. data/lib/{alf-adapter-fs/alf → alf}/adapter/folder.rb +0 -0
  10. data/lib/{alf-adapter-fs/alf → alf}/adapter/folder/connection.rb +3 -2
  11. data/lib/{alf-adapter-fs/alf → alf}/adapter/fs.rb +0 -0
  12. data/lib/{alf-aggregator/alf → alf}/aggregator.rb +12 -9
  13. data/lib/{alf-aggregator/alf → alf}/aggregator/avg.rb +0 -0
  14. data/lib/{alf-aggregator/alf → alf}/aggregator/collect.rb +0 -0
  15. data/lib/{alf-aggregator/alf → alf}/aggregator/concat.rb +0 -0
  16. data/lib/{alf-aggregator/alf → alf}/aggregator/count.rb +0 -0
  17. data/lib/{alf-aggregator/alf → alf}/aggregator/max.rb +0 -0
  18. data/lib/{alf-aggregator/alf → alf}/aggregator/min.rb +0 -0
  19. data/lib/{alf-aggregator/alf → alf}/aggregator/stddev.rb +0 -0
  20. data/lib/{alf-aggregator/alf → alf}/aggregator/sum.rb +0 -0
  21. data/lib/{alf-aggregator/alf → alf}/aggregator/variance.rb +0 -0
  22. data/lib/{alf-algebra/alf → alf}/algebra.rb +1 -0
  23. data/lib/{alf-algebra/alf → alf}/algebra/operand.rb +13 -6
  24. data/lib/{alf-algebra/alf → alf}/algebra/operand/fake.rb +18 -4
  25. data/lib/alf/algebra/operand/named.rb +65 -0
  26. data/lib/{alf-algebra/alf → alf}/algebra/operand/proxy.rb +7 -3
  27. data/lib/{alf-algebra/alf → alf}/algebra/operator.rb +40 -12
  28. data/lib/{alf-algebra/alf → alf}/algebra/operator/autonum.rb +9 -1
  29. data/lib/{alf-algebra/alf → alf}/algebra/operator/clip.rb +9 -1
  30. data/lib/{alf-algebra/alf → alf}/algebra/operator/coerce.rb +9 -1
  31. data/lib/{alf-algebra/alf → alf}/algebra/operator/compact.rb +8 -1
  32. data/lib/{alf-algebra/alf → alf}/algebra/operator/defaults.rb +8 -1
  33. data/lib/{alf-algebra/alf → alf}/algebra/operator/extend.rb +9 -1
  34. data/lib/{alf-algebra/alf → alf}/algebra/operator/frame.rb +12 -1
  35. data/lib/{alf-algebra/alf → alf}/algebra/operator/generator.rb +8 -1
  36. data/lib/{alf-algebra/alf → alf}/algebra/operator/group.rb +10 -1
  37. data/lib/{alf-algebra/alf → alf}/algebra/operator/hierarchize.rb +8 -0
  38. data/lib/{alf-algebra/alf → alf}/algebra/operator/intersect.rb +9 -1
  39. data/lib/{alf-algebra/alf → alf}/algebra/operator/join.rb +9 -1
  40. data/lib/{alf-algebra/alf → alf}/algebra/operator/matching.rb +10 -2
  41. data/lib/{alf-algebra/alf → alf}/algebra/operator/minus.rb +9 -1
  42. data/lib/{alf-algebra/alf → alf}/algebra/operator/not_matching.rb +9 -1
  43. data/lib/{alf-algebra/alf → alf}/algebra/operator/page.rb +11 -1
  44. data/lib/{alf-algebra/alf → alf}/algebra/operator/project.rb +9 -1
  45. data/lib/{alf-algebra/alf → alf}/algebra/operator/quota.rb +12 -1
  46. data/lib/{alf-algebra/alf → alf}/algebra/operator/rank.rb +11 -2
  47. data/lib/{alf-algebra/alf → alf}/algebra/operator/rename.rb +10 -1
  48. data/lib/{alf-algebra/alf → alf}/algebra/operator/restrict.rb +12 -2
  49. data/lib/{alf-algebra/alf → alf}/algebra/operator/sort.rb +9 -1
  50. data/lib/{alf-algebra/alf → alf}/algebra/operator/summarize.rb +10 -1
  51. data/lib/{alf-algebra/alf → alf}/algebra/operator/ungroup.rb +11 -1
  52. data/lib/{alf-algebra/alf → alf}/algebra/operator/union.rb +9 -1
  53. data/lib/{alf-algebra/alf → alf}/algebra/operator/unwrap.rb +13 -1
  54. data/lib/{alf-algebra/alf → alf}/algebra/operator/wrap.rb +10 -1
  55. data/lib/alf/algebra/shortcut.rb +40 -0
  56. data/lib/alf/algebra/shortcut/allbut.rb +25 -0
  57. data/lib/{alf-algebra/alf → alf}/algebra/support.rb +2 -1
  58. data/lib/{alf-algebra/alf → alf}/algebra/support/binary.rb +0 -0
  59. data/lib/{alf-algebra/alf → alf}/algebra/support/classification.rb +0 -0
  60. data/lib/{alf-algebra/alf → alf}/algebra/support/compiler.rb +0 -0
  61. data/lib/{alf-algebra/alf → alf}/algebra/support/experimental.rb +0 -0
  62. data/lib/{alf-algebra/alf → alf}/algebra/support/non_relational.rb +0 -0
  63. data/lib/{alf-algebra/alf → alf}/algebra/support/nullary.rb +0 -0
  64. data/lib/{alf-algebra/alf → alf}/algebra/support/relational.rb +0 -0
  65. data/lib/{alf-algebra/alf → alf}/algebra/support/rewriter.rb +4 -0
  66. data/lib/{alf-algebra/alf → alf}/algebra/support/signature.rb +7 -8
  67. data/lib/alf/algebra/support/type_check.rb +51 -0
  68. data/lib/{alf-algebra/alf → alf}/algebra/support/unary.rb +0 -0
  69. data/lib/{alf-algebra/alf → alf}/algebra/support/visitor.rb +2 -1
  70. data/lib/{alf-algebra/alf → alf}/algebra/support/with_ordering.rb +0 -0
  71. data/lib/alf/compiler.rb +57 -0
  72. data/lib/alf/compiler/cog.rb +39 -0
  73. data/lib/alf/compiler/default.rb +168 -0
  74. data/lib/alf/compiler/plan.rb +77 -0
  75. data/lib/{alf-core → alf/core}/loader.rb +0 -0
  76. data/lib/{alf-core → alf/core}/version.rb +1 -1
  77. data/lib/{alf-database/alf → alf}/database.rb +0 -0
  78. data/lib/{alf-database/alf → alf}/database/connection.rb +10 -52
  79. data/lib/{alf-database/alf → alf}/database/options.rb +2 -5
  80. data/lib/{alf-core → alf}/dsl.rb +4 -4
  81. data/lib/{alf-engine/alf → alf}/engine.rb +0 -2
  82. data/lib/{alf-engine/alf → alf}/engine/aggregate.rb +6 -2
  83. data/lib/{alf-engine/alf → alf}/engine/autonum.rb +6 -2
  84. data/lib/{alf-engine/alf → alf}/engine/clip.rb +10 -2
  85. data/lib/{alf-engine/alf → alf}/engine/coerce.rb +6 -2
  86. data/lib/alf/engine/cog.rb +58 -0
  87. data/lib/{alf-engine/alf → alf}/engine/compact.rb +2 -2
  88. data/lib/{alf-engine/alf → alf}/engine/compact/set.rb +2 -2
  89. data/lib/{alf-engine/alf → alf}/engine/compact/uniq.rb +2 -2
  90. data/lib/{alf-engine/alf → alf}/engine/concat.rb +2 -2
  91. data/lib/{alf-engine/alf → alf}/engine/defaults.rb +6 -2
  92. data/lib/{alf-engine/alf → alf}/engine/filter.rb +8 -4
  93. data/lib/{alf-engine/alf → alf}/engine/generator.rb +6 -2
  94. data/lib/alf/engine/group.rb +7 -0
  95. data/lib/{alf-engine/alf → alf}/engine/group/hash.rb +11 -2
  96. data/lib/{alf-engine/alf → alf}/engine/hierarchize.rb +6 -2
  97. data/lib/{alf-engine/alf → alf}/engine/infer_heading.rb +2 -2
  98. data/lib/{alf-engine/alf → alf}/engine/join.rb +0 -0
  99. data/lib/{alf-engine/alf → alf}/engine/join/hash.rb +2 -2
  100. data/lib/{alf-engine/alf → alf}/engine/leaf.rb +7 -3
  101. data/lib/{alf-engine/alf → alf}/engine/materialize.rb +5 -1
  102. data/lib/{alf-engine/alf → alf}/engine/materialize/array.rb +3 -2
  103. data/lib/{alf-engine/alf → alf}/engine/materialize/hash.rb +3 -2
  104. data/lib/alf/engine/quota.rb +7 -0
  105. data/lib/{alf-engine/alf → alf}/engine/quota/cesure.rb +8 -3
  106. data/lib/alf/engine/rank.rb +7 -0
  107. data/lib/{alf-engine/alf → alf}/engine/rank/cesure.rb +8 -3
  108. data/lib/{alf-engine/alf → alf}/engine/rename.rb +6 -2
  109. data/lib/alf/engine/semi.rb +7 -0
  110. data/lib/{alf-engine/alf → alf}/engine/semi/hash.rb +7 -2
  111. data/lib/{alf-engine/alf → alf}/engine/set_attr.rb +8 -4
  112. data/lib/alf/engine/sort.rb +13 -0
  113. data/lib/{alf-engine/alf → alf}/engine/sort/in_memory.rb +12 -2
  114. data/lib/alf/engine/summarize.rb +13 -0
  115. data/lib/{alf-engine/alf → alf}/engine/summarize/cesure.rb +5 -4
  116. data/lib/{alf-engine/alf → alf}/engine/summarize/hash.rb +3 -2
  117. data/lib/{alf-engine/alf → alf}/engine/support/cesure.rb +0 -0
  118. data/lib/{alf-engine/alf → alf}/engine/take.rb +6 -2
  119. data/lib/{alf-engine/alf → alf}/engine/to_array.rb +13 -5
  120. data/lib/{alf-engine/alf → alf}/engine/type_safe.rb +2 -2
  121. data/lib/{alf-engine/alf → alf}/engine/ungroup.rb +7 -2
  122. data/lib/{alf-engine/alf → alf}/engine/unwrap.rb +11 -5
  123. data/lib/{alf-engine/alf → alf}/engine/wrap.rb +6 -2
  124. data/lib/{alf-core → alf}/errors.rb +2 -3
  125. data/lib/{alf-core → alf}/ext.rb +0 -0
  126. data/lib/{alf-core → alf}/ext/domain/heading_based.rb +5 -0
  127. data/lib/alf/facade.rb +53 -0
  128. data/lib/{alf-lang/alf → alf}/lang.rb +1 -1
  129. data/lib/{alf-lang/alf → alf}/lang/functional.rb +0 -4
  130. data/lib/{alf-lang/alf → alf}/lang/object_oriented.rb +0 -0
  131. data/lib/{alf-lang/alf → alf}/lang/oo/aggregation_methods.rb +1 -1
  132. data/lib/{alf-lang/alf → alf}/lang/oo/algebra_methods.rb +0 -12
  133. data/lib/{alf-lang/alf → alf}/lang/oo/rendering_methods.rb +1 -1
  134. data/lib/alf/lang/parser.rb +9 -0
  135. data/lib/alf/lang/parser/lispy.rb +63 -0
  136. data/lib/alf/lang/parser/safer.rb +69 -0
  137. data/lib/{alf-lang/alf → alf}/lang/predicates.rb +1 -1
  138. data/lib/{alf-optimizer/alf → alf}/optimizer.rb +15 -7
  139. data/lib/alf/optimizer/project.rb +182 -0
  140. data/lib/{alf-optimizer/alf → alf}/optimizer/restrict.rb +48 -50
  141. data/lib/{alf-predicate/alf → alf}/predicate.rb +16 -12
  142. data/lib/{alf-predicate/alf → alf}/predicate/factory.rb +13 -8
  143. data/lib/{alf-predicate/alf → alf}/predicate/grammar.rb +2 -5
  144. data/lib/{alf-predicate/alf → alf}/predicate/grammar.sexp.yml +11 -7
  145. data/lib/{alf-predicate/alf → alf}/predicate/nodes/and.rb +0 -0
  146. data/lib/{alf-predicate/alf → alf}/predicate/nodes/contradiction.rb +0 -0
  147. data/lib/{alf-predicate/alf → alf}/predicate/nodes/dyadic_comp.rb +0 -0
  148. data/lib/{alf-predicate/alf → alf}/predicate/nodes/eq.rb +0 -0
  149. data/lib/{alf-predicate/alf → alf}/predicate/nodes/expr.rb +10 -5
  150. data/lib/{alf-predicate/alf → alf}/predicate/nodes/gt.rb +0 -0
  151. data/lib/{alf-predicate/alf → alf}/predicate/nodes/gte.rb +0 -0
  152. data/lib/{alf-predicate/alf/predicate/nodes/var_ref.rb → alf/predicate/nodes/identifier.rb} +3 -3
  153. data/lib/{alf-predicate/alf → alf}/predicate/nodes/in.rb +2 -2
  154. data/lib/{alf-predicate/alf → alf}/predicate/nodes/literal.rb +0 -0
  155. data/lib/{alf-predicate/alf → alf}/predicate/nodes/lt.rb +0 -0
  156. data/lib/{alf-predicate/alf → alf}/predicate/nodes/lte.rb +0 -0
  157. data/lib/{alf-predicate/alf → alf}/predicate/nodes/nadic_bool.rb +0 -0
  158. data/lib/alf/predicate/nodes/native.rb +32 -0
  159. data/lib/{alf-predicate/alf → alf}/predicate/nodes/neq.rb +0 -0
  160. data/lib/{alf-predicate/alf → alf}/predicate/nodes/not.rb +0 -0
  161. data/lib/{alf-predicate/alf → alf}/predicate/nodes/or.rb +0 -0
  162. data/lib/{alf-predicate/alf/predicate/nodes/native.rb → alf/predicate/nodes/qualified_identifier.rb} +8 -4
  163. data/lib/{alf-predicate/alf → alf}/predicate/nodes/tautology.rb +0 -0
  164. data/lib/alf/predicate/processors.rb +3 -0
  165. data/lib/alf/predicate/processors/qualifier.rb +25 -0
  166. data/lib/alf/predicate/processors/renamer.rb +27 -0
  167. data/lib/{alf-predicate/alf → alf}/predicate/processors/to_ruby_code.rb +6 -11
  168. data/lib/{alf-io/alf → alf}/reader.rb +11 -2
  169. data/lib/{alf-io/alf → alf}/reader/csv.rb +0 -0
  170. data/lib/{alf-io/alf → alf}/reader/json.rb +0 -0
  171. data/lib/{alf-io/alf → alf}/reader/rash.rb +0 -0
  172. data/lib/{alf-io/alf → alf}/reader/ruby.rb +0 -0
  173. data/lib/alf/reader/yaml.rb +25 -0
  174. data/lib/{alf-relation/alf → alf}/relation.rb +12 -2
  175. data/lib/{alf-relvar/alf → alf}/relvar.rb +14 -21
  176. data/lib/alf/relvar/base.rb +35 -0
  177. data/lib/{alf-relvar/alf → alf}/relvar/fake.rb +3 -2
  178. data/lib/{alf-relvar/alf → alf}/relvar/read_only.rb +6 -30
  179. data/lib/{alf-relvar/alf → alf}/relvar/virtual.rb +0 -31
  180. data/lib/{alf-io/alf → alf}/renderer.rb +0 -0
  181. data/lib/{alf-io/alf → alf}/renderer/csv.rb +0 -0
  182. data/lib/{alf-io/alf → alf}/renderer/json.rb +0 -0
  183. data/lib/{alf-io/alf → alf}/renderer/rash.rb +0 -0
  184. data/lib/{alf-io/alf → alf}/renderer/text.rb +0 -0
  185. data/lib/{alf-io/alf → alf}/renderer/yaml.rb +2 -2
  186. data/lib/{alf-support/alf → alf}/support.rb +2 -1
  187. data/lib/{alf-support/alf → alf}/support/coerce.rb +0 -0
  188. data/lib/{alf-support/alf → alf}/support/config.rb +0 -0
  189. data/lib/{alf-io/alf → alf}/support/csv_utils.rb +0 -0
  190. data/lib/{alf-support/alf → alf}/support/dot_utils.rb +0 -0
  191. data/lib/{alf-support/alf → alf}/support/miscellaneous.rb +0 -0
  192. data/lib/{alf-support/alf → alf}/support/ordered_set.rb +0 -0
  193. data/lib/{alf-support/alf → alf}/support/registry.rb +0 -0
  194. data/lib/{alf-support/alf → alf}/support/scope.rb +0 -0
  195. data/lib/{alf-support/alf → alf}/support/to_lispy.rb +6 -1
  196. data/lib/{alf-support/alf → alf}/support/to_ruby_literal.rb +0 -0
  197. data/lib/alf/support/tree.rb +51 -0
  198. data/lib/{alf-support/alf → alf}/support/tuple_scope.rb +9 -1
  199. data/lib/{alf-relation/alf → alf}/tuple.rb +1 -1
  200. data/lib/{alf-types/alf → alf}/types.rb +0 -0
  201. data/lib/{alf-types/alf → alf}/types/attr_list.rb +2 -2
  202. data/lib/{alf-types/alf → alf}/types/attr_name.rb +0 -0
  203. data/lib/{alf-types/alf → alf}/types/boolean.rb +0 -0
  204. data/lib/{alf-types/alf → alf}/types/heading.rb +0 -0
  205. data/lib/{alf-types/alf → alf}/types/keys.rb +0 -0
  206. data/lib/{alf-types/alf → alf}/types/ordering.rb +7 -1
  207. data/lib/{alf-types/alf → alf}/types/renaming.rb +0 -0
  208. data/lib/{alf-types/alf → alf}/types/selection.rb +0 -0
  209. data/lib/{alf-types/alf → alf}/types/selector.rb +0 -0
  210. data/lib/{alf-types/alf → alf}/types/size.rb +0 -0
  211. data/lib/{alf-types/alf → alf}/types/summarization.rb +0 -0
  212. data/lib/{alf-types/alf → alf}/types/tuple_computation.rb +13 -4
  213. data/lib/{alf-types/alf → alf}/types/tuple_expression.rb +6 -19
  214. data/lib/{alf-types/alf → alf}/types/type_check.rb +1 -0
  215. data/lib/{alf-update/alf → alf}/update.rb +0 -0
  216. data/lib/{alf-update/alf → alf}/update/deleter.rb +0 -3
  217. data/lib/{alf-update/alf → alf}/update/inserter.rb +1 -7
  218. data/lib/{alf-update/alf → alf}/update/updater.rb +0 -2
  219. data/lib/{alf-viewpoint/alf → alf}/viewpoint.rb +9 -7
  220. data/lib/{alf-viewpoint/alf → alf}/viewpoint/metadata.rb +5 -2
  221. data/spec/compiler_helper.rb +20 -0
  222. data/spec/integration/relation/test_to_array.rb +6 -6
  223. data/spec/integration/test_examples.rb +14 -6
  224. data/spec/shared/a_cog.rb +8 -4
  225. data/spec/shared/a_valid_type_implementation.rb +4 -7
  226. data/spec/spec_helper.rb +9 -5
  227. data/spec/type_check_helper.rb +1 -0
  228. data/spec/unit/alf-adapter/shared_examples/an_adapter_with_readable_cogs.rb +1 -1
  229. data/spec/unit/alf-aggregator/test_concat.rb +8 -0
  230. data/spec/unit/alf-algebra/operand/named/test_hash_and_equal.rb +53 -0
  231. data/spec/unit/alf-algebra/operand/named/test_keys.rb +1 -1
  232. data/spec/unit/alf-algebra/operand/named/test_to_ascii_tree.rb +18 -0
  233. data/spec/unit/alf-algebra/operand/named/test_to_cog.rb +24 -0
  234. data/spec/unit/alf-algebra/operand/named/test_to_relvar.rb +1 -1
  235. data/spec/unit/alf-algebra/operand/named/test_type_check.rb +38 -0
  236. data/spec/unit/alf-algebra/operand/proxy/test_to_cog.rb +42 -0
  237. data/spec/unit/alf-algebra/operand/test_coerce.rb +0 -6
  238. data/spec/unit/alf-algebra/operand/test_proxy.rb +1 -1
  239. data/spec/unit/alf-algebra/operator/allbut/test_key_preserving.rb +1 -1
  240. data/spec/unit/alf-algebra/operator/allbut/test_keys.rb +1 -1
  241. data/spec/unit/alf-algebra/operator/allbut/test_type_check.rb +42 -0
  242. data/spec/unit/alf-algebra/operator/autonum/test_type_check.rb +30 -0
  243. data/spec/unit/alf-algebra/operator/clip/test_type_check.rb +42 -0
  244. data/spec/unit/alf-algebra/operator/coerce/test_type_check.rb +42 -0
  245. data/spec/unit/alf-algebra/operator/commons/test_resulting_type.rb +20 -0
  246. data/spec/unit/alf-algebra/operator/commons/test_to_ascii_tree.rb +40 -0
  247. data/spec/unit/alf-algebra/operator/extend/test_type_check.rb +42 -0
  248. data/spec/unit/alf-algebra/operator/frame/test_type_check.rb +54 -0
  249. data/spec/unit/alf-algebra/operator/group/test_type_check.rb +50 -0
  250. data/spec/unit/alf-algebra/operator/hierarchize/test_type_check.rb +54 -0
  251. data/spec/unit/alf-algebra/operator/intersect/test_type_check.rb +30 -0
  252. data/spec/unit/alf-algebra/operator/join/test_type_check.rb +62 -0
  253. data/spec/unit/alf-algebra/operator/matching/test_keys.rb +1 -1
  254. data/spec/unit/alf-algebra/operator/matching/test_type_check.rb +62 -0
  255. data/spec/unit/alf-algebra/operator/minus/test_type_check.rb +30 -0
  256. data/spec/unit/alf-algebra/operator/not_matching/test_type_check.rb +62 -0
  257. data/spec/unit/alf-algebra/operator/page/test_type_check.rb +50 -0
  258. data/spec/unit/alf-algebra/operator/project/test_type_check.rb +42 -0
  259. data/spec/unit/alf-algebra/operator/quota/test_type_check.rb +54 -0
  260. data/spec/unit/alf-algebra/operator/rank/test_type_check.rb +42 -0
  261. data/spec/unit/alf-algebra/operator/rename/test_type_check.rb +42 -0
  262. data/spec/unit/alf-algebra/operator/restrict/test_type_check.rb +46 -0
  263. data/spec/unit/alf-algebra/operator/shared/test_to_cog.rb +34 -0
  264. data/spec/unit/alf-algebra/operator/sort/test_type_check.rb +30 -0
  265. data/spec/unit/alf-algebra/operator/summarize/test_type_check.rb +42 -0
  266. data/spec/unit/alf-algebra/operator/test_hash_and_equal.rb +59 -0
  267. data/spec/unit/alf-algebra/operator/ungroup/test_type_check.rb +44 -0
  268. data/spec/unit/alf-algebra/operator/union/test_type_check.rb +30 -0
  269. data/spec/unit/alf-algebra/operator/unwrap/test_type_check.rb +44 -0
  270. data/spec/unit/alf-algebra/operator/wrap/test_type_check.rb +50 -0
  271. data/spec/unit/alf-algebra/support/signature/test_to_lispy.rb +24 -9
  272. data/spec/unit/alf-algebra/support/test_non_relational.rb +1 -2
  273. data/spec/unit/alf-algebra/support/test_relational.rb +1 -1
  274. data/spec/unit/alf-compiler/default/test_allbut.rb +65 -0
  275. data/spec/unit/alf-compiler/default/test_autonum.rb +30 -0
  276. data/spec/unit/alf-compiler/default/test_clip.rb +30 -0
  277. data/spec/unit/alf-compiler/default/test_coerce.rb +30 -0
  278. data/spec/unit/alf-compiler/default/test_compact.rb +26 -0
  279. data/spec/unit/alf-compiler/default/test_completude.rb +16 -0
  280. data/spec/unit/alf-compiler/default/test_defaults.rb +50 -0
  281. data/spec/unit/alf-compiler/default/test_extend.rb +34 -0
  282. data/spec/unit/alf-compiler/default/test_frame.rb +77 -0
  283. data/spec/unit/alf-compiler/default/test_generator.rb +30 -0
  284. data/spec/unit/alf-compiler/default/test_group.rb +38 -0
  285. data/spec/unit/alf-compiler/default/test_hierarchize.rb +40 -0
  286. data/spec/unit/alf-compiler/default/test_intersect.rb +34 -0
  287. data/spec/unit/alf-compiler/default/test_join.rb +34 -0
  288. data/spec/unit/alf-compiler/default/test_matching.rb +38 -0
  289. data/spec/unit/alf-compiler/default/test_minus.rb +38 -0
  290. data/spec/unit/alf-compiler/default/test_not_matching.rb +38 -0
  291. data/spec/unit/alf-compiler/default/test_page.rb +91 -0
  292. data/spec/unit/alf-compiler/default/test_project.rb +76 -0
  293. data/spec/unit/alf-compiler/default/test_quota.rb +88 -0
  294. data/spec/unit/alf-compiler/default/test_rank.rb +71 -0
  295. data/spec/unit/alf-compiler/default/test_rename.rb +30 -0
  296. data/spec/unit/alf-compiler/default/test_restrict.rb +34 -0
  297. data/spec/unit/alf-compiler/default/test_sort.rb +81 -0
  298. data/spec/unit/alf-compiler/default/test_summarize.rb +85 -0
  299. data/spec/unit/alf-compiler/default/test_ungroup.rb +30 -0
  300. data/spec/unit/alf-compiler/default/test_union.rb +36 -0
  301. data/spec/unit/alf-compiler/default/test_unwrap.rb +30 -0
  302. data/spec/unit/alf-compiler/default/test_wrap.rb +38 -0
  303. data/spec/unit/alf-compiler/shared/compiled_examples.rb +111 -0
  304. data/spec/unit/alf-compiler/test_principle.rb +332 -0
  305. data/spec/unit/alf-core/test_aggregator.rb +0 -24
  306. data/spec/unit/alf-database/connection/test_parse.rb +0 -49
  307. data/spec/unit/alf-database/connection/test_relvar.rb +1 -9
  308. data/spec/unit/alf-database/options/test_parser.rb +23 -0
  309. data/spec/unit/alf-engine/cog/test_to_ascii_tree.rb +14 -0
  310. data/spec/unit/alf-engine/test_aggregate.rb +2 -2
  311. data/spec/unit/alf-engine/test_filter.rb +1 -1
  312. data/spec/unit/alf-engine/test_to_array.rb +16 -2
  313. data/spec/unit/alf-io/reader/test_yaml.rb +30 -0
  314. data/spec/unit/alf-io/renderer/test_yaml.rb +11 -0
  315. data/spec/unit/alf-lang/functional/test_aggregation.rb +18 -4
  316. data/spec/unit/alf-lang/parser/lispy/test_connection_bang.rb +28 -0
  317. data/spec/unit/alf-lang/parser/lispy/test_parse.rb +38 -0
  318. data/spec/unit/alf-lang/parser/lispy/test_to_s.rb +16 -0
  319. data/spec/unit/alf-lang/parser/safer/safe.txt +5 -0
  320. data/spec/unit/alf-lang/parser/safer/test_parse.rb +82 -0
  321. data/spec/unit/alf-lang/parser/safer/unsafe.txt +14 -0
  322. data/spec/unit/alf-optimizer/restrict/test_on_autonum.rb +1 -1
  323. data/spec/unit/alf-optimizer/test_quota.rb +1 -1
  324. data/spec/unit/alf-optimizer/test_rename.rb +7 -0
  325. data/spec/unit/alf-optimizer/test_summarize.rb +1 -1
  326. data/spec/unit/alf-predicate/expr/test_to_proc.rb +4 -6
  327. data/spec/unit/alf-predicate/expr/test_to_ruby_code.rb +23 -23
  328. data/spec/unit/alf-predicate/factory/shared/a_comparison_factory_method.rb +3 -3
  329. data/spec/unit/alf-predicate/factory/test_between.rb +1 -1
  330. data/spec/unit/alf-predicate/factory/test_comp.rb +3 -3
  331. data/spec/unit/alf-predicate/factory/test_factor_predicate.rb +3 -3
  332. data/spec/unit/alf-predicate/factory/{test_var_ref.rb → test_identifier.rb} +4 -4
  333. data/spec/unit/alf-predicate/factory/test_in.rb +1 -1
  334. data/spec/unit/alf-predicate/factory/test_native.rb +9 -4
  335. data/spec/unit/alf-predicate/factory/test_qualified_identifier.rb +17 -0
  336. data/spec/unit/alf-predicate/grammar/test_match.rb +9 -9
  337. data/spec/unit/alf-predicate/grammar/test_sexpr.rb +11 -11
  338. data/spec/unit/alf-predicate/nodes/{var_ref → identifier}/test_and_split.rb +2 -2
  339. data/spec/unit/alf-predicate/nodes/{var_ref → identifier}/test_free_variables.rb +2 -2
  340. data/spec/unit/alf-predicate/nodes/identifier/test_name.rb +14 -0
  341. data/spec/unit/alf-predicate/nodes/qualified_identifier/test_and_split.rb +25 -0
  342. data/spec/unit/alf-predicate/nodes/qualified_identifier/test_free_variables.rb +14 -0
  343. data/spec/unit/alf-predicate/nodes/qualified_identifier/test_name.rb +14 -0
  344. data/spec/unit/alf-predicate/nodes/qualified_identifier/test_qualifier.rb +14 -0
  345. data/spec/unit/alf-predicate/predicate/test_and_split.rb +4 -4
  346. data/spec/unit/alf-predicate/predicate/test_bool_and.rb +1 -1
  347. data/spec/unit/alf-predicate/predicate/test_bool_not.rb +1 -1
  348. data/spec/unit/alf-predicate/predicate/test_bool_or.rb +1 -1
  349. data/spec/unit/alf-predicate/predicate/test_coerce.rb +9 -8
  350. data/spec/unit/alf-predicate/predicate/test_contradiction.rb +2 -2
  351. data/spec/unit/alf-predicate/predicate/test_factory_methods.rb +12 -12
  352. data/spec/unit/alf-predicate/predicate/test_qualify.rb +36 -0
  353. data/spec/unit/alf-predicate/predicate/test_rename.rb +58 -15
  354. data/spec/unit/alf-predicate/predicate/test_tautology.rb +2 -2
  355. data/spec/unit/alf-predicate/predicate/test_to_ruby_code.rb +8 -2
  356. data/spec/unit/alf-predicate/predicate/test_to_ruby_literal.rb +1 -1
  357. data/spec/unit/alf-predicate/test_predicate.rb +7 -8
  358. data/spec/unit/alf-relation/relation/class/test_dum.rb +19 -0
  359. data/spec/unit/alf-relation/relation/test_heading.rb +1 -1
  360. data/spec/unit/alf-relation/relation/test_keys.rb +17 -0
  361. data/spec/unit/alf-relation/relation/test_relation.rb +1 -1
  362. data/spec/unit/alf-relation/relation/test_to_a.rb +10 -10
  363. data/spec/unit/alf-relvar/base/test_oo_lang.rb +26 -10
  364. data/spec/unit/alf-relvar/base/test_to_cog.rb +2 -2
  365. data/spec/unit/alf-relvar/read_only/test_to_relation.rb +17 -0
  366. data/spec/unit/alf-relvar/read_only/test_type.rb +0 -4
  367. data/spec/unit/alf-relvar/virtual/test_oo_lang.rb +0 -4
  368. data/spec/unit/alf-relvar/virtual/test_to_cog.rb +4 -4
  369. data/spec/unit/alf-relvar/virtual/test_to_s.rb +1 -1
  370. data/spec/unit/alf-support/test_to_lispy.rb +13 -31
  371. data/spec/unit/alf-support/test_tuple_scope.rb +11 -0
  372. data/spec/unit/alf-types/ordering/test_coerce.rb +13 -0
  373. data/spec/unit/alf-types/ordering/test_lte.rb +43 -0
  374. data/spec/unit/alf-types/summarization/test_coerce.rb +2 -2
  375. data/spec/unit/alf-types/summarization/test_least.rb +1 -1
  376. data/spec/unit/alf-types/summarization/test_summarize.rb +1 -1
  377. data/spec/unit/alf-types/test_summarization.rb +2 -2
  378. data/spec/unit/alf-types/test_tuple_expression.rb +2 -2
  379. data/spec/unit/alf-types/tuple_computation/test_coerce.rb +4 -13
  380. data/spec/unit/alf-types/tuple_computation/test_empty.rb +24 -0
  381. data/spec/unit/alf-types/tuple_computation/test_project.rb +46 -0
  382. data/spec/unit/alf-types/tuple_expression/test_coerce.rb +1 -10
  383. data/spec/unit/alf-types/tuple_expression/test_evaluate.rb +0 -8
  384. data/spec/unit/alf-types/tuple_expression/test_to_ruby_literal.rb +0 -5
  385. data/spec/unit/alf-update/deleter/{test_var_ref.rb → test_identifier.rb} +1 -1
  386. data/spec/unit/alf-update/inserter/{test_var_ref.rb → test_identifier.rb} +1 -1
  387. data/spec/unit/alf-update/updater/{test_var_ref.rb → test_identifier.rb} +1 -1
  388. data/spec/unit/alf-viewpoint/test_native_const.rb +1 -1
  389. data/spec/update_helper.rb +18 -2
  390. metadata +417 -313
  391. data/lib/alf-algebra/alf/algebra/operand/named.rb +0 -36
  392. data/lib/alf-algebra/alf/algebra/operator/infer_heading.rb +0 -19
  393. data/lib/alf-algebra/alf/algebra/operator/type_safe.rb +0 -21
  394. data/lib/alf-algebra/alf/algebra/support/to_dot.rb +0 -196
  395. data/lib/alf-core/facade.rb +0 -39
  396. data/lib/alf-engine/alf/engine/cog.rb +0 -50
  397. data/lib/alf-engine/alf/engine/compiler.rb +0 -171
  398. data/lib/alf-engine/alf/engine/group.rb +0 -3
  399. data/lib/alf-engine/alf/engine/quota.rb +0 -3
  400. data/lib/alf-engine/alf/engine/rank.rb +0 -3
  401. data/lib/alf-engine/alf/engine/semi.rb +0 -3
  402. data/lib/alf-engine/alf/engine/sort.rb +0 -30
  403. data/lib/alf-engine/alf/engine/summarize.rb +0 -4
  404. data/lib/alf-engine/alf/engine/to_dot.rb +0 -60
  405. data/lib/alf-io/alf/io.rb +0 -6
  406. data/lib/alf-lang/alf/lang/lispy.rb +0 -65
  407. data/lib/alf-predicate/alf/predicate/parser.rb +0 -12
  408. data/lib/alf-predicate/alf/predicate/processors.rb +0 -3
  409. data/lib/alf-predicate/alf/predicate/processors/renamer.rb +0 -19
  410. data/lib/alf-predicate/alf/predicate/processors/to_proc.rb +0 -35
  411. data/lib/alf-relvar/alf/relvar/base.rb +0 -69
  412. data/lib/alf-support/alf/support/bindable.rb +0 -26
  413. data/spec/integration/algebra/test_to_dot.rb +0 -14
  414. data/spec/integration/relvar/test_type_safe.rb +0 -22
  415. data/spec/unit/alf-algebra/operator/infer_heading/test_keys.rb +0 -23
  416. data/spec/unit/alf-algebra/operator/test_infer_heading.rb +0 -16
  417. data/spec/unit/alf-algebra/operator/type_safe/test_heading.rb +0 -26
  418. data/spec/unit/alf-algebra/operator/type_safe/test_keys.rb +0 -26
  419. data/spec/unit/alf-engine/compiler/test_on_frame.rb +0 -70
  420. data/spec/unit/alf-engine/compiler/test_on_hierarchize.rb +0 -33
  421. data/spec/unit/alf-engine/compiler/test_on_page.rb +0 -128
  422. data/spec/unit/alf-engine/compiler/test_unsupported.rb +0 -48
  423. data/spec/unit/alf-lang/lispy/test_connection_bang.rb +0 -26
  424. data/spec/unit/alf-lang/lispy/test_parse.rb +0 -38
  425. data/spec/unit/alf-lang/lispy/test_to_s.rb +0 -14
  426. data/spec/unit/alf-optimizer/optimizer/test_optimizer.rb +0 -37
  427. data/spec/unit/alf-optimizer/test_infer_heading.rb +0 -9
  428. data/spec/unit/alf-predicate/grammar/test_parse.rb +0 -23
  429. data/spec/unit/alf-predicate/nodes/var_ref/test_var_name.rb +0 -14
  430. data/spec/unit/alf-relvar/base/test_name.rb +0 -15
  431. data/spec/unit/alf-relvar/virtual/test_connection.rb +0 -15
  432. data/spec/unit/alf-support/bindable/test_bind.rb +0 -60
  433. data/spec/unit/alf-support/bindable/test_bound.rb +0 -31
  434. data/spec/unit/alf-support/bindable/test_connection.rb +0 -31
  435. data/spec/unit/alf-support/bindable/test_connection_bang.rb +0 -35
  436. data/spec/unit/alf-update/inserter/test_type_safe.rb +0 -72
@@ -2,6 +2,7 @@ module Alf
2
2
  module Algebra
3
3
  module Operator
4
4
  include Operand
5
+ include TypeCheck
5
6
 
6
7
  ### Class-based tools
7
8
 
@@ -48,18 +49,42 @@ module Alf
48
49
  signature.parse_args(args, self)
49
50
  end
50
51
 
51
- # Binds to a connection
52
- def bind(connection)
53
- super{|c| c.operands = operands.map{|op| op.bind(connection) } }
54
- end
55
-
56
52
  # @return [Signature] the operator signature.
57
53
  def signature
58
54
  self.class.signature
59
55
  end
60
56
 
57
+ ### heading, keys, and others
58
+
59
+ def type_check(options = {strict: false})
60
+ operands.each{|op| op.type_check(options) }
61
+ _type_check(options)
62
+ heading
63
+ end
64
+
61
65
  ### -> to_xxx
62
66
 
67
+ def to_cog(plan = nil)
68
+ plan ? plan.compile(self) : Alf::Compiler::Default.new.call(self)
69
+ end
70
+
71
+ def to_s
72
+ label = ""
73
+ label << self.class.rubycase_name.to_s
74
+ label << "(..."
75
+ datasets, arguments, options = signature.collect_on(self)
76
+ arguments.each_with_index do |arg,i|
77
+ label << ", "
78
+ label << Alf::Support.to_lispy(arg, "[native]")
79
+ end
80
+ unless options.nil? or options.empty?
81
+ label << ", "
82
+ label << Alf::Support.to_lispy(options, "[native]")
83
+ end
84
+ label << ")"
85
+ label
86
+ end
87
+
63
88
  def to_lispy
64
89
  cmdname = self.class.rubycase_name
65
90
  oper, args, opts = signature.collect_on(self)
@@ -67,7 +92,6 @@ module Alf
67
92
  args = args.map{|arg| Support.to_lispy(arg) }
68
93
  "#{cmdname}(#{args.join(', ')})"
69
94
  end
70
- alias :to_s :to_lispy
71
95
 
72
96
  def to_relvar
73
97
  Relvar::Virtual.new(self)
@@ -86,16 +110,22 @@ module Alf
86
110
  bl.nil? ? super : super.tap(&bl)
87
111
  end
88
112
 
113
+ def hash
114
+ @hash ||= [ self.class,
115
+ operands,
116
+ signature.collect_on(self) ].hash
117
+ end
118
+
89
119
  def ==(other)
90
- (other.object_id == self.object_id) ||
91
- ((other.class == self.class) &&
92
- (other.operands == self.operands) &&
93
- (other.signature.collect_on(self) == self.signature.collect_on(self)))
120
+ super || ((other.class == self.class) &&
121
+ (other.signature.collect_on(other) == self.signature.collect_on(self)))
94
122
  end
123
+ alias :eql? :==
95
124
 
96
125
  protected
97
126
 
98
127
  def clean_computed_attributes!
128
+ @hash = nil
99
129
  @heading = nil
100
130
  @common_heading = nil
101
131
  @common_attributes = nil
@@ -111,7 +141,6 @@ require_relative 'operator/compact'
111
141
  require_relative 'operator/sort'
112
142
  require_relative 'operator/clip'
113
143
  require_relative 'operator/coerce'
114
- require_relative 'operator/type_safe'
115
144
  require_relative 'operator/generator'
116
145
 
117
146
  require_relative 'operator/extend'
@@ -134,4 +163,3 @@ require_relative 'operator/summarize'
134
163
  require_relative 'operator/rank'
135
164
  require_relative 'operator/page'
136
165
  require_relative 'operator/quota'
137
- require_relative 'operator/infer_heading'
@@ -1,7 +1,9 @@
1
1
  module Alf
2
2
  module Algebra
3
3
  class Autonum
4
- include Operator, NonRelational, Unary
4
+ include Operator
5
+ include NonRelational
6
+ include Unary
5
7
 
6
8
  signature do |s|
7
9
  s.argument :as, AttrName, :autonum
@@ -15,6 +17,12 @@ module Alf
15
17
  @keys ||= operand.keys + [ [ as ] ]
16
18
  end
17
19
 
20
+ private
21
+
22
+ def _type_check(options)
23
+ no_name_clash!(operand.attr_list, AttrList[as])
24
+ end
25
+
18
26
  end # class Autonum
19
27
  end # module Algebra
20
28
  end # module Alf
@@ -1,7 +1,9 @@
1
1
  module Alf
2
2
  module Algebra
3
3
  class Clip
4
- include Operator, NonRelational, Unary
4
+ include Operator
5
+ include NonRelational
6
+ include Unary
5
7
 
6
8
  signature do |s|
7
9
  s.argument :attributes, AttrList, []
@@ -26,6 +28,12 @@ module Alf
26
28
  allbut ? heading.to_attr_list : attributes
27
29
  end
28
30
 
31
+ private
32
+
33
+ def _type_check(options)
34
+ no_unknown!(attributes - operand.attr_list)
35
+ end
36
+
29
37
  end # class Clip
30
38
  end # module Algebra
31
39
  end # module Alf
@@ -1,7 +1,9 @@
1
1
  module Alf
2
2
  module Algebra
3
3
  class Coerce
4
- include Operator, NonRelational, Unary
4
+ include Operator
5
+ include NonRelational
6
+ include Unary
5
7
 
6
8
  signature do |s|
7
9
  s.argument :coercions, Heading, {}
@@ -15,6 +17,12 @@ module Alf
15
17
  @keys ||= operand.keys
16
18
  end
17
19
 
20
+ private
21
+
22
+ def _type_check(options)
23
+ no_unknown!(coercions.to_attr_list - operand.attr_list)
24
+ end
25
+
18
26
  end # class Coerce
19
27
  end # module Algebra
20
28
  end # module Alf
@@ -1,7 +1,9 @@
1
1
  module Alf
2
2
  module Algebra
3
3
  class Compact
4
- include Operator, NonRelational, Unary
4
+ include Operator
5
+ include NonRelational
6
+ include Unary
5
7
 
6
8
  signature do |s|
7
9
  end
@@ -14,6 +16,11 @@ module Alf
14
16
  @keys ||= operand.keys.if_empty{ Keys[ heading.to_attr_list ] }
15
17
  end
16
18
 
19
+ private
20
+
21
+ def _type_check(options)
22
+ end
23
+
17
24
  end # class Compact
18
25
  end # module Algebra
19
26
  end # module Alf
@@ -1,7 +1,9 @@
1
1
  module Alf
2
2
  module Algebra
3
3
  class Defaults
4
- include Operator, NonRelational, Unary
4
+ include Operator
5
+ include NonRelational
6
+ include Unary
5
7
 
6
8
  signature do |s|
7
9
  s.argument :defaults, TupleComputation, {}
@@ -19,6 +21,11 @@ module Alf
19
21
  @keys ||= operand.keys
20
22
  end
21
23
 
24
+ private
25
+
26
+ def _type_check(options)
27
+ end
28
+
22
29
  end # class Defaults
23
30
  end # module Algebra
24
31
  end # module Alf
@@ -1,7 +1,9 @@
1
1
  module Alf
2
2
  module Algebra
3
3
  class Extend
4
- include Operator, Relational, Unary
4
+ include Operator
5
+ include Relational
6
+ include Unary
5
7
 
6
8
  signature do |s|
7
9
  s.argument :ext, TupleComputation, {}
@@ -18,6 +20,12 @@ module Alf
18
20
  end
19
21
  end
20
22
 
23
+ private
24
+
25
+ def _type_check(options)
26
+ no_name_clash!(operand.attr_list, ext.to_attr_list)
27
+ end
28
+
21
29
  end # class Extend
22
30
  end # module Algebra
23
31
  end # module Alf
@@ -1,7 +1,10 @@
1
1
  module Alf
2
2
  module Algebra
3
3
  class Frame
4
- include Operator, Relational, Unary, WithOrdering
4
+ include Operator
5
+ include Relational
6
+ include Unary
7
+ include WithOrdering
5
8
 
6
9
  signature do |s|
7
10
  s.argument :ordering, Ordering, []
@@ -17,6 +20,14 @@ module Alf
17
20
  operand.keys
18
21
  end
19
22
 
23
+ private
24
+
25
+ def _type_check(options)
26
+ valid_ordering!(ordering, operand.attr_list)
27
+ type_check_error!("invalid offset `#{offset}`") unless offset >= 0
28
+ type_check_error!("invalid limit `#{limit}`") unless limit >= 0
29
+ end
30
+
20
31
  end # class Frame
21
32
  end # module Algebra
22
33
  end # module Alf
@@ -1,7 +1,9 @@
1
1
  module Alf
2
2
  module Algebra
3
3
  class Generator
4
- include Operator, NonRelational, Nullary
4
+ include Operator
5
+ include NonRelational
6
+ include Nullary
5
7
 
6
8
  signature do |s|
7
9
  s.argument :size, Size, 10
@@ -16,6 +18,11 @@ module Alf
16
18
  @keys ||= Keys[ [as] ]
17
19
  end
18
20
 
21
+ private
22
+
23
+ def _type_check(options)
24
+ end
25
+
19
26
  end # class Generator
20
27
  end # module Algebra
21
28
  end # module Alf
@@ -1,7 +1,9 @@
1
1
  module Alf
2
2
  module Algebra
3
3
  class Group
4
- include Operator, Relational, Unary
4
+ include Operator
5
+ include Relational
6
+ include Unary
5
7
 
6
8
  signature do |s|
7
9
  s.argument :attributes, AttrList, []
@@ -23,6 +25,13 @@ module Alf
23
25
  }.freeze
24
26
  end
25
27
 
28
+ private
29
+
30
+ def _type_check(options)
31
+ no_unknown!(attributes - operand.attr_list)
32
+ no_name_clash!(operand.attr_list - attributes, AttrList[as])
33
+ end
34
+
26
35
  end # class Group
27
36
  end # module Algebra
28
37
  end # module Alf
@@ -17,6 +17,14 @@ module Alf
17
17
  operand.keys
18
18
  end
19
19
 
20
+ private
21
+
22
+ def _type_check(options)
23
+ no_unknown!(id - operand.attr_list)
24
+ no_unknown!(parent - operand.attr_list)
25
+ no_name_clash!(operand.attr_list, AttrList[as])
26
+ end
27
+
20
28
  end # class Hierarchize
21
29
  end # module Algebra
22
30
  end # module Alf
@@ -1,7 +1,9 @@
1
1
  module Alf
2
2
  module Algebra
3
3
  class Intersect
4
- include Operator, Relational, Binary
4
+ include Operator
5
+ include Relational
6
+ include Binary
5
7
 
6
8
  signature do |s|
7
9
  end
@@ -19,6 +21,12 @@ module Alf
19
21
  end
20
22
  end
21
23
 
24
+ private
25
+
26
+ def _type_check(options)
27
+ same_heading!(left.heading, right.heading)
28
+ end
29
+
22
30
  end # class Intersect
23
31
  end # module Algebra
24
32
  end # module Alf
@@ -1,7 +1,9 @@
1
1
  module Alf
2
2
  module Algebra
3
3
  class Join
4
- include Operator, Relational, Binary
4
+ include Operator
5
+ include Relational
6
+ include Binary
5
7
 
6
8
  signature do |s|
7
9
  end
@@ -22,6 +24,12 @@ module Alf
22
24
  end
23
25
  end
24
26
 
27
+ private
28
+
29
+ def _type_check(options)
30
+ joinable_headings!(left.heading, right.heading, options)
31
+ end
32
+
25
33
  end # class Join
26
34
  end # module Algebra
27
35
  end # module Alf
@@ -1,7 +1,9 @@
1
1
  module Alf
2
2
  module Algebra
3
3
  class Matching
4
- include Operator, Relational, Binary
4
+ include Operator
5
+ include Relational
6
+ include Binary
5
7
 
6
8
  signature do |s|
7
9
  end
@@ -11,7 +13,13 @@ module Alf
11
13
  end
12
14
 
13
15
  def keys
14
- @keys ||= (left.keys + right.keys.select{|k| k.subset?(common_attributes) })
16
+ @keys ||= left.keys
17
+ end
18
+
19
+ private
20
+
21
+ def _type_check(options)
22
+ joinable_headings!(left.heading, right.heading, options)
15
23
  end
16
24
 
17
25
  end # class Matching
@@ -1,7 +1,9 @@
1
1
  module Alf
2
2
  module Algebra
3
3
  class Minus
4
- include Operator, Relational, Binary
4
+ include Operator
5
+ include Relational
6
+ include Binary
5
7
 
6
8
  signature do |s|
7
9
  end
@@ -14,6 +16,12 @@ module Alf
14
16
  @keys ||= left.keys
15
17
  end
16
18
 
19
+ private
20
+
21
+ def _type_check(options)
22
+ same_heading!(left.heading, right.heading)
23
+ end
24
+
17
25
  end # class Minus
18
26
  end # module Algebra
19
27
  end # module Alf
@@ -1,7 +1,9 @@
1
1
  module Alf
2
2
  module Algebra
3
3
  class NotMatching
4
- include Operator, Relational, Binary
4
+ include Operator
5
+ include Relational
6
+ include Binary
5
7
 
6
8
  signature do |s|
7
9
  end
@@ -14,6 +16,12 @@ module Alf
14
16
  @keys ||= left.keys
15
17
  end
16
18
 
19
+ private
20
+
21
+ def _type_check(options)
22
+ joinable_headings!(left.heading, right.heading, options)
23
+ end
24
+
17
25
  end # class NotMatching
18
26
  end # module Algebra
19
27
  end # module Alf