meadow 2.0.41 → 2.0.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meadow",
-  "version": "2.0.41",
+  "version": "2.0.43",
   "description": "A data access library.",
   "main": "source/Meadow.js",
   "scripts": {
@@ -28,6 +28,11 @@
     "docker-postgresql-status": "./scripts/postgresql-test-db.sh status",
     "test-postgresql": "./scripts/postgresql-test-db.sh start && npx quack test -g Meadow-Provider-PostgreSQL",
     "test-postgresql-all": "./scripts/postgresql-test-db.sh start && npx mocha -u tdd --exit -R spec",
+    "docker-oracle-start": "./scripts/oracle-test-db.sh start",
+    "docker-oracle-stop": "./scripts/oracle-test-db.sh stop",
+    "docker-oracle-status": "./scripts/oracle-test-db.sh status",
+    "test-oracle": "./scripts/oracle-test-db.sh start && npx quack test -g Meadow-Provider-Oracle",
+    "test-oracle-all": "./scripts/oracle-test-db.sh start && npx mocha -u tdd --exit -R spec",
     "docker-mongodb-start": "./scripts/mongodb-test-db.sh start",
     "docker-mongodb-stop": "./scripts/mongodb-test-db.sh stop",
     "docker-mongodb-status": "./scripts/mongodb-test-db.sh status",
@@ -43,7 +48,7 @@
     "test-alasql": "npx quack test -g Meadow-Provider-ALASQL",
     "test-sqlite-browser": "npx quack test -g Meadow-Provider-SQLiteBrowser",
     "test-sqlite-browser-headless": "npx mocha -u tdd --exit --timeout 60000 test/Meadow-Provider-SQLiteBrowser-Headless_tests.js",
-    "test-all-providers": "./scripts/mysql-test-db.sh start && ./scripts/mssql-test-db.sh start && ./scripts/postgresql-test-db.sh start && ./scripts/mongodb-test-db.sh start && ./scripts/solr-test-db.sh start && ./scripts/dgraph-test-db.sh start && npx mocha -u tdd --exit -R spec",
+    "test-all-providers": "./scripts/mysql-test-db.sh start && ./scripts/mssql-test-db.sh start && ./scripts/postgresql-test-db.sh start && ./scripts/oracle-test-db.sh start && ./scripts/mongodb-test-db.sh start && ./scripts/solr-test-db.sh start && ./scripts/dgraph-test-db.sh start && npx mocha -u tdd --exit -R spec",
     "docker-cleanup": "./scripts/meadow-test-cleanup.sh",
     "test-cleanup": "./scripts/meadow-test-cleanup.sh"
   },
@@ -67,7 +72,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/stevenvelozo/meadow.git"
+    "url": "https://github.com/fable-retold/meadow.git"
   },
   "keywords": [
     "orm",
@@ -76,33 +81,35 @@
   "author": "Steven Velozo <steven@velozo.com> (http://velozo.com/)",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/stevenvelozo/meadow/issues"
+    "url": "https://github.com/fable-retold/meadow/issues"
   },
-  "homepage": "https://github.com/stevenvelozo/meadow",
+  "homepage": "https://github.com/fable-retold/meadow",
   "devDependencies": {
     "alasql": "^4.17.0",
     "dgraph-js-http": "^21.3.0",
-    "fable": "^3.1.72",
+    "fable": "^3.1.75",
     "gulp-util": "^3.0.8",
     "meadow-connection-dgraph": "^1.0.3",
     "meadow-connection-mongodb": "^1.0.3",
     "meadow-connection-mssql": "^1.0.23",
     "meadow-connection-mysql": "^1.0.19",
-    "meadow-connection-postgresql": "^1.0.5",
+    "meadow-connection-oracle": "^1.0.2",
+    "meadow-connection-postgresql": "^1.0.7",
     "meadow-connection-rocksdb": "^1.0.0",
     "meadow-connection-solr": "^1.0.3",
     "meadow-connection-sqlite": "^1.0.20",
     "meadow-connection-sqlite-browser": "^1.0.2",
     "mongodb": "^6.12.0",
     "mysql2": "^3.18.2",
-    "pict-docuserve": "^1.0.1",
+    "oracledb": "^6.10.0",
+    "pict-docuserve": "^1.4.12",
     "puppeteer": "^24.38.0",
-    "quackage": "^1.2.3",
+    "quackage": "^1.3.0",
     "solr-client": "^0.9.0"
   },
   "dependencies": {
     "async": "3.2.6",
-    "foxhound": "^2.0.27",
+    "foxhound": "^2.0.29",
     "is-my-json-valid": "2.20.6",
     "simple-get": "^4.0.1"
   }

package/scripts/bookstore-seed.js

@@ -496,6 +496,138 @@ function emitMSSQL()
 	return tmpOut.join('\n');
 }
 
+// ---------------------------------------------------------------------------
+// Oracle emitter. Oracle has no CREATE TABLE IF NOT EXISTS; the docker script
+// runs this seed once against a fresh container, so plain CREATE TABLE is fine.
+// Output is sqlplus-friendly: SET DEFINE OFF stops the '&' in "Angels & Demons"
+// from being read as a substitution variable, and WHENEVER SQLERROR EXIT
+// FAILURE makes a bad statement fail the piped load. Identity columns + the
+// 23ai multi-row VALUES clause keep it close to the other dialects.
+// ---------------------------------------------------------------------------
+function emitOracle()
+{
+	const tmpOut = [];
+	tmpOut.push('-- Bookstore Schema and Seed Data for Meadow Oracle Tests');
+	tmpOut.push('-- Generated by scripts/bookstore-seed.js (GUIDs minted via fable-uuid)');
+	tmpOut.push('SET DEFINE OFF');
+	tmpOut.push('WHENEVER SQLERROR EXIT FAILURE');
+	tmpOut.push('');
+	tmpOut.push('CREATE TABLE Book');
+	tmpOut.push('    (');
+	tmpOut.push('        IDBook NUMBER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,');
+	tmpOut.push('        GUIDBook VARCHAR2(36) DEFAULT \'00000000-0000-0000-0000-000000000000\' NOT NULL,');
+	tmpOut.push('        CreateDate TIMESTAMP,');
+	tmpOut.push('        CreatingIDUser NUMBER DEFAULT 0 NOT NULL,');
+	tmpOut.push('        UpdateDate TIMESTAMP,');
+	tmpOut.push('        UpdatingIDUser NUMBER DEFAULT 0 NOT NULL,');
+	tmpOut.push('        Deleted NUMBER(1) DEFAULT 0 NOT NULL,');
+	tmpOut.push('        DeleteDate TIMESTAMP,');
+	tmpOut.push('        DeletingIDUser NUMBER DEFAULT 0 NOT NULL,');
+	tmpOut.push('        Title VARCHAR2(200) DEFAULT \' \' NOT NULL,');
+	tmpOut.push('        Type VARCHAR2(32) DEFAULT \' \' NOT NULL,');
+	tmpOut.push('        Genre VARCHAR2(128) DEFAULT \' \' NOT NULL,');
+	tmpOut.push('        ISBN VARCHAR2(64) DEFAULT \' \' NOT NULL,');
+	tmpOut.push('        Language VARCHAR2(12) DEFAULT \' \' NOT NULL,');
+	tmpOut.push('        ImageURL VARCHAR2(254) DEFAULT \' \' NOT NULL,');
+	tmpOut.push('        PublicationYear NUMBER DEFAULT 0 NOT NULL');
+	tmpOut.push('    );');
+	tmpOut.push('');
+	tmpOut.push('CREATE TABLE BookAuthorJoin');
+	tmpOut.push('    (');
+	tmpOut.push('        IDBookAuthorJoin NUMBER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,');
+	tmpOut.push('        GUIDBookAuthorJoin VARCHAR2(36) DEFAULT \'00000000-0000-0000-0000-000000000000\' NOT NULL,');
+	tmpOut.push('        IDBook NUMBER DEFAULT 0 NOT NULL,');
+	tmpOut.push('        IDAuthor NUMBER DEFAULT 0 NOT NULL');
+	tmpOut.push('    );');
+	tmpOut.push('');
+	tmpOut.push('CREATE TABLE Author');
+	tmpOut.push('    (');
+	tmpOut.push('        IDAuthor NUMBER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,');
+	tmpOut.push('        GUIDAuthor VARCHAR2(36) DEFAULT \'00000000-0000-0000-0000-000000000000\' NOT NULL,');
+	tmpOut.push('        CreateDate TIMESTAMP,');
+	tmpOut.push('        CreatingIDUser NUMBER DEFAULT 0 NOT NULL,');
+	tmpOut.push('        UpdateDate TIMESTAMP,');
+	tmpOut.push('        UpdatingIDUser NUMBER DEFAULT 0 NOT NULL,');
+	tmpOut.push('        Deleted NUMBER(1) DEFAULT 0 NOT NULL,');
+	tmpOut.push('        DeleteDate TIMESTAMP,');
+	tmpOut.push('        DeletingIDUser NUMBER DEFAULT 0 NOT NULL,');
+	tmpOut.push('        Name VARCHAR2(200) DEFAULT \' \' NOT NULL');
+	tmpOut.push('    );');
+	tmpOut.push('');
+	tmpOut.push('CREATE TABLE BookPrice');
+	tmpOut.push('    (');
+	tmpOut.push('        IDBookPrice NUMBER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,');
+	tmpOut.push('        GUIDBookPrice VARCHAR2(36) DEFAULT \'00000000-0000-0000-0000-000000000000\' NOT NULL,');
+	tmpOut.push('        CreateDate TIMESTAMP,');
+	tmpOut.push('        CreatingIDUser NUMBER DEFAULT 0 NOT NULL,');
+	tmpOut.push('        UpdateDate TIMESTAMP,');
+	tmpOut.push('        UpdatingIDUser NUMBER DEFAULT 0 NOT NULL,');
+	tmpOut.push('        Deleted NUMBER(1) DEFAULT 0 NOT NULL,');
+	tmpOut.push('        DeleteDate TIMESTAMP,');
+	tmpOut.push('        DeletingIDUser NUMBER DEFAULT 0 NOT NULL,');
+	tmpOut.push('        Price NUMBER(8,2),');
+	tmpOut.push('        StartDate TIMESTAMP,');
+	tmpOut.push('        EndDate TIMESTAMP,');
+	tmpOut.push('        Discountable NUMBER(1) DEFAULT 0 NOT NULL,');
+	tmpOut.push('        CouponCode VARCHAR2(16) DEFAULT \' \' NOT NULL,');
+	tmpOut.push('        IDBook NUMBER DEFAULT 0 NOT NULL');
+	tmpOut.push('    );');
+	tmpOut.push('');
+	tmpOut.push('CREATE TABLE Review');
+	tmpOut.push('    (');
+	tmpOut.push('        IDReviews NUMBER GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY,');
+	tmpOut.push('        GUIDReviews VARCHAR2(36) DEFAULT \'00000000-0000-0000-0000-000000000000\' NOT NULL,');
+	tmpOut.push('        CreateDate TIMESTAMP,');
+	tmpOut.push('        CreatingIDUser NUMBER DEFAULT 0 NOT NULL,');
+	tmpOut.push('        UpdateDate TIMESTAMP,');
+	tmpOut.push('        UpdatingIDUser NUMBER DEFAULT 0 NOT NULL,');
+	tmpOut.push('        Deleted NUMBER(1) DEFAULT 0 NOT NULL,');
+	tmpOut.push('        DeleteDate TIMESTAMP,');
+	tmpOut.push('        DeletingIDUser NUMBER DEFAULT 0 NOT NULL,');
+	tmpOut.push('        Text CLOB,');
+	tmpOut.push('        Rating NUMBER DEFAULT 0 NOT NULL,');
+	tmpOut.push('        IDBook NUMBER DEFAULT 0 NOT NULL');
+	tmpOut.push('    );');
+	tmpOut.push('');
+	tmpOut.push('-- Seed Data: First 20 books from books.csv');
+	tmpOut.push('-- Inserted in CSV order so IDBook matches CSV row number');
+	tmpOut.push('');
+	tmpOut.push('INSERT INTO Book (GUIDBook, Title, Type, Genre, ISBN, Language, ImageURL, PublicationYear, CreateDate, CreatingIDUser, UpdateDate, UpdatingIDUser) VALUES');
+	const tmpBookRows = BOOKS.map((pBook) =>
+	{
+		return '    (' + [
+			sqlQuote(tmpUUID.getUUID()),
+			sqlQuote(pBook.Title),
+			sqlQuote(pBook.Type),
+			sqlQuote(pBook.Genre),
+			sqlQuote(pBook.ISBN),
+			sqlQuote(pBook.Language),
+			sqlQuote(pBook.ImageURL),
+			pBook.PublicationYear,
+			'SYS_EXTRACT_UTC(SYSTIMESTAMP)', '99999', 'SYS_EXTRACT_UTC(SYSTIMESTAMP)', '99999'
+		].join(', ') + ')';
+	});
+	tmpOut.push(tmpBookRows.join(',\n') + ';');
+	tmpOut.push('');
+	tmpOut.push('-- Seed Data: Authors for the first 20 books');
+	tmpOut.push('');
+	tmpOut.push('INSERT INTO Author (GUIDAuthor, Name, CreateDate, CreatingIDUser, UpdateDate, UpdatingIDUser) VALUES');
+	const tmpAuthorRows = AUTHORS.map((pName) =>
+	{
+		return '    (' + [
+			sqlQuote(tmpUUID.getUUID()),
+			sqlQuote(pName),
+			'SYS_EXTRACT_UTC(SYSTIMESTAMP)', '99999', 'SYS_EXTRACT_UTC(SYSTIMESTAMP)', '99999'
+		].join(', ') + ')';
+	});
+	tmpOut.push(tmpAuthorRows.join(',\n') + ';');
+	tmpOut.push('');
+	tmpOut.push('COMMIT;');
+	tmpOut.push('EXIT');
+	tmpOut.push('');
+	return tmpOut.join('\n');
+}
+
 // ---------------------------------------------------------------------------
 // CLI
 // ---------------------------------------------------------------------------
@@ -532,7 +664,10 @@ switch (tmpDialect)
 	case 'mssql':
 		process.stdout.write(emitMSSQL());
 		break;
+	case 'oracle':
+		process.stdout.write(emitOracle());
+		break;
 	default:
-		process.stderr.write('Usage: bookstore-seed.js --dialect <mysql|postgresql|mssql>\n');
+		process.stderr.write('Usage: bookstore-seed.js --dialect <mysql|postgresql|mssql|oracle>\n');
 		process.exit(1);
 }

package/scripts/meadow-test-cleanup.sh

@@ -14,6 +14,7 @@ echo ""
 "${SCRIPT_DIR}/mysql-test-db.sh" stop
 "${SCRIPT_DIR}/mssql-test-db.sh" stop
 "${SCRIPT_DIR}/postgresql-test-db.sh" stop
+"${SCRIPT_DIR}/oracle-test-db.sh" stop
 "${SCRIPT_DIR}/mongodb-test-db.sh" stop
 "${SCRIPT_DIR}/solr-test-db.sh" stop
 "${SCRIPT_DIR}/dgraph-test-db.sh" stop

package/scripts/oracle-test-db.sh

@@ -0,0 +1,128 @@
+#!/bin/bash
+# Oracle Test Database Management Script
+#
+# Usage:
+#   ./scripts/oracle-test-db.sh start   - Start Oracle container, load schema and seed data
+#   ./scripts/oracle-test-db.sh stop    - Stop and remove the container
+#   ./scripts/oracle-test-db.sh status  - Check if the container is running
+#
+# Uses gvenzl/oracle-free (Oracle Database 23ai Free — no license required,
+# multi-arch so it runs natively on Apple Silicon).  gvenzl auto-creates the
+# APP_USER in its own schema inside the FREEPDB1 pluggable database.
+#
+# The container settings match the test configuration in
+# test/Meadow-Provider-Oracle_tests.js and meadow-connection-oracle:
+#   Host: 127.0.0.1, Port: 21521, Service: FREEPDB1
+#   User: bookstore, Password: Retold1234567890!
+
+CONTAINER_NAME="meadow-oracle-test"
+ORACLE_USER="bookstore"
+ORACLE_PASSWORD="Retold1234567890!"
+ORACLE_SERVICE="FREEPDB1"
+ORACLE_PORT="21521"
+ORACLE_IMAGE="gvenzl/oracle-free:23-slim"
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+SEED_GENERATOR="${SCRIPT_DIR}/bookstore-seed.js"
+
+start_oracle() {
+	# Check if container already exists
+	if docker ps -a --format '{{.Names}}' | grep -q "^${CONTAINER_NAME}$"; then
+		if docker ps --format '{{.Names}}' | grep -q "^${CONTAINER_NAME}$"; then
+			echo "Oracle test container is already running."
+			return 0
+		else
+			echo "Removing stopped container..."
+			docker rm "${CONTAINER_NAME}" > /dev/null 2>&1
+		fi
+	fi
+
+	echo "Starting Oracle test container (first boot pulls the image and initializes the DB; this can take several minutes)..."
+	docker run -d \
+		--name "${CONTAINER_NAME}" \
+		-e ORACLE_PASSWORD="${ORACLE_PASSWORD}" \
+		-e APP_USER="${ORACLE_USER}" \
+		-e APP_USER_PASSWORD="${ORACLE_PASSWORD}" \
+		-p "${ORACLE_PORT}:1521" \
+		"${ORACLE_IMAGE}"
+
+	if [ $? -ne 0 ]; then
+		echo "ERROR: Failed to start Oracle container."
+		exit 1
+	fi
+
+	echo "Waiting for Oracle to accept connections (gvenzl healthcheck)..."
+	RETRIES=120
+	until docker exec "${CONTAINER_NAME}" healthcheck.sh > /dev/null 2>&1; do
+		RETRIES=$((RETRIES - 1))
+		if [ $RETRIES -le 0 ]; then
+			echo "ERROR: Oracle failed to become ready in time."
+			docker logs "${CONTAINER_NAME}" 2>&1 | tail -20
+			exit 1
+		fi
+		echo "  ...waiting (${RETRIES} retries left)"
+		sleep 5
+	done
+
+	# Load bookstore schema and seed data (GUIDs minted at generation time via fable-uuid)
+	if [ -f "${SEED_GENERATOR}" ]; then
+		echo "Loading bookstore schema and seed data..."
+		node "${SEED_GENERATOR}" --dialect oracle | \
+			docker exec -i "${CONTAINER_NAME}" sqlplus -S "${ORACLE_USER}/${ORACLE_PASSWORD}@//localhost:1521/${ORACLE_SERVICE}"
+		if [ $? -ne 0 ]; then
+			echo "WARNING: Failed to load seed data. Tests requiring pre-populated data may fail."
+		else
+			echo "Bookstore schema and seed data loaded successfully."
+		fi
+	else
+		echo "WARNING: Seed generator not found at ${SEED_GENERATOR}. Skipping schema/data loading."
+	fi
+
+	echo ""
+	echo "Oracle test database is ready!"
+	echo "  Container: ${CONTAINER_NAME}"
+	echo "  Host:      127.0.0.1:${ORACLE_PORT}"
+	echo "  Service:   ${ORACLE_SERVICE}"
+	echo "  User:      ${ORACLE_USER}"
+	echo "  Password:  ${ORACLE_PASSWORD}"
+	echo ""
+	echo "Run tests with: npm test"
+}
+
+stop_oracle() {
+	if docker ps -a --format '{{.Names}}' | grep -q "^${CONTAINER_NAME}$"; then
+		echo "Stopping and removing Oracle test container..."
+		docker stop "${CONTAINER_NAME}" > /dev/null 2>&1
+		docker rm "${CONTAINER_NAME}" > /dev/null 2>&1
+		echo "Oracle test container removed."
+	else
+		echo "No Oracle test container found."
+	fi
+}
+
+status_oracle() {
+	if docker ps --format '{{.Names}}' | grep -q "^${CONTAINER_NAME}$"; then
+		echo "Oracle test container is running."
+		docker ps --filter "name=${CONTAINER_NAME}" --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}"
+	elif docker ps -a --format '{{.Names}}' | grep -q "^${CONTAINER_NAME}$"; then
+		echo "Oracle test container exists but is stopped."
+	else
+		echo "Oracle test container is not running."
+	fi
+}
+
+case "${1}" in
+	start)
+		start_oracle
+		;;
+	stop)
+		stop_oracle
+		;;
+	status)
+		status_oracle
+		;;
+	*)
+		echo "Usage: $0 {start|stop|status}"
+		exit 1
+		;;
+esac

package/source/Meadow.js

@@ -138,6 +138,7 @@ var Meadow = function()
 			'MSSQL': require(`./providers/Meadow-Provider-MSSQL.js`),
 			'SQLite': require(`./providers/Meadow-Provider-SQLite.js`),
 			'PostgreSQL': require(`./providers/Meadow-Provider-PostgreSQL.js`),
+			'Oracle': require(`./providers/Meadow-Provider-Oracle.js`),
 			'MongoDB': require(`./providers/Meadow-Provider-MongoDB.js`),
 			'DGraph': require(`./providers/Meadow-Provider-DGraph.js`),
 			'Solr': require(`./providers/Meadow-Provider-Solr.js`),

package/source/providers/Meadow-Provider-ALASQL.js

@@ -45,7 +45,7 @@ var MeadowProvider = function()
 		};
 		
 		// Create a table for this schema on the fly
-		// This is ripped off from https://github.com/stevenvelozo/stricture/blob/master/source/Stricture-Generate-MySQL.js
+		// This is ripped off from https://github.com/fable-retold/stricture/blob/master/source/Stricture-Generate-MySQL.js
 		var createTableDynamically = () =>
 		{
 			var tmpCreateStatement = '';