right and full join

Author: brunovcosta

abstra_json_sql/apply.py

@@ -561,8 +561,8 @@ def apply_from(
                 )
             ]
 
-            if join.join_type == "LEFT":
-                data += [
+            if join.join_type == "LEFT" or join.join_type == "FULL":
+                left_data = [
                     {
                         **add_scope_to_keys(table.name, row),
                         **add_scope_to_keys(
@@ -583,6 +583,30 @@ def apply_from(
                         for join_row in join_table.data
                     )
                 ]
+                data.extend(left_data)
+            if join.join_type == "RIGHT" or join.join_type == "FULL":
+                right_data = [
+                    {
+                        **add_scope_to_keys(join_table.name, join_row),
+                        **add_scope_to_keys(
+                            table.name,
+                            {table_col.name: None for table_col in table.columns},
+                        ),
+                    }
+                    for join_row in join_table.data
+                    if not any(
+                        apply_expression(
+                            join.on,
+                            {
+                                **ctx,
+                                **add_scope_to_keys(table.name, row),
+                                **add_scope_to_keys(join_table.name, join_row),
+                            },
+                        )
+                        for row in table.data
+                    )
+                ]
+                data.extend(right_data)
     else:
         data = [{**add_scope_to_keys(table.name, row)} for row in table.data]
     return data

abstra_json_sql/eval_test.py

@@ -578,6 +578,93 @@ def test_left_outer_join(self):
             ],
         )
 
+    def test_right_join(self):
+        code = "select a.foo, b.bar from a right outer join b on a.id = b.a_id"
+        tables = InMemoryTables(
+            tables=[
+                Table(
+                    name="a",
+                    columns=[
+                        Column(name="id", type="int"),
+                        Column(name="foo", type="text"),
+                    ],
+                    data=[
+                        {"id": 1, "foo": "a1"},
+                        {"id": 2, "foo": "a2"},
+                        {"id": 3, "foo": "a3"},
+                    ],
+                ),
+                Table(
+                    name="b",
+                    columns=[
+                        Column(name="a_id", type="int"),
+                        Column(name="bar", type="text"),
+                    ],
+                    data=[
+                        {"a_id": 1, "bar": "b1"},
+                        {"a_id": 2, "bar": "b2"},
+                        {"a_id": 2, "bar": "b3"},
+                        {"a_id": 4, "bar": "b4"},
+                    ],
+                ),
+            ],
+        )
+        ctx = {}
+        result = eval_sql(code=code, tables=tables, ctx=ctx)
+        self.assertEqual(
+            result,
+            [
+                {"foo": "a1", "bar": "b1"},
+                {"foo": "a2", "bar": "b2"},
+                {"foo": "a2", "bar": "b3"},
+                {"foo": None, "bar": "b4"},
+            ],
+        )
+
+    def test_full_join(self):
+        code = "select a.foo, b.bar from a full outer join b on a.id = b.a_id"
+        tables = InMemoryTables(
+            tables=[
+                Table(
+                    name="a",
+                    columns=[
+                        Column(name="id", type="int"),
+                        Column(name="foo", type="text"),
+                    ],
+                    data=[
+                        {"id": 1, "foo": "a1"},
+                        {"id": 2, "foo": "a2"},
+                        {"id": 3, "foo": "a3"},
+                    ],
+                ),
+                Table(
+                    name="b",
+                    columns=[
+                        Column(name="a_id", type="int"),
+                        Column(name="bar", type="text"),
+                    ],
+                    data=[
+                        {"a_id": 1, "bar": "b1"},
+                        {"a_id": 2, "bar": "b2"},
+                        {"a_id": 2, "bar": "b3"},
+                        {"a_id": 4, "bar": "b4"},
+                    ],
+                ),
+            ],
+        )
+        ctx = {}
+        result = eval_sql(code=code, tables=tables, ctx=ctx)
+        self.assertEqual(
+            result,
+            [
+                {"foo": "a1", "bar": "b1"},
+                {"foo": "a2", "bar": "b2"},
+                {"foo": "a2", "bar": "b3"},
+                {"foo": "a3", "bar": None},
+                {"foo": None, "bar": "b4"},
+            ],
+        )
+
     def test_complete(self):
         code = "\n".join(
             [

abstra_json_sql/tokens.py

@@ -46,6 +46,7 @@
     "LEFT JOIN",
     "RIGHT JOIN",
     "FULL JOIN",
+    "FULL OUTER JOIN",
     "CROSS JOIN",
     "NATURAL JOIN",
     "JOIN",