Skip to content

Commit 4973c15

Browse files
authored
Merge pull request #26 from AdaWorldAPI/revert/lance-surrealdb-analysis
Revert #24 + #25 — surrealdb-ractor four-repo integration
2 parents df97e31 + d2a5e8b commit 4973c15

16 files changed

Lines changed: 2 additions & 6777 deletions

File tree

.claude/plans/integration-plan.md

Lines changed: 0 additions & 592 deletions
This file was deleted.

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,3 @@ history.txt
6666
surrealism/test/demo.surli
6767
surrealism/test/surrealism
6868

69-
/surrealdb-ractor/target/

Cargo.lock

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ members = [
2525
"profiling",
2626
]
2727

28-
exclude = [
29-
# Sprint 1 scaffold of Glue #1 (see .claude/plans/integration-plan.md §5).
30-
"surrealdb-ractor",
31-
]
32-
3328
[workspace.package]
3429
authors = ["Tobie Morgan Hitchcock <tobie@surrealdb.com>"]
3530
edition = "2024"
@@ -505,30 +500,3 @@ panic = 'unwind'
505500
# that crates.io 0.16 entry requires upstream lance-index to bump.
506501
[patch.crates-io]
507502
ndarray = { git = "https://github.com/AdaWorldAPI/ndarray.git" }
508-
509-
# ============================================================================
510-
# Cross-repo git → local-path redirects (local dev convenience)
511-
# ============================================================================
512-
# When the four-repo workspace is checked out side-by-side at the standard
513-
# /home/user/{ndarray, lance-graph, sea-orm, surrealdb} layout, these patches
514-
# make local edits to ndarray + lance-graph-contract immediately visible to
515-
# surrealdb-core without going through a remote push + commit-pin cycle.
516-
#
517-
# Cargo errors at resolve time if a patch target path is missing, so if you
518-
# check out surrealdb in isolation, COMMENT THESE BLOCKS OUT (or use a
519-
# top-level .cargo/config.toml override). The published surrealdb release
520-
# does NOT ship these patches — they exist only on the four-repo dev branch.
521-
#
522-
# Pairs with the workspace.dependencies entries at the top of this file:
523-
# - ndarray = { git = ".../ndarray.git" } → ../ndarray
524-
# - lance-graph-contract = { git = ".../lance-graph.git" } → ../lance-graph/crates/lance-graph-contract
525-
# ndarray is intentionally NOT patched here: the workspace already pulls the
526-
# AdaWorldAPI fork via `git = "..."` AND `[patch.crates-io]` above redirects
527-
# crates.io's ndarray to the same fork. Adding a third source for the same
528-
# crate via path-patch produces a "previously selected package" conflict
529-
# in Cargo.lock. If you want LOCAL edits to /home/user/ndarray to be picked
530-
# up by surrealdb-core, edit the workspace dep at line ~154 to `path = "../ndarray"`
531-
# directly (and pair with a matching change in `[patch.crates-io]`).
532-
533-
[patch."https://github.com/AdaWorldAPI/lance-graph.git"]
534-
lance-graph-contract = { path = "../lance-graph/crates/lance-graph-contract" }

0 commit comments

Comments
 (0)