fix(click-to-expand): fix Neo4j Browser regression bugs from scope refactoring (#116)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: genezhang

.gitignore

@@ -144,3 +144,4 @@ tests/private/*.bak
 PR_*.md
 /WITH_CLAUSE_BUG_FIX.md
 notes/
+demos/*/docker-compose.override.yml

CHANGELOG.md

@@ -1,4 +1,4 @@
-## [Unreleased]
+## [0.6.2-dev] - Unreleased
 
 ### 🚀 Features
 

Cargo.lock

@@ -5,7 +5,7 @@ members = [
 
 [package]
 name = "clickgraph"
-version = "0.6.1"
+version = "0.6.2-dev"
 edition = "2021"
 rust-version = "1.85"
 

Cargo.toml

@@ -13,38 +13,19 @@
 - There are huge volumes of data in ClickHouse databases, viewing them as graph data with graph analytics capability brings another level of abstraction and boosts productivity with graph tools, in ways beyond relational analytics alone.
 - Research shows relational analytics with columnar stores and vectorized execution engines like ClickHouse provide superior analytical performance and scalability to graph-native technologies, which usually leverage explicit adjacency representations and are more suitable for local-area graph traversals.
 - View-based graph analytics offer the benefits of zero-ETL without the hassle of data migration and duplicate cost, yet better performance and scalability than most of the native graph analytics options.
-- Neo4j Bolt protocol support gives instant access to the tools available, including graph visualization and the MCP server.
+- Neo4j Bolt protocol support gives access to the tools available based on the Bolt protocol.
 ---
-## 🚀 What's New in v0.6.1 (January 12, 2026)
-
-### Development Release: WITH Clause Fixes & GraphRAG Enhancements
-
-**v0.6.1 brings critical WITH clause fixes, GraphRAG multi-type VLP support, and LDBC SNB benchmark progress (15/41 queries passing).**
+## 🚀 What's New in v0.6.2-dev
 
 ### Highlights ✨
 
-- **WITH Clause Fixes** - Fixed CartesianProduct recursion and chained WITH CTE remapping (+6 LDBC queries)
-- **GraphRAG Multi-Type VLP** - Variable-length paths across heterogeneous graphs (18/20 tests passing)
-- **Per-MATCH WHERE** - OpenCypher-compliant consecutive MATCH clauses with individual WHERE clauses
-- **LDBC SNB Progress** - 15/41 queries passing (37%): IS queries 7/7 (100%), IC 4/14, BI 4/20
-- **Test Coverage** - 3000+ tests across unit, integration, and benchmark suites
-
-### Key Features
-
-- **WITH + MATCH Patterns** - Disconnected MATCH patterns separated by WITH now work correctly
-  - Example: `MATCH (p:Person)-[:KNOWS*1..2]-(f) WITH DISTINCT f MATCH (f)<-[:HAS_CREATOR]-(post) RETURN f, post`
-- **Chained WITH Clauses** - 3+ level chained WITHs generate correct SQL (enables IC-1, IC-2)
-- **Configurable Type Inference** - `max_inferred_types` parameter for complex GraphRAG schemas (default: 5)
-- **OpenCypher Per-MATCH WHERE** - Each MATCH clause can have its own WHERE (9/9 tests passing)
-- **Multiple UNWIND Clauses** - Cartesian product support for multiple consecutive UNWIND clauses (e.g., `UNWIND [1,2] AS x UNWIND [10,20] AS y` → 4 rows)
-- **Pattern Comprehensions** - Extract values from graph patterns into lists with `[(pattern) | expression]` syntax
-
-### Bug Fixes 🐛
-
-- **Type inference** - Bottom-up processing for multi-hop pattern label resolution
-- **Denormalization metadata** - Copy `is_denormalized`, `from_node_properties`, `to_node_properties` from schema
-- **VLP ID columns** - Use relationship schema columns (`from_id`/`to_id`)
-- **Cycle prevention** - Skip for single-hop patterns (can't have cycles)
+- **Neo4j Browser Support** - Connect Neo4j Browser directly to ClickGraph via Bolt protocol for live graph visualization. See [`demos/neo4j-browser/`](demos/neo4j-browser/README.md) for a ready-to-run demo.
+- **Graph-Notebook Support** - Run Jupyter graph notebooks against your ClickHouse data using the `graph-notebook` library. See [`demos/graph-notebook/`](demos/graph-notebook/README.md) for setup instructions.
+- **Numerous rounds of refactoring** - help to improve the code quality, including the following.
+- **Improved WITH Clause Correctness** - Chained `WITH` queries (multi-step aggregation, filtering, and renaming) now produce correct results across a wider range of patterns.
+- **More Reliable Query Results** - Fixed result ordering, column projection in UNION queries, and variable resolution after `WITH` — queries return what Cypher semantics require.
+- **LDBC SNB Progress** - 14/37 benchmark queries passing (38%), up from 10/37 (27%).
+- **Test Coverage** - 1,032 unit tests passing; 3,026 integration tests at parity with prior release.
 
 ---
 
@@ -62,17 +43,15 @@
   - **Use cases**: `ch.cityHash64()`, `ch.murmurHash3_64()`, `chagg.uniq()`, specialized aggregations
   - **Example**: `RETURN ch.cityHash64(u.email) AS hash`
 
-### Benchmarks & Validation
+### Benchmarks
+
+- **Ontime Flights** - a benchmark for airline flights illustrating the power/performance.
 
 - **LDBC SNB (Work In Progress)** - Social Network Benchmark implementation
   - **Status**: Schema mapping complete, query adaptation in progress
   - **Scale**: Designed for scale factors 1-100 (1K-100M edges)
   - **Purpose**: Industry-standard graph database benchmarking
 
-- **MCP Server Validation** - Model Context Protocol integration testing
-  - **Status**: validated
-  - **Purpose**: LLM tool integration for graph queries
-
 ### Quality Improvements
 
 - **Error handling** - Removed `.unwrap()` landmines, proper Result/Option propagation
@@ -82,6 +61,7 @@
 
 ### Previous Major Features (v0.5.x)
 
+- **Diverse schema variations** - To fit existing database schemas.
 - **Cross-table queries** - Zeek log correlation, multi-table JOINs (v0.5.4)
 - **Smart type inference** - Automatic node/relationship type inference (v0.5.4)
 - **FK-Edge patterns** - File systems, org charts with VLP (v0.5.4)
@@ -177,7 +157,7 @@ See [CHANGELOG.md](CHANGELOG.md) for complete release history.
   - **Session/request parameter**: Bolt session database or HTTP `schema_name` parameter
   - **Default schema**: Fallback to "default" schema
   - **Schema isolation**: Different schemas map same labels to different ClickHouse tables
-- **Dual Server Architecture**: HTTP and Bolt servers running simultaneously (both production-ready)
+- **Dual Server Architecture**: HTTP and Bolt servers running simultaneously
 - **Authentication Support**: Multiple authentication schemes including basic auth
 
 ### View-Based Graph Model
@@ -213,7 +193,7 @@ flowchart LR
 
 **Three-tier architecture:** Graph clients → ClickGraph translator → ClickHouse database
 
-Both protocols share the same underlying query engine and ClickHouse backend. Both are production-ready.
+Both protocols share the same underlying query engine and ClickHouse backend.
 
 ## 🚀 Quick Start
 
@@ -556,14 +536,15 @@ See `docs/configuration.md` for complete configuration documentation.
 
 ## 🧪 Development Status
 
-**Current Version**: v0.6.1 (January 12, 2026)
+**Current Version**: v0.6.2-dev
 
 ### Test Coverage
-- ✅ **Rust Unit Tests**: 534/534 passing (100%)
+- ✅ **Rust Unit Tests**: 1,032/1,032 passing (100%)
 - ✅ **Schema Variation Tests**: 73 tests across 4 schema types
 - ✅ **Benchmarks**: 14/14 passing (100%)
 - ✅ **E2E Tests**: Bolt 4/4, Cache 5/5 (100%)
-- ✅ **Pytest**: 3000+ (95+% passing)
+- ✅ **Pytest**: 3,026 passing (13 pre-existing failures, at parity with prior release)
+- ✅ **LDBC SNB**: 14/37 queries passing (38%) on mini dataset
 
 ### Key Features
 - ✅ **Polymorphic & Coupled Edge Tables**: Advanced schema patterns
@@ -585,7 +566,7 @@ See [STATUS.md](STATUS.md) and [KNOWN_ISSUES.md](KNOWN_ISSUES.md) for details.
 **Phase 2 (v0.5.0)** ✅ - Multi-tenancy, RBAC, auto-schema discovery
 **Phase 2.5 (v0.5.2)** ✅ - Schema variations (polymorphic, coupled edges)
 **Phase 2.6 (v0.5.3)** ✅ - Cypher functions (label, EXISTS, regex, collect)
-**Phase 3 (v0.6.1)** 🔄 - WITH clause fixes, GraphRAG support, LDBC SNB benchmark
+**Phase 3 (v0.6.x)** 🔄 - WITH clause scope redesign, GraphRAG support, LDBC SNB benchmark
 
 See [ROADMAP.md](ROADMAP.md) for detailed feature tracking.
 

README.md

@@ -2,7 +2,7 @@
 
 *Updated: February 19, 2026*
 
-## Current Version: v0.6.1
+## Current Version: v0.6.2-dev
 
 Read-only Cypher-to-ClickHouse SQL query engine with Neo4j Browser compatibility.
 

STATUS.md

@@ -3,8 +3,6 @@
 #
 # Usage: docker-compose up
 # Then open: http://localhost:8888 (token displayed in logs)
-#
-# Note: This uses local build. After release, use: image: genezhang/clickgraph:latest
 
 version: '3.8'
 
@@ -28,13 +26,9 @@ services:
     volumes:
       - clickhouse_notebook_data:/var/lib/clickhouse
       - ../neo4j-browser/init-db.sql:/docker-entrypoint-initdb.d/init-db.sql:ro
-      - ../neo4j-browser/001-init.sh:/docker-entrypoint-initdb.d/001-init.sh:ro
 
   clickgraph:
-    # For now, build locally. After release, use: image: genezhang/clickgraph:latest
-    build:
-      context: ../..
-      dockerfile: Dockerfile
+    image: genezhang/clickgraph:v0.6.2-dev
     container_name: clickgraph-notebook-demo
     depends_on:
       clickhouse:

demos/graph-notebook/docker-compose.yml

@@ -34,7 +34,6 @@ services:
     volumes:
       - clickhouse_demo_data:/var/lib/clickhouse
       - ./init-db.sql:/docker-entrypoint-initdb.d/init-db.sql:ro
-      - ./001-init.sh:/docker-entrypoint-initdb.d/001-init.sh:ro
 
   neo4j:
     image: neo4j:latest
@@ -56,10 +55,7 @@ services:
       - neo4j_demo_logs:/logs
 
   clickgraph:
-    # For now, build locally. After release, use: image: genezhang/clickgraph:latest
-    build:
-      context: ../..
-      dockerfile: Dockerfile
+    image: genezhang/clickgraph:v0.6.2-dev
     container_name: clickgraph-demo
     depends_on:
       clickhouse:

demos/neo4j-browser/docker-compose.yml

@@ -1,41 +1,43 @@
 -- ClickGraph Demo Data Initialization
 -- Creates and populates demo tables for social network graph
+-- Note: MergeTree persists data across container restarts.
+-- This file runs automatically via docker-entrypoint-initdb.d on first container start.
 
 -- Users table
 CREATE TABLE IF NOT EXISTS social.users (
   user_id UInt32,
   name String,
   email String,
   created_at DateTime DEFAULT now()
-) ENGINE = Memory;
+) ENGINE = MergeTree() ORDER BY user_id;
 
 -- Posts table
 CREATE TABLE IF NOT EXISTS social.posts (
   post_id UInt32,
   content String,
   created_at DateTime DEFAULT now()
-) ENGINE = Memory;
+) ENGINE = MergeTree() ORDER BY post_id;
 
 -- AUTHORED relationship (User -> Post)
 CREATE TABLE IF NOT EXISTS social.post_authored (
   user_id UInt32,
   post_id UInt32,
   created_at DateTime DEFAULT now()
-) ENGINE = Memory;
+) ENGINE = MergeTree() ORDER BY (user_id, post_id);
 
 -- LIKED relationship (User -> Post)
 CREATE TABLE IF NOT EXISTS social.post_likes (
   user_id UInt32,
   post_id UInt32,
   created_at DateTime DEFAULT now()
-) ENGINE = Memory;
+) ENGINE = MergeTree() ORDER BY (user_id, post_id);
 
 -- User follows User relationship
 CREATE TABLE IF NOT EXISTS social.user_follows (
   follower_id UInt32,
   followed_id UInt32,
   created_at DateTime DEFAULT now()
-) ENGINE = Memory;
+) ENGINE = MergeTree() ORDER BY (follower_id, followed_id);
 -- Insert sample users (30 users)
 INSERT INTO social.users VALUES
   (1, 'Alice', 'alice@example.com', '2026-01-01 11:00:00'),

demos/neo4j-browser/init-db.sql

@@ -46,16 +46,6 @@ echo ""
 echo "✓ All services ready!"
 echo ""
 
-# Load demo data
-echo "📊 Loading demo data..."
-echo ""
-
-bash "$DEMO_DIR/setup_demo_data.sh"
-
-echo ""
-echo "✓ Demo data loaded!"
-echo ""
-
 # Health checks
 echo "📋 Service Status:"
 echo ""