Merge pull request #524 from EvgSkv/main

Catch up ti2023.

Author: EvgSkv

.github/scripts/setup.py

@@ -33,6 +33,12 @@
   long_description_content_type = "text/markdown",
   url="https://github.com/evgskv/logica",
   packages=setuptools.find_namespace_packages(),
+  package_data={
+    # The release script clones the repo into a `logica/` folder and builds a
+    # namespace package, so this package is named `logica.parser_cpp`.
+    # Ship the C++ source so the runtime bridge can build liblogica_parse_cpp.so.
+    'logica.parser_cpp': ['logica_parse.cpp'],
+  },
   classifiers = [
       "Topic :: Database",
       "License :: OSI Approved :: Apache Software License"

colab_logica.py

@@ -551,3 +551,11 @@ def PostgresJumpStart():
   print('Installation succeeded. Connecting...')
   # Connect to the database.
   ConnectToLocalPostgres()
+
+
+def UseCppParser():
+  os.environ['LOGICA_PARSER'] = 'CPP'
+  from .parser_cpp import logica_parse_cpp  # type: ignore
+  so_path = logica_parse_cpp.EnsureCppParserSharedObject()
+  logica_parse_cpp.LoadCppParserLib()
+  return so_path

integration_tests/duckdb_json_test.l

@@ -16,7 +16,7 @@
 Data() = Join(['{"a": 1, "b": [1,2]', ' "c": {"d": "A", "e": [1,2,3]}}'], ",");
 Data() = '{"a": 2, "b": [3,4], "c": {"d": "B", "e": [4,5,6]}}';
 
-Test(a: record.a, e_element: x, record:) order_by("record") :-
+Test(a: record.a, e_element: x, record:) order_by("record", "e_element") :-
   d = Data(),
   record = Cast(d, {a: Num, b: [Num], c: {d: Str, e: [Num]}}),
   x in record.c.e;