support OrderedCollections v2

.github/workflows/ci.yml

@@ -15,11 +15,11 @@ jobs:
       matrix:
         include:
         - name: Julia LTS / Linux 64bit
-          version: '1.6'
+          version: '1.10'
           os: ubuntu-latest
           arch: x64
         - name: Julia LTS / Linux 32bit
-          version: '1.6'
+          version: '1.10'
           os: ubuntu-latest
           arch: x86
         - name: Julia Stable / Linux 64bit

Project.toml

@@ -1,7 +1,7 @@
 name = "FunSQL"
 uuid = "cf6cc811-59f4-4a10-b258-a8547a8f6407"
 authors = ["Kirill Simonov <xi@resolvent.net>", "Clark C. Evans <cce@clarkevans.com>"]
-version = "0.15.0"
+version = "0.15.1"
 
 [deps]
 DBInterface = "a10d1c49-ce27-4219-8d33-6db1a4562965"
@@ -16,7 +16,7 @@ Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
 DBInterface = "2.5"
 DataAPI = "1.13"
 LRUCache = "1.3"
-OrderedCollections = "1.4"
+OrderedCollections = "1.4, 2"
 PrettyPrinting = "0.3.2, 0.4"
 Tables = "1.6"
-julia = "1.6"
+julia = "1.10"

docs/src/examples/index.md

@@ -445,7 +445,7 @@ however we must ensure that all column names are unique.
 
     q = q |>
         Select(Get.(keys(person_table.columns))...,
-               Get.(keys(visit_occurrence_table.columns), over = Get.visit)...)
+               Get.(keys(visit_occurrence_table.columns), tail = Get.visit)...)
     #=>
     ERROR: FunSQL.DuplicateLabelError: `person_id` is used more than once in:
     ⋮
@@ -454,7 +454,7 @@ however we must ensure that all column names are unique.
     q = q |>
         Select(Get.(keys(person_table.columns))...,
                Get.(filter(!in(keys(person_table.columns)), collect(keys(visit_occurrence_table.columns))),
-                    over = Get.visit)...)
+                    tail = Get.visit)...)
 
     render(conn, q) |> print
     #=>

docs/src/guide/index.md

@@ -571,7 +571,7 @@ pipelines.  The first pipeline is attached using the `|>` operator and the
 second one is provided as an argument to the `Join` constructor.
 Alternatively, both input pipelines can be specified as keyword arguments:
 
-    Join(over = From(:person),
+    Join(tail = From(:person),
          joinee = :location => From(:location),
          on = Get.location_id .== Get.location.location_id,
          left = true) |>
@@ -645,22 +645,7 @@ admits several equivalent forms:
     Get("year_of_birth")
 
 Such column references are resolved at the place of use against the input
-dataset.  As we mentioned earlier, sometimes column references cannot be
-resolved unambiguously.  To alleviate this problem, we can bind the column
-reference to the node that produces it:
-
-*Show all patients with their state of residence.*
-
-    qₚ = From(:person)
-    qₗ = From(:location)
-    q = qₚ |>
-        LeftJoin(qₗ, on = qₚ.location_id .== qₗ.location_id) |>
-        Select(qₚ.person_id, qₗ.state)
-
-The notation `qₚ.location_id` and `qₗ.location_id` is a syntax sugar for
-
-    Get(:location_id, over = qₚ)
-    Get(:location_id, over = qₗ)
+dataset.
 
 
 ## `Fun`: SQL Functions and Operators