diff --git a/application/pivot/common/daanse.pivot.base.bndrun b/application/pivot/common/daanse.pivot.base.bndrun index 3dba61a..62aa2fa 100644 --- a/application/pivot/common/daanse.pivot.base.bndrun +++ b/application/pivot/common/daanse.pivot.base.bndrun @@ -63,12 +63,12 @@ order=sortbynameversion,\ begin=-1 -runbundles: \ - ai.starlake.transpiler;version='[1.8.0,1.8.1)',\ + ai.starlake.transpiler;version='[1.16.0,1.16.1)',\ ch.qos.logback.classic;version='[1.5.6,1.5.7)',\ com.fasterxml.woodstox.woodstox-core;version='[7.1.1,7.1.2)',\ com.github.ben-manes.caffeine;version='[3.1.2,3.1.3)',\ com.zaxxer.HikariCP;version='[7.1.0,7.1.1)',\ - net.sf.jsqlparser;version='[5.3.167,5.3.168)',\ + net.sf.jsqlparser;version='[5.4.162,5.4.163)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.jetty12;version='[2.0.4,2.0.5)',\ @@ -150,7 +150,7 @@ org.eclipse.emf.common;version='[2.44.0,2.44.1)',\ org.eclipse.emf.ecore;version='[2.41.0,2.41.1)',\ org.eclipse.emf.ecore.xmi;version='[2.39.0,2.39.1)',\ - org.eclipse.fennec.emf.osgi.component;version='[0.1.1,0.1.2)',\ + org.eclipse.fennec.emf.osgi.component;version='[1.0.2,1.0.3)',\ org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\ org.objectweb.asm;version='[9.9.0,9.9.1)',\ org.objectweb.asm.commons;version='[9.9.0,9.9.1)',\ diff --git a/application/pivot/duckdb/daanse.pivot.duckdb.bndrun b/application/pivot/duckdb/daanse.pivot.duckdb.bndrun index d549d70..0acc98c 100644 --- a/application/pivot/duckdb/daanse.pivot.duckdb.bndrun +++ b/application/pivot/duckdb/daanse.pivot.duckdb.bndrun @@ -20,12 +20,12 @@ bnd.identity;id='org.eclipse.daanse.sql.dialect.db.duckdb' -runbundles: \ - ai.starlake.transpiler;version='[1.8.0,1.8.1)',\ + ai.starlake.transpiler;version='[1.16.0,1.16.1)',\ ch.qos.logback.classic;version='[1.5.6,1.5.7)',\ com.fasterxml.woodstox.woodstox-core;version='[7.1.1,7.1.2)',\ com.github.ben-manes.caffeine;version='[3.1.8,3.1.9)',\ com.zaxxer.HikariCP;version='[7.1.0,7.1.1)',\ - net.sf.jsqlparser;version='[5.3.167,5.3.168)',\ + net.sf.jsqlparser;version='[5.4.162,5.4.163)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.jetty12;version='[2.0.4,2.0.5)',\ @@ -113,7 +113,7 @@ org.eclipse.emf.common;version='[2.44.0,2.44.1)',\ org.eclipse.emf.ecore;version='[2.41.0,2.41.1)',\ org.eclipse.emf.ecore.xmi;version='[2.39.0,2.39.1)',\ - org.eclipse.fennec.emf.osgi.component;version='[0.1.1,0.1.2)',\ + org.eclipse.fennec.emf.osgi.component;version='[1.0.2,1.0.3)',\ org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\ org.objectweb.asm;version='[9.9.0,9.9.1)',\ org.objectweb.asm.commons;version='[9.9.0,9.9.1)',\ diff --git a/application/pivot/h2/daanse.pivot.h2.bndrun b/application/pivot/h2/daanse.pivot.h2.bndrun index f389cbc..f325806 100644 --- a/application/pivot/h2/daanse.pivot.h2.bndrun +++ b/application/pivot/h2/daanse.pivot.h2.bndrun @@ -20,13 +20,13 @@ bnd.identity;id='org.eclipse.daanse.sql.dialect.db.h2' -runbundles: \ - ai.starlake.transpiler;version='[1.8.0,1.8.1)',\ + ai.starlake.transpiler;version='[1.16.0,1.16.1)',\ ch.qos.logback.classic;version='[1.5.6,1.5.7)',\ com.fasterxml.woodstox.woodstox-core;version='[7.1.1,7.1.2)',\ com.github.ben-manes.caffeine;version='[3.1.8,3.1.9)',\ com.h2database;version='[2.3.230,2.3.231)',\ com.zaxxer.HikariCP;version='[7.1.0,7.1.1)',\ - net.sf.jsqlparser;version='[5.3.167,5.3.168)',\ + net.sf.jsqlparser;version='[5.4.162,5.4.163)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.jetty12;version='[2.0.4,2.0.5)',\ @@ -113,7 +113,7 @@ org.eclipse.emf.common;version='[2.44.0,2.44.1)',\ org.eclipse.emf.ecore;version='[2.41.0,2.41.1)',\ org.eclipse.emf.ecore.xmi;version='[2.39.0,2.39.1)',\ - org.eclipse.fennec.emf.osgi.component;version='[0.1.1,0.1.2)',\ + org.eclipse.fennec.emf.osgi.component;version='[1.0.2,1.0.3)',\ org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\ org.objectweb.asm;version='[9.9.0,9.9.1)',\ org.objectweb.asm.commons;version='[9.9.0,9.9.1)',\ diff --git a/application/pivot/mariadb/daanse.pivot.mariadb.bndrun b/application/pivot/mariadb/daanse.pivot.mariadb.bndrun index 2d04d31..d54c85c 100644 --- a/application/pivot/mariadb/daanse.pivot.mariadb.bndrun +++ b/application/pivot/mariadb/daanse.pivot.mariadb.bndrun @@ -20,13 +20,13 @@ bnd.identity;id='org.eclipse.daanse.sql.dialect.db.mariadb' -runbundles: \ - ai.starlake.transpiler;version='[1.8.0,1.8.1)',\ + ai.starlake.transpiler;version='[1.16.0,1.16.1)',\ ch.qos.logback.classic;version='[1.5.6,1.5.7)',\ com.fasterxml.woodstox.woodstox-core;version='[7.1.1,7.1.2)',\ com.github.ben-manes.caffeine;version='[3.1.8,3.1.9)',\ com.zaxxer.HikariCP;version='[7.1.0,7.1.1)',\ mariadb-java-client;version='[3.5.5,3.5.6)',\ - net.sf.jsqlparser;version='[5.3.167,5.3.168)',\ + net.sf.jsqlparser;version='[5.4.162,5.4.163)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.jetty12;version='[2.0.4,2.0.5)',\ @@ -114,7 +114,7 @@ org.eclipse.emf.common;version='[2.44.0,2.44.1)',\ org.eclipse.emf.ecore;version='[2.41.0,2.41.1)',\ org.eclipse.emf.ecore.xmi;version='[2.39.0,2.39.1)',\ - org.eclipse.fennec.emf.osgi.component;version='[0.1.1,0.1.2)',\ + org.eclipse.fennec.emf.osgi.component;version='[1.0.2,1.0.3)',\ org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\ org.objectweb.asm;version='[9.9.0,9.9.1)',\ org.objectweb.asm.commons;version='[9.9.0,9.9.1)',\ diff --git a/application/pivot/mssql/daanse.pivot.mssql.bndrun b/application/pivot/mssql/daanse.pivot.mssql.bndrun index e56b224..2e13eec 100644 --- a/application/pivot/mssql/daanse.pivot.mssql.bndrun +++ b/application/pivot/mssql/daanse.pivot.mssql.bndrun @@ -20,13 +20,13 @@ bnd.identity;id='org.eclipse.daanse.sql.dialect.db.mssqlserver' -runbundles: \ - ai.starlake.transpiler;version='[1.8.0,1.8.1)',\ + ai.starlake.transpiler;version='[1.16.0,1.16.1)',\ ch.qos.logback.classic;version='[1.5.6,1.5.7)',\ com.fasterxml.woodstox.woodstox-core;version='[7.1.1,7.1.2)',\ com.github.ben-manes.caffeine;version='[3.1.8,3.1.9)',\ com.microsoft.sqlserver.mssql-jdbc;version='[12.8.2,12.8.3)',\ com.zaxxer.HikariCP;version='[7.1.0,7.1.1)',\ - net.sf.jsqlparser;version='[5.3.167,5.3.168)',\ + net.sf.jsqlparser;version='[5.4.162,5.4.163)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.jetty12;version='[2.0.4,2.0.5)',\ @@ -113,7 +113,7 @@ org.eclipse.emf.common;version='[2.44.0,2.44.1)',\ org.eclipse.emf.ecore;version='[2.41.0,2.41.1)',\ org.eclipse.emf.ecore.xmi;version='[2.39.0,2.39.1)',\ - org.eclipse.fennec.emf.osgi.component;version='[0.1.1,0.1.2)',\ + org.eclipse.fennec.emf.osgi.component;version='[1.0.2,1.0.3)',\ org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\ org.objectweb.asm;version='[9.9.0,9.9.1)',\ org.objectweb.asm.commons;version='[9.9.0,9.9.1)',\ diff --git a/application/pivot/mysql/daanse.pivot.mysql.bndrun b/application/pivot/mysql/daanse.pivot.mysql.bndrun index 5baeff3..090e34c 100644 --- a/application/pivot/mysql/daanse.pivot.mysql.bndrun +++ b/application/pivot/mysql/daanse.pivot.mysql.bndrun @@ -20,13 +20,13 @@ bnd.identity;id='org.eclipse.daanse.sql.dialect.db.mysql' -runbundles: \ - ai.starlake.transpiler;version='[1.8.0,1.8.1)',\ + ai.starlake.transpiler;version='[1.16.0,1.16.1)',\ ch.qos.logback.classic;version='[1.5.6,1.5.7)',\ com.fasterxml.woodstox.woodstox-core;version='[7.1.1,7.1.2)',\ com.github.ben-manes.caffeine;version='[3.1.8,3.1.9)',\ com.mysql.cj;version='[9.0.0,9.0.1)',\ com.zaxxer.HikariCP;version='[7.1.0,7.1.1)',\ - net.sf.jsqlparser;version='[5.3.167,5.3.168)',\ + net.sf.jsqlparser;version='[5.4.162,5.4.163)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.jetty12;version='[2.0.4,2.0.5)',\ @@ -113,7 +113,7 @@ org.eclipse.emf.common;version='[2.44.0,2.44.1)',\ org.eclipse.emf.ecore;version='[2.41.0,2.41.1)',\ org.eclipse.emf.ecore.xmi;version='[2.39.0,2.39.1)',\ - org.eclipse.fennec.emf.osgi.component;version='[0.1.1,0.1.2)',\ + org.eclipse.fennec.emf.osgi.component;version='[1.0.2,1.0.3)',\ org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\ org.objectweb.asm;version='[9.9.0,9.9.1)',\ org.objectweb.asm.commons;version='[9.9.0,9.9.1)',\ diff --git a/application/pivot/oracle/daanse.pivot.oracle.bndrun b/application/pivot/oracle/daanse.pivot.oracle.bndrun index fabbe69..6f6bec8 100644 --- a/application/pivot/oracle/daanse.pivot.oracle.bndrun +++ b/application/pivot/oracle/daanse.pivot.oracle.bndrun @@ -20,12 +20,12 @@ bnd.identity;id='org.eclipse.daanse.sql.dialect.db.oracle' -runbundles: \ - ai.starlake.transpiler;version='[1.8.0,1.8.1)',\ + ai.starlake.transpiler;version='[1.16.0,1.16.1)',\ ch.qos.logback.classic;version='[1.5.6,1.5.7)',\ com.fasterxml.woodstox.woodstox-core;version='[7.1.1,7.1.2)',\ com.github.ben-manes.caffeine;version='[3.1.8,3.1.9)',\ com.zaxxer.HikariCP;version='[7.1.0,7.1.1)',\ - net.sf.jsqlparser;version='[5.3.167,5.3.168)',\ + net.sf.jsqlparser;version='[5.4.162,5.4.163)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.jetty12;version='[2.0.4,2.0.5)',\ @@ -112,7 +112,7 @@ org.eclipse.emf.common;version='[2.44.0,2.44.1)',\ org.eclipse.emf.ecore;version='[2.41.0,2.41.1)',\ org.eclipse.emf.ecore.xmi;version='[2.39.0,2.39.1)',\ - org.eclipse.fennec.emf.osgi.component;version='[0.1.1,0.1.2)',\ + org.eclipse.fennec.emf.osgi.component;version='[1.0.2,1.0.3)',\ org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\ org.objectweb.asm;version='[9.9.0,9.9.1)',\ org.objectweb.asm.commons;version='[9.9.0,9.9.1)',\ diff --git a/application/pivot/postgres/daanse.pivot.postgres.bndrun b/application/pivot/postgres/daanse.pivot.postgres.bndrun index ecf7b8d..7d4beec 100644 --- a/application/pivot/postgres/daanse.pivot.postgres.bndrun +++ b/application/pivot/postgres/daanse.pivot.postgres.bndrun @@ -20,12 +20,12 @@ bnd.identity;id='org.eclipse.daanse.sql.dialect.db.postgresql' -runbundles: \ - ai.starlake.transpiler;version='[1.8.0,1.8.1)',\ + ai.starlake.transpiler;version='[1.16.0,1.16.1)',\ ch.qos.logback.classic;version='[1.5.6,1.5.7)',\ com.fasterxml.woodstox.woodstox-core;version='[7.1.1,7.1.2)',\ com.github.ben-manes.caffeine;version='[3.1.8,3.1.9)',\ com.zaxxer.HikariCP;version='[7.1.0,7.1.1)',\ - net.sf.jsqlparser;version='[5.3.167,5.3.168)',\ + net.sf.jsqlparser;version='[5.4.162,5.4.163)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.jetty12;version='[2.0.4,2.0.5)',\ @@ -112,7 +112,7 @@ org.eclipse.emf.common;version='[2.44.0,2.44.1)',\ org.eclipse.emf.ecore;version='[2.41.0,2.41.1)',\ org.eclipse.emf.ecore.xmi;version='[2.39.0,2.39.1)',\ - org.eclipse.fennec.emf.osgi.component;version='[0.1.1,0.1.2)',\ + org.eclipse.fennec.emf.osgi.component;version='[1.0.2,1.0.3)',\ org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\ org.objectweb.asm;version='[9.9.0,9.9.1)',\ org.objectweb.asm.commons;version='[9.9.0,9.9.1)',\ diff --git a/application/playground/.gitignore b/application/playground/.gitignore index c039eac..dba0268 100644 --- a/application/playground/.gitignore +++ b/application/playground/.gitignore @@ -6,3 +6,4 @@ load/* !load/.keep !load/*.cfg !catalog/*.xmi +!catalog/*.sql diff --git a/application/playground/README.md b/application/playground/README.md index d4d18f7..50f9282 100644 --- a/application/playground/README.md +++ b/application/playground/README.md @@ -2,6 +2,7 @@ title: Playground group: Applications --- + # Eclipse Daanse Playground Application **Availability: Git Repository Only - No Docker Container/Artifact** @@ -57,23 +58,35 @@ The playground application source can be found at: ## Default configuration The `load/` directory is watched by Felix FileInstall (its default directory) and ships a -working two-database default: one catalog served from **PostgreSQL** and one from -**Oracle**, both published on the **same XMLA endpoint**. +working three-database default: one catalog served from **PostgreSQL**, one from +**Oracle** and one from an embedded **DuckDB**, all published on the **same XMLA endpoint**. | File(s) | Purpose | -|---|---| -| `daanse.jdbc.datasource.{postgresql,oracle}.DataSource-*.cfg` | one DataSource per database, tagged `daanse.ident=ds-pg` / `ds-ora` | +| --- | --- | +| `daanse.jdbc.datasource.{postgresql,oracle,duckdb}.DataSource-*.cfg` | one DataSource per database, tagged `daanse.ident=ds-pg` / `ds-ora` / `ds-duck` | | `daanse.jdbc.datasource.pools.hikari.ConnectionPool-*.cfg` | one connection pool per DataSource | -| `daanse.rolap.mapping.model.provider.EmfMappingProvider-*.cfg` | one mapping per catalog XMI (`catalog/catalog.postgres.xmi`, `catalog/catalog.oracle.xmi`) | -| `daanse.rolap.core.BasicContext-*.cfg` | one context per catalog: pool + mapping + dialect (`POSTGRESQL` / `ORACLE`) | -| `daanse.olap.core.BasicContextGroup-main.cfg` | groups both contexts (`context.target=(daanse.ident=ctx-*)`) | +| `daanse.rolap.mapping.model.provider.EmfMappingProvider-*.cfg` | one mapping per catalog XMI (`catalog/catalog.{postgres,oracle,duckdb}.xmi`) | +| `daanse.rolap.core.BasicContext-*.cfg` | one context per catalog: pool + mapping + dialect (`POSTGRESQL` / `ORACLE` / `DUCKDB`) | +| `daanse.olap.core.BasicContextGroup-main.cfg` | groups the contexts (`context.target=(daanse.ident=ctx-*)`) | | `daanse.olap.xmla.connector.OlapXmlaConnector-main.cfg` | XMLA service over the group | | `org.eclipse.daanse.xmla.server.whiteboard.servlet.XmlaServlet-main.cfg` | servlet at `/xmla` | -The endpoint is `http://localhost:8090/xmla` (HTTP port from the bndrun). Both catalogs — -`Playground Postgres` (cube `CubePostgres`) and `Playground Oracle` (cube `CubeOracle`) — -appear in `DBSCHEMA_CATALOGS` of that one endpoint; each expects a table -`fact("key","value")` / `FACT("KEY","VALUE")`. +The endpoint is `http://localhost:8090/xmla` (HTTP port from the bndrun). The catalogs — +`Playground Postgres` (cube `CubePostgres`), `Playground Oracle` (cube `CubeOracle`) and +`Playground DuckDB` (cube `CubeDuckDB`) — appear in `DBSCHEMA_CATALOGS` of that one +endpoint; each expects a table `fact("key","value")` / `FACT("KEY","VALUE")`. A catalog +whose database is not reachable is left out; the others are served regardless. + +### DuckDB + +DuckDB runs inside the server process, so its catalog works without any external database. +The DataSource opens an in-memory database (`databaseName = ":memory:"`) and runs +`catalog/catalog.duckdb.sql` once per database instance (`sessionInitSqlFile`), which +creates and fills the `fact` table. To query a DuckDB file of your own instead, point +`databaseName` at it in `load/daanse.jdbc.datasource.duckdb.DataSource-duck.cfg` and drop +`sessionInitSqlFile`; add `readOnly = B"true"` to let other processes read the same file +while the server runs (the pool then has to be read-only as well, `readOnly = B"true"` in +`load/daanse.jdbc.datasource.pools.hikari.ConnectionPool-duck.cfg`). Matching local databases: diff --git a/application/playground/catalog/catalog.duckdb.sql b/application/playground/catalog/catalog.duckdb.sql new file mode 100644 index 0000000..1531cfb --- /dev/null +++ b/application/playground/catalog/catalog.duckdb.sql @@ -0,0 +1,15 @@ +/********************************************************************* +* Copyright (c) 2026 Contributors to the Eclipse Foundation. +* +* This program and the accompanying materials are made +* available under the terms of the Eclipse Public License 2.0 +* which is available at https://www.eclipse.org/legal/epl-2.0/ +* +* SPDX-License-Identifier: EPL-2.0 +**********************************************************************/ + +-- Session init SQL of the playground's in-memory DuckDB database. Without a +-- DUCKDB_CONNECTION_INIT_BELOW_MARKER comment the whole file runs once per +-- database instance, i.e. once per start of the DataSource. +CREATE TABLE fact ("key" VARCHAR, "value" INTEGER); +INSERT INTO fact VALUES ('A', 42), ('B', 8); diff --git a/application/playground/catalog/catalog.duckdb.xmi b/application/playground/catalog/catalog.duckdb.xmi new file mode 100644 index 0000000..27a7b43 --- /dev/null +++ b/application/playground/catalog/catalog.duckdb.xmi @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/application/playground/daanse.playground.bndrun b/application/playground/daanse.playground.bndrun index a668baa..2f7badd 100644 --- a/application/playground/daanse.playground.bndrun +++ b/application/playground/daanse.playground.bndrun @@ -58,6 +58,8 @@ bnd.identity;id='org.eclipse.daanse.sql.dialect.db.oracle',\ bnd.identity;id='org.eclipse.daanse.sql.dialect.db.postgresql',\ bnd.identity;id='org.eclipse.daanse.sql.dialect.db.mysql',\ + bnd.identity;id='org.eclipse.daanse.jdbc.datasource.duckdb',\ + bnd.identity;id='org.eclipse.daanse.sql.dialect.db.duckdb',\ bnd.identity;id='org.apache.felix.fileinstall',\ bnd.identity;id='org.eclipse.daanse.jakarta.servlet.filter.cors',\ bnd.identity;id='org.apache.felix.configadmin.plugin.interpolation',\ @@ -74,14 +76,14 @@ -runbundles: \ - ai.starlake.transpiler;version='[1.8.0,1.8.1)',\ + ai.starlake.transpiler;version='[1.16.0,1.16.1)',\ ch.qos.logback.classic;version='[1.5.6,1.5.7)',\ com.fasterxml.woodstox.woodstox-core;version='[7.1.1,7.1.2)',\ - com.github.ben-manes.caffeine;version='[3.1.8,3.1.9)',\ + com.github.ben-manes.caffeine;version='[3.1.2,3.1.3)',\ com.h2database;version='[2.3.230,2.3.231)',\ com.mysql.cj;version='[9.0.0,9.0.1)',\ com.zaxxer.HikariCP;version='[7.1.0,7.1.1)',\ - net.sf.jsqlparser;version='[5.3.167,5.3.168)',\ + net.sf.jsqlparser;version='[5.4.162,5.4.163)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.configadmin.plugin.interpolation;version='[1.2.8,1.2.9)',\ @@ -92,6 +94,7 @@ org.apache.felix.metatype;version='[1.2.4,1.2.5)',\ org.apache.felix.scr;version='[2.2.10,2.2.11)',\ org.apache.felix.webconsole;version='[5.0.12,5.0.13)',\ + org.duckdb.duckdb_jdbc;version='[1.5.5,1.5.6)',\ org.eclipse.daanse.cwm.model.cwm.foundation.businessinformation;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.cwm.model.cwm.foundation.datatypes;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.cwm.model.cwm.foundation.keysindexes;version='[0.0.1,0.0.2)',\ @@ -105,6 +108,7 @@ org.eclipse.daanse.dmv.parser.ccc;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jakarta.servlet.filter.cors;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jdbc.datasource.common;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.jdbc.datasource.duckdb;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jdbc.datasource.h2;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jdbc.datasource.mysql;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.jdbc.datasource.oracle;version='[0.0.1,0.0.2)',\ @@ -134,6 +138,7 @@ org.eclipse.daanse.sql.deparser.api;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.sql.dialect.api;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.sql.dialect.db.common;version='[0.0.1,0.0.2)',\ + org.eclipse.daanse.sql.dialect.db.duckdb;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.sql.dialect.db.h2;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.sql.dialect.db.mysql;version='[0.0.1,0.0.2)',\ org.eclipse.daanse.sql.dialect.db.oracle;version='[0.0.1,0.0.2)',\ @@ -176,7 +181,7 @@ org.eclipse.emf.common;version='[2.44.0,2.44.1)',\ org.eclipse.emf.ecore;version='[2.41.0,2.41.1)',\ org.eclipse.emf.ecore.xmi;version='[2.39.0,2.39.1)',\ - org.eclipse.fennec.emf.osgi.component;version='[0.1.1,0.1.2)',\ + org.eclipse.fennec.emf.osgi.component;version='[1.0.2,1.0.3)',\ org.glassfish.hk2.osgi-resource-locator;version='[2.4.0,2.4.1)',\ org.objectweb.asm;version='[9.9.0,9.9.1)',\ org.objectweb.asm.commons;version='[9.9.0,9.9.1)',\ @@ -186,6 +191,7 @@ org.osgi.service.cm;version='[1.6.1,1.6.2)',\ org.osgi.service.component;version='[1.5.1,1.5.2)',\ org.osgi.service.log;version='[1.4.0,1.4.1)',\ + org.osgi.service.servlet;version='[2.0.0,2.0.1)',\ org.osgi.util.converter;version='[1.0.9,1.0.10)',\ org.osgi.util.function;version='[1.2.0,1.2.1)',\ org.osgi.util.promise;version='[1.3.0,1.3.1)',\ diff --git a/application/playground/load/daanse.jdbc.datasource.duckdb.DataSource-duck.cfg b/application/playground/load/daanse.jdbc.datasource.duckdb.DataSource-duck.cfg new file mode 100644 index 0000000..abb6fa7 --- /dev/null +++ b/application/playground/load/daanse.jdbc.datasource.duckdb.DataSource-duck.cfg @@ -0,0 +1,3 @@ +daanse.ident = "ds-duck" +databaseName = ":memory:" +sessionInitSqlFile = "./catalog/catalog.duckdb.sql" diff --git a/application/playground/load/daanse.jdbc.datasource.pools.hikari.ConnectionPool-duck.cfg b/application/playground/load/daanse.jdbc.datasource.pools.hikari.ConnectionPool-duck.cfg new file mode 100644 index 0000000..d8e2720 --- /dev/null +++ b/application/playground/load/daanse.jdbc.datasource.pools.hikari.ConnectionPool-duck.cfg @@ -0,0 +1,3 @@ +daanse.ident = "pool-duck" +dataSource.target = "(daanse.ident=ds-duck)" +poolName = "playground-duck" diff --git a/application/playground/load/daanse.rolap.core.BasicContext-duck.cfg b/application/playground/load/daanse.rolap.core.BasicContext-duck.cfg new file mode 100644 index 0000000..7bec133 --- /dev/null +++ b/application/playground/load/daanse.rolap.core.BasicContext-duck.cfg @@ -0,0 +1,5 @@ +daanse.ident = "ctx-duck" +connectionPool.target = "(daanse.ident=pool-duck)" +catalogMappingSuppier.target = "(daanse.ident=map-duck)" +dialectFactory.target = "(org.eclipse.daanse.dialect.name=DUCKDB)" +useAggregates = B"false" diff --git a/application/playground/load/daanse.rolap.mapping.model.provider.EmfMappingProvider-duck.cfg b/application/playground/load/daanse.rolap.mapping.model.provider.EmfMappingProvider-duck.cfg new file mode 100644 index 0000000..7872d73 --- /dev/null +++ b/application/playground/load/daanse.rolap.mapping.model.provider.EmfMappingProvider-duck.cfg @@ -0,0 +1,2 @@ +daanse.ident = "map-duck" +resource.url = "./catalog/catalog.duckdb.xmi" diff --git a/application/playground/pom.xml b/application/playground/pom.xml index 0eedff4..b227d6f 100644 --- a/application/playground/pom.xml +++ b/application/playground/pom.xml @@ -35,6 +35,24 @@ + + biz.aQute.bnd + bnd-resolver-maven-plugin + ${bnd.version} + + false + + daanse.playground.bndrun + + true + false + + compile + runtime + test + + + biz.aQute.bnd bnd-run-maven-plugin @@ -239,6 +257,20 @@ runtime + + org.eclipse.daanse + org.eclipse.daanse.jdbc.datasource.duckdb + 0.0.1-SNAPSHOT + runtime + + + + org.eclipse.daanse + org.eclipse.daanse.sql.dialect.db.duckdb + 0.0.1-SNAPSHOT + runtime + + org.eclipse.daanse diff --git a/application/probe/daanse.probe.bndrun b/application/probe/daanse.probe.bndrun index c2f6241..dfd5a4f 100644 --- a/application/probe/daanse.probe.bndrun +++ b/application/probe/daanse.probe.bndrun @@ -80,13 +80,13 @@ -runbundles: \ - ai.starlake.transpiler;version='[1.13.0,1.13.1)',\ + ai.starlake.transpiler;version='[1.16.0,1.16.1)',\ ch.qos.logback.classic;version='[1.5.6,1.5.7)',\ com.fasterxml.woodstox.woodstox-core;version='[7.1.1,7.1.2)',\ com.github.ben-manes.caffeine;version='[3.1.2,3.1.3)',\ com.zaxxer.HikariCP;version='[7.1.0,7.1.1)',\ de.siegmar.fastcsv;version='[3.1.0,3.1.1)',\ - net.sf.jsqlparser;version='[5.4.15,5.4.16)',\ + net.sf.jsqlparser;version='[5.4.162,5.4.163)',\ org.apache.aries.spifly.dynamic.bundle;version='[1.3.7,1.3.8)',\ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\ org.apache.felix.http.jetty12;version='[2.0.4,2.0.5)',\ @@ -191,7 +191,7 @@ org.eclipse.emf.common;version='[2.44.0,2.44.1)',\ org.eclipse.emf.ecore;version='[2.41.0,2.41.1)',\ org.eclipse.emf.ecore.xmi;version='[2.39.0,2.39.1)',\ - org.eclipse.fennec.emf.osgi.component;version='[0.1.1,0.1.2)',\ + org.eclipse.fennec.emf.osgi.component;version='[1.0.2,1.0.3)',\ org.objectweb.asm;version='[9.9.0,9.9.1)',\ org.objectweb.asm.commons;version='[9.9.0,9.9.1)',\ org.objectweb.asm.tree;version='[9.9.0,9.9.1)',\ diff --git a/application/probe/pom.xml b/application/probe/pom.xml index 2c94baa..7019f50 100644 --- a/application/probe/pom.xml +++ b/application/probe/pom.xml @@ -92,6 +92,13 @@ + + + com.github.ben-manes.caffeine + caffeine + 3.1.2 + runtime + org.eclipse.daanse org.eclipse.daanse.sql.dialect.db.duckdb