From 1d97e4463916e4ac4b2a4e1b9460c0dad8f6825f Mon Sep 17 00:00:00 2001 From: Kevin De Porre Date: Mon, 1 Jul 2024 08:57:54 +0200 Subject: [PATCH] Move e2e tests to packages folder --- .dockerignore | 6 ++--- .github/workflows/e2e.yml | 26 +++++++++---------- Makefile | 4 +-- README.md | 4 +-- {e2e => packages/e2e}/.gitignore | 0 {e2e => packages/e2e}/00_shared_init.sql | 0 {e2e => packages/e2e}/Makefile | 0 {e2e => packages/e2e}/README.md | 0 {e2e => packages/e2e}/common.luxinc | 0 {e2e => packages/e2e}/common.mk | 0 .../e2e}/docker/Dockerfile.sysbench | 0 .../e2e}/elixir_client/.gitignore | 0 {e2e => packages/e2e}/elixir_client/Makefile | 0 {e2e => packages/e2e}/init.sql | 0 {e2e => packages/e2e}/postgres.conf | 0 .../e2e}/prisma_example/.gitignore | 0 .../e2e}/prisma_example/Dockerfile | 0 {e2e => packages/e2e}/prisma_example/Makefile | 2 +- .../prisma/migrations/0_init/migration.sql | 0 .../20230915175206_init/migration.sql | 0 .../20230915175207_electric/migration.sql | 0 .../20230916212444_many/migration.sql | 0 .../prisma/migrations/migration_lock.toml | 0 .../migrations-1/prisma/schema.prisma | 0 {e2e => packages/e2e}/prisma_example/run.sh | 0 .../e2e}/prisma_example/schema.prisma | 0 .../e2e}/prisma_example/src/package-lock.json | 0 .../e2e}/prisma_example/src/package.json | 0 .../e2e}/prisma_example/src/tsconfig.json | 0 .../e2e}/satellite_client/.gitignore | 0 .../e2e}/satellite_client/.prettierrc.json | 0 .../e2e}/satellite_client/Dockerfile | 6 ++--- .../e2e}/satellite_client/Makefile | 0 .../db/01-create_e2e_tables.sql | 0 .../e2e}/satellite_client/package.json | 0 .../e2e}/satellite_client/src/client.ts | 0 .../src/generated/client/db-description.ts | 0 .../src/generated/client/index.ts | 0 .../src/generated/client/migrations.ts | 0 .../src/generated/client/pg-migrations.ts | 0 .../src/generated/client/prismaClient.d.ts | 0 .../satellite_client/src/prisma/schema.prisma | 0 .../e2e}/satellite_client/tsconfig.json | 0 {e2e => packages/e2e}/services_templates.yaml | 0 .../e2e}/tests/01.01_simple_startup.lux | 0 .../e2e}/tests/01.02_electrification.lux | 0 ..._postgres_writes_propagate_to_electric.lux | 0 ...stgres_alter_table_also_alters_shadows.lux | 0 ...1.05_electric_can_recreate_publication.lux | 0 ...n_of_rows_that_predate_electrification.lux | 0 ...ite_primary_key_in_referenced_relation.lux | 0 ....01_postgres_data_streams_to_satellite.lux | 0 ...2_migrations_get_streamed_to_satellite.lux | 0 ...3_partial_replication_based_on_user_id.lux | 0 ...lite_write_gets_propagated_to_postgres.lux | 0 ...02.05_delete_gets_registered_correctly.lux | 0 ...scriptions_can_be_resumed_on_reconnect.lux | 0 .../02.07_where_clauses_on_subscriptions.lux | 0 ..._node_satellite_loads_local_migrations.lux | 0 ..._satellite_applies_incoming_migrations.lux | 0 ...node_satellite_sends_and_recieves_data.lux | 0 ...correctly_updates_serialization_caches.lux | 0 ...ves_all_migrations_during_initial_sync.lux | 0 ..._node_satellite_does_sync_on_subscribe.lux | 0 ...tellite_can_delete_freshly_synced_rows.lux | 0 ..._can_resume_subscriptions_on_reconnect.lux | 0 ...missing_migrations_during_initial_sync.lux | 0 ...te_can_resume_replication_on_reconnect.lux | 0 ...3.11_node_satellite_compensations_work.lux | 0 ...er_correctly_continues_the_replication.lux | 0 ....13_node_satellite_can_sync_timestamps.lux | 0 ...ode_satellite_can_sync_dates_and_times.lux | 0 ...03.15_node_satellite_can_sync_booleans.lux | 0 .../03.16_node_satellite_can_sync_uuids.lux | 0 .../03.17_node_satellite_can_sync_ints.lux | 0 .../03.18_node_satellite_can_sync_float.lux | 0 .../03.19_node_satellite_can_sync_json.lux | 0 .../03.20_node_satellite_can_sync_enums.lux | 0 ...ite_correctly_handles_move_in_move_out.lux | 0 ...satellite_can_disconnect_and_reconnect.lux | 0 .../03.23_node_satellite_can_sync_bytea.lux | 0 ..._can_transform_at_replication_boundary.lux | 0 ...tion_does_not_matter_for_compensations.lux | 0 ...esume_replication_after_server_restart.lux | 0 ...es_dropped_columns_are_not_electrified.lux | 0 ...node_satellite_authentication.lux.disabled | 0 ..._is_informed_when_jwt_expires.lux.disabled | 0 .../04.01_electric_api_returns_migrations.lux | 0 ...introspection_generates_correct_schema.lux | 0 ...4.03_prisma_migration_version_captured.lux | 0 .../tests/04.04_prisma_introspection_fk.lux | 0 ...5_generated_postgres_client_migrations.lux | 0 ...solution_updates_in_the_past_discarded.lux | 0 .../05.02_confict_resolution_per_column.lux | 0 ...s_wins_against_concurrent_transactions.lux | 0 ...pdate_that_didnt_see_delete_resurrects.lux | 0 ..._compensations_within_same_tx_are_fine.lux | 0 ...er_column_name_quoting_regression_test.lux | 0 .../tests/06.01_prevent_updates_to_pk.lux | 0 {e2e => packages/e2e}/tests/Makefile | 0 .../e2e}/tests/_satellite_macros.luxinc | 0 {e2e => packages/e2e}/tests/_shared.luxinc | 0 {e2e => packages/e2e}/tests/compose.yaml | 0 .../e2e}/tests/otel-collector-config.yaml | 0 .../postgres/logical_replication_producer.ex | 2 +- pnpm-workspace.yaml | 2 +- 106 files changed, 26 insertions(+), 26 deletions(-) rename {e2e => packages/e2e}/.gitignore (100%) rename {e2e => packages/e2e}/00_shared_init.sql (100%) rename {e2e => packages/e2e}/Makefile (100%) rename {e2e => packages/e2e}/README.md (100%) rename {e2e => packages/e2e}/common.luxinc (100%) rename {e2e => packages/e2e}/common.mk (100%) rename {e2e => packages/e2e}/docker/Dockerfile.sysbench (100%) rename {e2e => packages/e2e}/elixir_client/.gitignore (100%) rename {e2e => packages/e2e}/elixir_client/Makefile (100%) rename {e2e => packages/e2e}/init.sql (100%) rename {e2e => packages/e2e}/postgres.conf (100%) rename {e2e => packages/e2e}/prisma_example/.gitignore (100%) rename {e2e => packages/e2e}/prisma_example/Dockerfile (100%) rename {e2e => packages/e2e}/prisma_example/Makefile (57%) rename {e2e => packages/e2e}/prisma_example/migrations-1/prisma/migrations/0_init/migration.sql (100%) rename {e2e => packages/e2e}/prisma_example/migrations-1/prisma/migrations/20230915175206_init/migration.sql (100%) rename {e2e => packages/e2e}/prisma_example/migrations-1/prisma/migrations/20230915175207_electric/migration.sql (100%) rename {e2e => packages/e2e}/prisma_example/migrations-1/prisma/migrations/20230916212444_many/migration.sql (100%) rename {e2e => packages/e2e}/prisma_example/migrations-1/prisma/migrations/migration_lock.toml (100%) rename {e2e => packages/e2e}/prisma_example/migrations-1/prisma/schema.prisma (100%) rename {e2e => packages/e2e}/prisma_example/run.sh (100%) rename {e2e => packages/e2e}/prisma_example/schema.prisma (100%) rename {e2e => packages/e2e}/prisma_example/src/package-lock.json (100%) rename {e2e => packages/e2e}/prisma_example/src/package.json (100%) rename {e2e => packages/e2e}/prisma_example/src/tsconfig.json (100%) rename {e2e => packages/e2e}/satellite_client/.gitignore (100%) rename {e2e => packages/e2e}/satellite_client/.prettierrc.json (100%) rename {e2e => packages/e2e}/satellite_client/Dockerfile (80%) rename {e2e => packages/e2e}/satellite_client/Makefile (100%) rename {e2e => packages/e2e}/satellite_client/db/01-create_e2e_tables.sql (100%) rename {e2e => packages/e2e}/satellite_client/package.json (100%) rename {e2e => packages/e2e}/satellite_client/src/client.ts (100%) rename {e2e => packages/e2e}/satellite_client/src/generated/client/db-description.ts (100%) rename {e2e => packages/e2e}/satellite_client/src/generated/client/index.ts (100%) rename {e2e => packages/e2e}/satellite_client/src/generated/client/migrations.ts (100%) rename {e2e => packages/e2e}/satellite_client/src/generated/client/pg-migrations.ts (100%) rename {e2e => packages/e2e}/satellite_client/src/generated/client/prismaClient.d.ts (100%) rename {e2e => packages/e2e}/satellite_client/src/prisma/schema.prisma (100%) rename {e2e => packages/e2e}/satellite_client/tsconfig.json (100%) rename {e2e => packages/e2e}/services_templates.yaml (100%) rename {e2e => packages/e2e}/tests/01.01_simple_startup.lux (100%) rename {e2e => packages/e2e}/tests/01.02_electrification.lux (100%) rename {e2e => packages/e2e}/tests/01.03_postgres_writes_propagate_to_electric.lux (100%) rename {e2e => packages/e2e}/tests/01.04_postgres_alter_table_also_alters_shadows.lux (100%) rename {e2e => packages/e2e}/tests/01.05_electric_can_recreate_publication.lux (100%) rename {e2e => packages/e2e}/tests/01.06_replication_of_rows_that_predate_electrification.lux (100%) rename {e2e => packages/e2e}/tests/01.07_composite_primary_key_in_referenced_relation.lux (100%) rename {e2e => packages/e2e}/tests/02.01_postgres_data_streams_to_satellite.lux (100%) rename {e2e => packages/e2e}/tests/02.02_migrations_get_streamed_to_satellite.lux (100%) rename {e2e => packages/e2e}/tests/02.03_partial_replication_based_on_user_id.lux (100%) rename {e2e => packages/e2e}/tests/02.04_satellite_write_gets_propagated_to_postgres.lux (100%) rename {e2e => packages/e2e}/tests/02.05_delete_gets_registered_correctly.lux (100%) rename {e2e => packages/e2e}/tests/02.06_subscriptions_can_be_resumed_on_reconnect.lux (100%) rename {e2e => packages/e2e}/tests/02.07_where_clauses_on_subscriptions.lux (100%) rename {e2e => packages/e2e}/tests/03.01_node_satellite_loads_local_migrations.lux (100%) rename {e2e => packages/e2e}/tests/03.02_node_satellite_applies_incoming_migrations.lux (100%) rename {e2e => packages/e2e}/tests/03.03_node_satellite_sends_and_recieves_data.lux (100%) rename {e2e => packages/e2e}/tests/03.04_node_satellite_correctly_updates_serialization_caches.lux (100%) rename {e2e => packages/e2e}/tests/03.05_fresh_node_satellite_receives_all_migrations_during_initial_sync.lux (100%) rename {e2e => packages/e2e}/tests/03.06_node_satellite_does_sync_on_subscribe.lux (100%) rename {e2e => packages/e2e}/tests/03.07_node_satellite_can_delete_freshly_synced_rows.lux (100%) rename {e2e => packages/e2e}/tests/03.08_node_satellite_can_resume_subscriptions_on_reconnect.lux (100%) rename {e2e => packages/e2e}/tests/03.09_fresh_node_satellite_receives_only_missing_migrations_during_initial_sync.lux (100%) rename {e2e => packages/e2e}/tests/03.10_node_satellite_can_resume_replication_on_reconnect.lux (100%) rename {e2e => packages/e2e}/tests/03.11_node_satellite_compensations_work.lux (100%) rename {e2e => packages/e2e}/tests/03.12_server_correctly_continues_the_replication.lux (100%) rename {e2e => packages/e2e}/tests/03.13_node_satellite_can_sync_timestamps.lux (100%) rename {e2e => packages/e2e}/tests/03.14_node_satellite_can_sync_dates_and_times.lux (100%) rename {e2e => packages/e2e}/tests/03.15_node_satellite_can_sync_booleans.lux (100%) rename {e2e => packages/e2e}/tests/03.16_node_satellite_can_sync_uuids.lux (100%) rename {e2e => packages/e2e}/tests/03.17_node_satellite_can_sync_ints.lux (100%) rename {e2e => packages/e2e}/tests/03.18_node_satellite_can_sync_float.lux (100%) rename {e2e => packages/e2e}/tests/03.19_node_satellite_can_sync_json.lux (100%) rename {e2e => packages/e2e}/tests/03.20_node_satellite_can_sync_enums.lux (100%) rename {e2e => packages/e2e}/tests/03.21_node_satellite_correctly_handles_move_in_move_out.lux (100%) rename {e2e => packages/e2e}/tests/03.22_node_satellite_can_disconnect_and_reconnect.lux (100%) rename {e2e => packages/e2e}/tests/03.23_node_satellite_can_sync_bytea.lux (100%) rename {e2e => packages/e2e}/tests/03.24_node_satellite_can_transform_at_replication_boundary.lux (100%) rename {e2e => packages/e2e}/tests/03.25_node_pk_position_does_not_matter_for_compensations.lux (100%) rename {e2e => packages/e2e}/tests/03.26_node_satellite_can_resume_replication_after_server_restart.lux (100%) rename {e2e => packages/e2e}/tests/03.27_postgres_dropped_columns_are_not_electrified.lux (100%) rename {e2e => packages/e2e}/tests/03.xx_node_satellite_authentication.lux.disabled (100%) rename {e2e => packages/e2e}/tests/03.xx_node_satellite_is_informed_when_jwt_expires.lux.disabled (100%) rename {e2e => packages/e2e}/tests/04.01_electric_api_returns_migrations.lux (100%) rename {e2e => packages/e2e}/tests/04.02_prisma_introspection_generates_correct_schema.lux (100%) rename {e2e => packages/e2e}/tests/04.03_prisma_migration_version_captured.lux (100%) rename {e2e => packages/e2e}/tests/04.04_prisma_introspection_fk.lux (100%) rename {e2e => packages/e2e}/tests/04.05_generated_postgres_client_migrations.lux (100%) rename {e2e => packages/e2e}/tests/05.01_confict_resolution_updates_in_the_past_discarded.lux (100%) rename {e2e => packages/e2e}/tests/05.02_confict_resolution_per_column.lux (100%) rename {e2e => packages/e2e}/tests/05.03_postgres_wins_against_concurrent_transactions.lux (100%) rename {e2e => packages/e2e}/tests/05.04_update_that_didnt_see_delete_resurrects.lux (100%) rename {e2e => packages/e2e}/tests/05.05_compensations_within_same_tx_are_fine.lux (100%) rename {e2e => packages/e2e}/tests/05.06_postgres_trigger_column_name_quoting_regression_test.lux (100%) rename {e2e => packages/e2e}/tests/06.01_prevent_updates_to_pk.lux (100%) rename {e2e => packages/e2e}/tests/Makefile (100%) rename {e2e => packages/e2e}/tests/_satellite_macros.luxinc (100%) rename {e2e => packages/e2e}/tests/_shared.luxinc (100%) rename {e2e => packages/e2e}/tests/compose.yaml (100%) rename {e2e => packages/e2e}/tests/otel-collector-config.yaml (100%) diff --git a/.dockerignore b/.dockerignore index 7b49a7bbcb..23ec50c87e 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,5 @@ # This `.dockerignore` file is used when building docker images from the repository root. -# In particular, we're building the `e2e/satellite_client` that way, because it relies on +# In particular, we're building the `packages/e2e/satellite_client` that way, because it relies on # other packages within the monorepo. Without this, the context sent to docker build engine # is over 5Gb due to all the dependencies we don't need anyway. @@ -15,5 +15,5 @@ **/.npm **/.cache -e2e/lux -e2e/lux_logs \ No newline at end of file +packages/e2e/lux +packages/e2e/lux_logs \ No newline at end of file diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 700fa14fed..911ce17471 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -8,7 +8,7 @@ on: # Root files - "*" - "!pnpm-lock.yaml" - - "!clients/typescript/**" # Satellite tests run in a separate workflow + - "!packages/client/**" # Satellite tests run in a separate workflow # CI files not related to GH actions - ".buildkite/**" - "**/README.md" @@ -31,7 +31,7 @@ jobs: write_to_pg_mode: [logical_replication, direct_writes] defaults: run: - working-directory: e2e + working-directory: packages/e2e env: BUILDKITE_ANALYTICS_TOKEN: ${{ secrets.BUILDKITE_TEST_ANALYTICS_E2E }} ELECTRIC_WRITE_TO_PG_MODE: ${{ matrix.write_to_pg_mode }} @@ -75,9 +75,9 @@ jobs: uses: actions/cache@v4 with: path: | - e2e/lux/bin - e2e/lux/ebin - e2e/lux/priv + packages/e2e/lux/bin + packages/e2e/lux/ebin + packages/e2e/lux/priv key: ${{ runner.os }}-luxbuilt-${{ env.OTP_VERSION }}-${{ env.ELIXIR_VERSION }} - run: make lux @@ -94,10 +94,10 @@ jobs: if: ${{ failure() && steps.tests.outcome == 'failure' }} with: name: lux_logs - path: e2e/**/lux_logs/run_* + path: packages/e2e/**/lux_logs/run_* - name: Upload test results to Buildkite analytics if: ${{ !cancelled() && steps.tests.outcome != 'skipped' && env.BUILDKITE_ANALYTICS_TOKEN != '' }} - working-directory: e2e/lux_logs/latest_run + working-directory: packages/e2e/lux_logs/latest_run run: | curl \ -X POST \ @@ -122,7 +122,7 @@ jobs: name: E2E Satellite tests (Dialect ${{ matrix.dialect }} - uses DAL? ${{ matrix.dal }}) defaults: run: - working-directory: e2e + working-directory: packages/e2e env: BUILDKITE_ANALYTICS_TOKEN: ${{ secrets.BUILDKITE_TEST_ANALYTICS_E2E }} DIALECT: ${{ matrix.dialect }} @@ -166,9 +166,9 @@ jobs: uses: actions/cache@v4 with: path: | - e2e/lux/bin - e2e/lux/ebin - e2e/lux/priv + packages/e2e/lux/bin + packages/e2e/lux/ebin + packages/e2e/lux/priv key: ${{ runner.os }}-luxbuilt-${{ env.OTP_VERSION }}-${{ env.ELIXIR_VERSION }} - run: make lux @@ -185,10 +185,10 @@ jobs: if: ${{ failure() && steps.tests.outcome == 'failure' }} with: name: lux_logs - path: e2e/**/lux_logs/run_* + path: packages/e2e/**/lux_logs/run_* - name: Upload test results to Buildkite analytics if: ${{ !cancelled() && steps.tests.outcome != 'skipped' && env.BUILDKITE_ANALYTICS_TOKEN != '' }} - working-directory: e2e/lux_logs/latest_run + working-directory: packages/e2e/lux_logs/latest_run run: | curl \ -X POST \ diff --git a/Makefile b/Makefile index d1cd778180..15e99d6f6d 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,8 @@ build_all: test_all: make -C packages/electric deps tests make -C packages/client deps tests - make -C generator deps tests - make -C e2e test + make -C packages/generator deps tests + make -C packages/e2e test update_protobuf: make -C packages/electric update_protobuf diff --git a/README.md b/README.md index 6b5ffbdaa3..c42fd68f49 100644 --- a/README.md +++ b/README.md @@ -66,10 +66,10 @@ This is the main repository for the ElectricSQL source code. Key components incl - [packages/client](https://github.com/electric-sql/electric/tree/main/packages/client) — TypeScript client that provides SQLite driver adapters, reactivity and a type-safe data access library - [packages/electric](https://github.com/electric-sql/electric/tree/main/packages/electric) — Elixir sync service that manages active-active replication between Postgres and SQLite -- [generator](https://github.com/electric-sql/electric/tree/main/generator) — Prisma generator that creates the type safe data access library +- [packages/generator](https://github.com/electric-sql/electric/tree/main/packages/generator) — Prisma generator that creates the type safe data access library - [protocol/satellite.proto](https://github.com/electric-sql/electric/tree/main/protocol/satellite.proto) — Protocol Buffers definition of the Satellite replication protocol -See the Makefiles for test and build instructions and the [e2e](https://github.com/electric-sql/electric/tree/main/e2e) folder for integration tests. +See the Makefiles for test and build instructions and the [e2e](https://github.com/electric-sql/electric/tree/main/packages/e2e) folder for integration tests. ## Team diff --git a/e2e/.gitignore b/packages/e2e/.gitignore similarity index 100% rename from e2e/.gitignore rename to packages/e2e/.gitignore diff --git a/e2e/00_shared_init.sql b/packages/e2e/00_shared_init.sql similarity index 100% rename from e2e/00_shared_init.sql rename to packages/e2e/00_shared_init.sql diff --git a/e2e/Makefile b/packages/e2e/Makefile similarity index 100% rename from e2e/Makefile rename to packages/e2e/Makefile diff --git a/e2e/README.md b/packages/e2e/README.md similarity index 100% rename from e2e/README.md rename to packages/e2e/README.md diff --git a/e2e/common.luxinc b/packages/e2e/common.luxinc similarity index 100% rename from e2e/common.luxinc rename to packages/e2e/common.luxinc diff --git a/e2e/common.mk b/packages/e2e/common.mk similarity index 100% rename from e2e/common.mk rename to packages/e2e/common.mk diff --git a/e2e/docker/Dockerfile.sysbench b/packages/e2e/docker/Dockerfile.sysbench similarity index 100% rename from e2e/docker/Dockerfile.sysbench rename to packages/e2e/docker/Dockerfile.sysbench diff --git a/e2e/elixir_client/.gitignore b/packages/e2e/elixir_client/.gitignore similarity index 100% rename from e2e/elixir_client/.gitignore rename to packages/e2e/elixir_client/.gitignore diff --git a/e2e/elixir_client/Makefile b/packages/e2e/elixir_client/Makefile similarity index 100% rename from e2e/elixir_client/Makefile rename to packages/e2e/elixir_client/Makefile diff --git a/e2e/init.sql b/packages/e2e/init.sql similarity index 100% rename from e2e/init.sql rename to packages/e2e/init.sql diff --git a/e2e/postgres.conf b/packages/e2e/postgres.conf similarity index 100% rename from e2e/postgres.conf rename to packages/e2e/postgres.conf diff --git a/e2e/prisma_example/.gitignore b/packages/e2e/prisma_example/.gitignore similarity index 100% rename from e2e/prisma_example/.gitignore rename to packages/e2e/prisma_example/.gitignore diff --git a/e2e/prisma_example/Dockerfile b/packages/e2e/prisma_example/Dockerfile similarity index 100% rename from e2e/prisma_example/Dockerfile rename to packages/e2e/prisma_example/Dockerfile diff --git a/e2e/prisma_example/Makefile b/packages/e2e/prisma_example/Makefile similarity index 57% rename from e2e/prisma_example/Makefile rename to packages/e2e/prisma_example/Makefile index d873300e38..54202630be 100644 --- a/e2e/prisma_example/Makefile +++ b/packages/e2e/prisma_example/Makefile @@ -1,4 +1,4 @@ include ../common.mk build: - docker buildx build --load ${CACHING_SETTINGS} -f ./Dockerfile -t prisma_example:local ${PROJECT_ROOT}/e2e/prisma_example + docker buildx build --load ${CACHING_SETTINGS} -f ./Dockerfile -t prisma_example:local ${PROJECT_ROOT}/packages/e2e/prisma_example diff --git a/e2e/prisma_example/migrations-1/prisma/migrations/0_init/migration.sql b/packages/e2e/prisma_example/migrations-1/prisma/migrations/0_init/migration.sql similarity index 100% rename from e2e/prisma_example/migrations-1/prisma/migrations/0_init/migration.sql rename to packages/e2e/prisma_example/migrations-1/prisma/migrations/0_init/migration.sql diff --git a/e2e/prisma_example/migrations-1/prisma/migrations/20230915175206_init/migration.sql b/packages/e2e/prisma_example/migrations-1/prisma/migrations/20230915175206_init/migration.sql similarity index 100% rename from e2e/prisma_example/migrations-1/prisma/migrations/20230915175206_init/migration.sql rename to packages/e2e/prisma_example/migrations-1/prisma/migrations/20230915175206_init/migration.sql diff --git a/e2e/prisma_example/migrations-1/prisma/migrations/20230915175207_electric/migration.sql b/packages/e2e/prisma_example/migrations-1/prisma/migrations/20230915175207_electric/migration.sql similarity index 100% rename from e2e/prisma_example/migrations-1/prisma/migrations/20230915175207_electric/migration.sql rename to packages/e2e/prisma_example/migrations-1/prisma/migrations/20230915175207_electric/migration.sql diff --git a/e2e/prisma_example/migrations-1/prisma/migrations/20230916212444_many/migration.sql b/packages/e2e/prisma_example/migrations-1/prisma/migrations/20230916212444_many/migration.sql similarity index 100% rename from e2e/prisma_example/migrations-1/prisma/migrations/20230916212444_many/migration.sql rename to packages/e2e/prisma_example/migrations-1/prisma/migrations/20230916212444_many/migration.sql diff --git a/e2e/prisma_example/migrations-1/prisma/migrations/migration_lock.toml b/packages/e2e/prisma_example/migrations-1/prisma/migrations/migration_lock.toml similarity index 100% rename from e2e/prisma_example/migrations-1/prisma/migrations/migration_lock.toml rename to packages/e2e/prisma_example/migrations-1/prisma/migrations/migration_lock.toml diff --git a/e2e/prisma_example/migrations-1/prisma/schema.prisma b/packages/e2e/prisma_example/migrations-1/prisma/schema.prisma similarity index 100% rename from e2e/prisma_example/migrations-1/prisma/schema.prisma rename to packages/e2e/prisma_example/migrations-1/prisma/schema.prisma diff --git a/e2e/prisma_example/run.sh b/packages/e2e/prisma_example/run.sh similarity index 100% rename from e2e/prisma_example/run.sh rename to packages/e2e/prisma_example/run.sh diff --git a/e2e/prisma_example/schema.prisma b/packages/e2e/prisma_example/schema.prisma similarity index 100% rename from e2e/prisma_example/schema.prisma rename to packages/e2e/prisma_example/schema.prisma diff --git a/e2e/prisma_example/src/package-lock.json b/packages/e2e/prisma_example/src/package-lock.json similarity index 100% rename from e2e/prisma_example/src/package-lock.json rename to packages/e2e/prisma_example/src/package-lock.json diff --git a/e2e/prisma_example/src/package.json b/packages/e2e/prisma_example/src/package.json similarity index 100% rename from e2e/prisma_example/src/package.json rename to packages/e2e/prisma_example/src/package.json diff --git a/e2e/prisma_example/src/tsconfig.json b/packages/e2e/prisma_example/src/tsconfig.json similarity index 100% rename from e2e/prisma_example/src/tsconfig.json rename to packages/e2e/prisma_example/src/tsconfig.json diff --git a/e2e/satellite_client/.gitignore b/packages/e2e/satellite_client/.gitignore similarity index 100% rename from e2e/satellite_client/.gitignore rename to packages/e2e/satellite_client/.gitignore diff --git a/e2e/satellite_client/.prettierrc.json b/packages/e2e/satellite_client/.prettierrc.json similarity index 100% rename from e2e/satellite_client/.prettierrc.json rename to packages/e2e/satellite_client/.prettierrc.json diff --git a/e2e/satellite_client/Dockerfile b/packages/e2e/satellite_client/Dockerfile similarity index 80% rename from e2e/satellite_client/Dockerfile rename to packages/e2e/satellite_client/Dockerfile index 7183b982e9..82915a61d8 100644 --- a/e2e/satellite_client/Dockerfile +++ b/packages/e2e/satellite_client/Dockerfile @@ -16,14 +16,14 @@ COPY packages/client ./packages/client COPY common ./common COPY packages/generator ./packages/generator COPY packages/drivers ./packages/drivers -COPY e2e/satellite_client/package.json ./e2e/satellite_client/ +COPY packages/e2e/satellite_client/package.json ./packages/e2e/satellite_client/ RUN pnpm install -r --offline --filter @internal/satellite-client^... RUN pnpm run -r --filter @internal/satellite-client^... build RUN pnpm install --offline --filter @internal/satellite-client # E2E Client build -COPY e2e/satellite_client/src ./e2e/satellite_client/src -COPY e2e/satellite_client/tsconfig.json ./e2e/satellite_client +COPY packages/e2e/satellite_client/src ./packages/e2e/satellite_client/src +COPY packages/e2e/satellite_client/tsconfig.json ./packages/e2e/satellite_client RUN pnpm run --filter @internal/satellite-client build # Deploy an isolated node_modules + src in which the E2E Client will be run diff --git a/e2e/satellite_client/Makefile b/packages/e2e/satellite_client/Makefile similarity index 100% rename from e2e/satellite_client/Makefile rename to packages/e2e/satellite_client/Makefile diff --git a/e2e/satellite_client/db/01-create_e2e_tables.sql b/packages/e2e/satellite_client/db/01-create_e2e_tables.sql similarity index 100% rename from e2e/satellite_client/db/01-create_e2e_tables.sql rename to packages/e2e/satellite_client/db/01-create_e2e_tables.sql diff --git a/e2e/satellite_client/package.json b/packages/e2e/satellite_client/package.json similarity index 100% rename from e2e/satellite_client/package.json rename to packages/e2e/satellite_client/package.json diff --git a/e2e/satellite_client/src/client.ts b/packages/e2e/satellite_client/src/client.ts similarity index 100% rename from e2e/satellite_client/src/client.ts rename to packages/e2e/satellite_client/src/client.ts diff --git a/e2e/satellite_client/src/generated/client/db-description.ts b/packages/e2e/satellite_client/src/generated/client/db-description.ts similarity index 100% rename from e2e/satellite_client/src/generated/client/db-description.ts rename to packages/e2e/satellite_client/src/generated/client/db-description.ts diff --git a/e2e/satellite_client/src/generated/client/index.ts b/packages/e2e/satellite_client/src/generated/client/index.ts similarity index 100% rename from e2e/satellite_client/src/generated/client/index.ts rename to packages/e2e/satellite_client/src/generated/client/index.ts diff --git a/e2e/satellite_client/src/generated/client/migrations.ts b/packages/e2e/satellite_client/src/generated/client/migrations.ts similarity index 100% rename from e2e/satellite_client/src/generated/client/migrations.ts rename to packages/e2e/satellite_client/src/generated/client/migrations.ts diff --git a/e2e/satellite_client/src/generated/client/pg-migrations.ts b/packages/e2e/satellite_client/src/generated/client/pg-migrations.ts similarity index 100% rename from e2e/satellite_client/src/generated/client/pg-migrations.ts rename to packages/e2e/satellite_client/src/generated/client/pg-migrations.ts diff --git a/e2e/satellite_client/src/generated/client/prismaClient.d.ts b/packages/e2e/satellite_client/src/generated/client/prismaClient.d.ts similarity index 100% rename from e2e/satellite_client/src/generated/client/prismaClient.d.ts rename to packages/e2e/satellite_client/src/generated/client/prismaClient.d.ts diff --git a/e2e/satellite_client/src/prisma/schema.prisma b/packages/e2e/satellite_client/src/prisma/schema.prisma similarity index 100% rename from e2e/satellite_client/src/prisma/schema.prisma rename to packages/e2e/satellite_client/src/prisma/schema.prisma diff --git a/e2e/satellite_client/tsconfig.json b/packages/e2e/satellite_client/tsconfig.json similarity index 100% rename from e2e/satellite_client/tsconfig.json rename to packages/e2e/satellite_client/tsconfig.json diff --git a/e2e/services_templates.yaml b/packages/e2e/services_templates.yaml similarity index 100% rename from e2e/services_templates.yaml rename to packages/e2e/services_templates.yaml diff --git a/e2e/tests/01.01_simple_startup.lux b/packages/e2e/tests/01.01_simple_startup.lux similarity index 100% rename from e2e/tests/01.01_simple_startup.lux rename to packages/e2e/tests/01.01_simple_startup.lux diff --git a/e2e/tests/01.02_electrification.lux b/packages/e2e/tests/01.02_electrification.lux similarity index 100% rename from e2e/tests/01.02_electrification.lux rename to packages/e2e/tests/01.02_electrification.lux diff --git a/e2e/tests/01.03_postgres_writes_propagate_to_electric.lux b/packages/e2e/tests/01.03_postgres_writes_propagate_to_electric.lux similarity index 100% rename from e2e/tests/01.03_postgres_writes_propagate_to_electric.lux rename to packages/e2e/tests/01.03_postgres_writes_propagate_to_electric.lux diff --git a/e2e/tests/01.04_postgres_alter_table_also_alters_shadows.lux b/packages/e2e/tests/01.04_postgres_alter_table_also_alters_shadows.lux similarity index 100% rename from e2e/tests/01.04_postgres_alter_table_also_alters_shadows.lux rename to packages/e2e/tests/01.04_postgres_alter_table_also_alters_shadows.lux diff --git a/e2e/tests/01.05_electric_can_recreate_publication.lux b/packages/e2e/tests/01.05_electric_can_recreate_publication.lux similarity index 100% rename from e2e/tests/01.05_electric_can_recreate_publication.lux rename to packages/e2e/tests/01.05_electric_can_recreate_publication.lux diff --git a/e2e/tests/01.06_replication_of_rows_that_predate_electrification.lux b/packages/e2e/tests/01.06_replication_of_rows_that_predate_electrification.lux similarity index 100% rename from e2e/tests/01.06_replication_of_rows_that_predate_electrification.lux rename to packages/e2e/tests/01.06_replication_of_rows_that_predate_electrification.lux diff --git a/e2e/tests/01.07_composite_primary_key_in_referenced_relation.lux b/packages/e2e/tests/01.07_composite_primary_key_in_referenced_relation.lux similarity index 100% rename from e2e/tests/01.07_composite_primary_key_in_referenced_relation.lux rename to packages/e2e/tests/01.07_composite_primary_key_in_referenced_relation.lux diff --git a/e2e/tests/02.01_postgres_data_streams_to_satellite.lux b/packages/e2e/tests/02.01_postgres_data_streams_to_satellite.lux similarity index 100% rename from e2e/tests/02.01_postgres_data_streams_to_satellite.lux rename to packages/e2e/tests/02.01_postgres_data_streams_to_satellite.lux diff --git a/e2e/tests/02.02_migrations_get_streamed_to_satellite.lux b/packages/e2e/tests/02.02_migrations_get_streamed_to_satellite.lux similarity index 100% rename from e2e/tests/02.02_migrations_get_streamed_to_satellite.lux rename to packages/e2e/tests/02.02_migrations_get_streamed_to_satellite.lux diff --git a/e2e/tests/02.03_partial_replication_based_on_user_id.lux b/packages/e2e/tests/02.03_partial_replication_based_on_user_id.lux similarity index 100% rename from e2e/tests/02.03_partial_replication_based_on_user_id.lux rename to packages/e2e/tests/02.03_partial_replication_based_on_user_id.lux diff --git a/e2e/tests/02.04_satellite_write_gets_propagated_to_postgres.lux b/packages/e2e/tests/02.04_satellite_write_gets_propagated_to_postgres.lux similarity index 100% rename from e2e/tests/02.04_satellite_write_gets_propagated_to_postgres.lux rename to packages/e2e/tests/02.04_satellite_write_gets_propagated_to_postgres.lux diff --git a/e2e/tests/02.05_delete_gets_registered_correctly.lux b/packages/e2e/tests/02.05_delete_gets_registered_correctly.lux similarity index 100% rename from e2e/tests/02.05_delete_gets_registered_correctly.lux rename to packages/e2e/tests/02.05_delete_gets_registered_correctly.lux diff --git a/e2e/tests/02.06_subscriptions_can_be_resumed_on_reconnect.lux b/packages/e2e/tests/02.06_subscriptions_can_be_resumed_on_reconnect.lux similarity index 100% rename from e2e/tests/02.06_subscriptions_can_be_resumed_on_reconnect.lux rename to packages/e2e/tests/02.06_subscriptions_can_be_resumed_on_reconnect.lux diff --git a/e2e/tests/02.07_where_clauses_on_subscriptions.lux b/packages/e2e/tests/02.07_where_clauses_on_subscriptions.lux similarity index 100% rename from e2e/tests/02.07_where_clauses_on_subscriptions.lux rename to packages/e2e/tests/02.07_where_clauses_on_subscriptions.lux diff --git a/e2e/tests/03.01_node_satellite_loads_local_migrations.lux b/packages/e2e/tests/03.01_node_satellite_loads_local_migrations.lux similarity index 100% rename from e2e/tests/03.01_node_satellite_loads_local_migrations.lux rename to packages/e2e/tests/03.01_node_satellite_loads_local_migrations.lux diff --git a/e2e/tests/03.02_node_satellite_applies_incoming_migrations.lux b/packages/e2e/tests/03.02_node_satellite_applies_incoming_migrations.lux similarity index 100% rename from e2e/tests/03.02_node_satellite_applies_incoming_migrations.lux rename to packages/e2e/tests/03.02_node_satellite_applies_incoming_migrations.lux diff --git a/e2e/tests/03.03_node_satellite_sends_and_recieves_data.lux b/packages/e2e/tests/03.03_node_satellite_sends_and_recieves_data.lux similarity index 100% rename from e2e/tests/03.03_node_satellite_sends_and_recieves_data.lux rename to packages/e2e/tests/03.03_node_satellite_sends_and_recieves_data.lux diff --git a/e2e/tests/03.04_node_satellite_correctly_updates_serialization_caches.lux b/packages/e2e/tests/03.04_node_satellite_correctly_updates_serialization_caches.lux similarity index 100% rename from e2e/tests/03.04_node_satellite_correctly_updates_serialization_caches.lux rename to packages/e2e/tests/03.04_node_satellite_correctly_updates_serialization_caches.lux diff --git a/e2e/tests/03.05_fresh_node_satellite_receives_all_migrations_during_initial_sync.lux b/packages/e2e/tests/03.05_fresh_node_satellite_receives_all_migrations_during_initial_sync.lux similarity index 100% rename from e2e/tests/03.05_fresh_node_satellite_receives_all_migrations_during_initial_sync.lux rename to packages/e2e/tests/03.05_fresh_node_satellite_receives_all_migrations_during_initial_sync.lux diff --git a/e2e/tests/03.06_node_satellite_does_sync_on_subscribe.lux b/packages/e2e/tests/03.06_node_satellite_does_sync_on_subscribe.lux similarity index 100% rename from e2e/tests/03.06_node_satellite_does_sync_on_subscribe.lux rename to packages/e2e/tests/03.06_node_satellite_does_sync_on_subscribe.lux diff --git a/e2e/tests/03.07_node_satellite_can_delete_freshly_synced_rows.lux b/packages/e2e/tests/03.07_node_satellite_can_delete_freshly_synced_rows.lux similarity index 100% rename from e2e/tests/03.07_node_satellite_can_delete_freshly_synced_rows.lux rename to packages/e2e/tests/03.07_node_satellite_can_delete_freshly_synced_rows.lux diff --git a/e2e/tests/03.08_node_satellite_can_resume_subscriptions_on_reconnect.lux b/packages/e2e/tests/03.08_node_satellite_can_resume_subscriptions_on_reconnect.lux similarity index 100% rename from e2e/tests/03.08_node_satellite_can_resume_subscriptions_on_reconnect.lux rename to packages/e2e/tests/03.08_node_satellite_can_resume_subscriptions_on_reconnect.lux diff --git a/e2e/tests/03.09_fresh_node_satellite_receives_only_missing_migrations_during_initial_sync.lux b/packages/e2e/tests/03.09_fresh_node_satellite_receives_only_missing_migrations_during_initial_sync.lux similarity index 100% rename from e2e/tests/03.09_fresh_node_satellite_receives_only_missing_migrations_during_initial_sync.lux rename to packages/e2e/tests/03.09_fresh_node_satellite_receives_only_missing_migrations_during_initial_sync.lux diff --git a/e2e/tests/03.10_node_satellite_can_resume_replication_on_reconnect.lux b/packages/e2e/tests/03.10_node_satellite_can_resume_replication_on_reconnect.lux similarity index 100% rename from e2e/tests/03.10_node_satellite_can_resume_replication_on_reconnect.lux rename to packages/e2e/tests/03.10_node_satellite_can_resume_replication_on_reconnect.lux diff --git a/e2e/tests/03.11_node_satellite_compensations_work.lux b/packages/e2e/tests/03.11_node_satellite_compensations_work.lux similarity index 100% rename from e2e/tests/03.11_node_satellite_compensations_work.lux rename to packages/e2e/tests/03.11_node_satellite_compensations_work.lux diff --git a/e2e/tests/03.12_server_correctly_continues_the_replication.lux b/packages/e2e/tests/03.12_server_correctly_continues_the_replication.lux similarity index 100% rename from e2e/tests/03.12_server_correctly_continues_the_replication.lux rename to packages/e2e/tests/03.12_server_correctly_continues_the_replication.lux diff --git a/e2e/tests/03.13_node_satellite_can_sync_timestamps.lux b/packages/e2e/tests/03.13_node_satellite_can_sync_timestamps.lux similarity index 100% rename from e2e/tests/03.13_node_satellite_can_sync_timestamps.lux rename to packages/e2e/tests/03.13_node_satellite_can_sync_timestamps.lux diff --git a/e2e/tests/03.14_node_satellite_can_sync_dates_and_times.lux b/packages/e2e/tests/03.14_node_satellite_can_sync_dates_and_times.lux similarity index 100% rename from e2e/tests/03.14_node_satellite_can_sync_dates_and_times.lux rename to packages/e2e/tests/03.14_node_satellite_can_sync_dates_and_times.lux diff --git a/e2e/tests/03.15_node_satellite_can_sync_booleans.lux b/packages/e2e/tests/03.15_node_satellite_can_sync_booleans.lux similarity index 100% rename from e2e/tests/03.15_node_satellite_can_sync_booleans.lux rename to packages/e2e/tests/03.15_node_satellite_can_sync_booleans.lux diff --git a/e2e/tests/03.16_node_satellite_can_sync_uuids.lux b/packages/e2e/tests/03.16_node_satellite_can_sync_uuids.lux similarity index 100% rename from e2e/tests/03.16_node_satellite_can_sync_uuids.lux rename to packages/e2e/tests/03.16_node_satellite_can_sync_uuids.lux diff --git a/e2e/tests/03.17_node_satellite_can_sync_ints.lux b/packages/e2e/tests/03.17_node_satellite_can_sync_ints.lux similarity index 100% rename from e2e/tests/03.17_node_satellite_can_sync_ints.lux rename to packages/e2e/tests/03.17_node_satellite_can_sync_ints.lux diff --git a/e2e/tests/03.18_node_satellite_can_sync_float.lux b/packages/e2e/tests/03.18_node_satellite_can_sync_float.lux similarity index 100% rename from e2e/tests/03.18_node_satellite_can_sync_float.lux rename to packages/e2e/tests/03.18_node_satellite_can_sync_float.lux diff --git a/e2e/tests/03.19_node_satellite_can_sync_json.lux b/packages/e2e/tests/03.19_node_satellite_can_sync_json.lux similarity index 100% rename from e2e/tests/03.19_node_satellite_can_sync_json.lux rename to packages/e2e/tests/03.19_node_satellite_can_sync_json.lux diff --git a/e2e/tests/03.20_node_satellite_can_sync_enums.lux b/packages/e2e/tests/03.20_node_satellite_can_sync_enums.lux similarity index 100% rename from e2e/tests/03.20_node_satellite_can_sync_enums.lux rename to packages/e2e/tests/03.20_node_satellite_can_sync_enums.lux diff --git a/e2e/tests/03.21_node_satellite_correctly_handles_move_in_move_out.lux b/packages/e2e/tests/03.21_node_satellite_correctly_handles_move_in_move_out.lux similarity index 100% rename from e2e/tests/03.21_node_satellite_correctly_handles_move_in_move_out.lux rename to packages/e2e/tests/03.21_node_satellite_correctly_handles_move_in_move_out.lux diff --git a/e2e/tests/03.22_node_satellite_can_disconnect_and_reconnect.lux b/packages/e2e/tests/03.22_node_satellite_can_disconnect_and_reconnect.lux similarity index 100% rename from e2e/tests/03.22_node_satellite_can_disconnect_and_reconnect.lux rename to packages/e2e/tests/03.22_node_satellite_can_disconnect_and_reconnect.lux diff --git a/e2e/tests/03.23_node_satellite_can_sync_bytea.lux b/packages/e2e/tests/03.23_node_satellite_can_sync_bytea.lux similarity index 100% rename from e2e/tests/03.23_node_satellite_can_sync_bytea.lux rename to packages/e2e/tests/03.23_node_satellite_can_sync_bytea.lux diff --git a/e2e/tests/03.24_node_satellite_can_transform_at_replication_boundary.lux b/packages/e2e/tests/03.24_node_satellite_can_transform_at_replication_boundary.lux similarity index 100% rename from e2e/tests/03.24_node_satellite_can_transform_at_replication_boundary.lux rename to packages/e2e/tests/03.24_node_satellite_can_transform_at_replication_boundary.lux diff --git a/e2e/tests/03.25_node_pk_position_does_not_matter_for_compensations.lux b/packages/e2e/tests/03.25_node_pk_position_does_not_matter_for_compensations.lux similarity index 100% rename from e2e/tests/03.25_node_pk_position_does_not_matter_for_compensations.lux rename to packages/e2e/tests/03.25_node_pk_position_does_not_matter_for_compensations.lux diff --git a/e2e/tests/03.26_node_satellite_can_resume_replication_after_server_restart.lux b/packages/e2e/tests/03.26_node_satellite_can_resume_replication_after_server_restart.lux similarity index 100% rename from e2e/tests/03.26_node_satellite_can_resume_replication_after_server_restart.lux rename to packages/e2e/tests/03.26_node_satellite_can_resume_replication_after_server_restart.lux diff --git a/e2e/tests/03.27_postgres_dropped_columns_are_not_electrified.lux b/packages/e2e/tests/03.27_postgres_dropped_columns_are_not_electrified.lux similarity index 100% rename from e2e/tests/03.27_postgres_dropped_columns_are_not_electrified.lux rename to packages/e2e/tests/03.27_postgres_dropped_columns_are_not_electrified.lux diff --git a/e2e/tests/03.xx_node_satellite_authentication.lux.disabled b/packages/e2e/tests/03.xx_node_satellite_authentication.lux.disabled similarity index 100% rename from e2e/tests/03.xx_node_satellite_authentication.lux.disabled rename to packages/e2e/tests/03.xx_node_satellite_authentication.lux.disabled diff --git a/e2e/tests/03.xx_node_satellite_is_informed_when_jwt_expires.lux.disabled b/packages/e2e/tests/03.xx_node_satellite_is_informed_when_jwt_expires.lux.disabled similarity index 100% rename from e2e/tests/03.xx_node_satellite_is_informed_when_jwt_expires.lux.disabled rename to packages/e2e/tests/03.xx_node_satellite_is_informed_when_jwt_expires.lux.disabled diff --git a/e2e/tests/04.01_electric_api_returns_migrations.lux b/packages/e2e/tests/04.01_electric_api_returns_migrations.lux similarity index 100% rename from e2e/tests/04.01_electric_api_returns_migrations.lux rename to packages/e2e/tests/04.01_electric_api_returns_migrations.lux diff --git a/e2e/tests/04.02_prisma_introspection_generates_correct_schema.lux b/packages/e2e/tests/04.02_prisma_introspection_generates_correct_schema.lux similarity index 100% rename from e2e/tests/04.02_prisma_introspection_generates_correct_schema.lux rename to packages/e2e/tests/04.02_prisma_introspection_generates_correct_schema.lux diff --git a/e2e/tests/04.03_prisma_migration_version_captured.lux b/packages/e2e/tests/04.03_prisma_migration_version_captured.lux similarity index 100% rename from e2e/tests/04.03_prisma_migration_version_captured.lux rename to packages/e2e/tests/04.03_prisma_migration_version_captured.lux diff --git a/e2e/tests/04.04_prisma_introspection_fk.lux b/packages/e2e/tests/04.04_prisma_introspection_fk.lux similarity index 100% rename from e2e/tests/04.04_prisma_introspection_fk.lux rename to packages/e2e/tests/04.04_prisma_introspection_fk.lux diff --git a/e2e/tests/04.05_generated_postgres_client_migrations.lux b/packages/e2e/tests/04.05_generated_postgres_client_migrations.lux similarity index 100% rename from e2e/tests/04.05_generated_postgres_client_migrations.lux rename to packages/e2e/tests/04.05_generated_postgres_client_migrations.lux diff --git a/e2e/tests/05.01_confict_resolution_updates_in_the_past_discarded.lux b/packages/e2e/tests/05.01_confict_resolution_updates_in_the_past_discarded.lux similarity index 100% rename from e2e/tests/05.01_confict_resolution_updates_in_the_past_discarded.lux rename to packages/e2e/tests/05.01_confict_resolution_updates_in_the_past_discarded.lux diff --git a/e2e/tests/05.02_confict_resolution_per_column.lux b/packages/e2e/tests/05.02_confict_resolution_per_column.lux similarity index 100% rename from e2e/tests/05.02_confict_resolution_per_column.lux rename to packages/e2e/tests/05.02_confict_resolution_per_column.lux diff --git a/e2e/tests/05.03_postgres_wins_against_concurrent_transactions.lux b/packages/e2e/tests/05.03_postgres_wins_against_concurrent_transactions.lux similarity index 100% rename from e2e/tests/05.03_postgres_wins_against_concurrent_transactions.lux rename to packages/e2e/tests/05.03_postgres_wins_against_concurrent_transactions.lux diff --git a/e2e/tests/05.04_update_that_didnt_see_delete_resurrects.lux b/packages/e2e/tests/05.04_update_that_didnt_see_delete_resurrects.lux similarity index 100% rename from e2e/tests/05.04_update_that_didnt_see_delete_resurrects.lux rename to packages/e2e/tests/05.04_update_that_didnt_see_delete_resurrects.lux diff --git a/e2e/tests/05.05_compensations_within_same_tx_are_fine.lux b/packages/e2e/tests/05.05_compensations_within_same_tx_are_fine.lux similarity index 100% rename from e2e/tests/05.05_compensations_within_same_tx_are_fine.lux rename to packages/e2e/tests/05.05_compensations_within_same_tx_are_fine.lux diff --git a/e2e/tests/05.06_postgres_trigger_column_name_quoting_regression_test.lux b/packages/e2e/tests/05.06_postgres_trigger_column_name_quoting_regression_test.lux similarity index 100% rename from e2e/tests/05.06_postgres_trigger_column_name_quoting_regression_test.lux rename to packages/e2e/tests/05.06_postgres_trigger_column_name_quoting_regression_test.lux diff --git a/e2e/tests/06.01_prevent_updates_to_pk.lux b/packages/e2e/tests/06.01_prevent_updates_to_pk.lux similarity index 100% rename from e2e/tests/06.01_prevent_updates_to_pk.lux rename to packages/e2e/tests/06.01_prevent_updates_to_pk.lux diff --git a/e2e/tests/Makefile b/packages/e2e/tests/Makefile similarity index 100% rename from e2e/tests/Makefile rename to packages/e2e/tests/Makefile diff --git a/e2e/tests/_satellite_macros.luxinc b/packages/e2e/tests/_satellite_macros.luxinc similarity index 100% rename from e2e/tests/_satellite_macros.luxinc rename to packages/e2e/tests/_satellite_macros.luxinc diff --git a/e2e/tests/_shared.luxinc b/packages/e2e/tests/_shared.luxinc similarity index 100% rename from e2e/tests/_shared.luxinc rename to packages/e2e/tests/_shared.luxinc diff --git a/e2e/tests/compose.yaml b/packages/e2e/tests/compose.yaml similarity index 100% rename from e2e/tests/compose.yaml rename to packages/e2e/tests/compose.yaml diff --git a/e2e/tests/otel-collector-config.yaml b/packages/e2e/tests/otel-collector-config.yaml similarity index 100% rename from e2e/tests/otel-collector-config.yaml rename to packages/e2e/tests/otel-collector-config.yaml diff --git a/packages/electric/lib/electric/replication/postgres/logical_replication_producer.ex b/packages/electric/lib/electric/replication/postgres/logical_replication_producer.ex index 23af2641f0..37db2c1d95 100644 --- a/packages/electric/lib/electric/replication/postgres/logical_replication_producer.ex +++ b/packages/electric/lib/electric/replication/postgres/logical_replication_producer.ex @@ -129,7 +129,7 @@ defmodule Electric.Replication.Postgres.LogicalReplicationProducer do # connection is opened. In particular, trying to call `Client.get_server_versions()` before # creating the main slot results in the replication stream not delivering transactions from # Postgres when Electric is running in the direct_writes mode, which manifests as a - # failure of e2e/tests/02.02_migrations_get_streamed_to_satellite.lux. + # failure of packages/e2e/tests/02.02_migrations_get_streamed_to_satellite.lux. {:ok, _slot_name} <- Client.create_main_slot(repl_conn, main_slot), {:ok, _slot_name, main_slot_lsn} <- Client.create_temporary_slot(repl_conn, main_slot, tmp_slot), diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 1563e109ba..98cbc04484 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,5 +1,5 @@ packages: - - 'e2e/satellite_client' - 'examples/starter' - 'generator' - 'packages/*' + - 'packages/e2e/satellite_client'