Add a check for column default expressions in the electrify() call

components/electric/lib/electric/postgres/extension/functions/electrify.sql.eex

@@ -29,6 +29,7 @@ BEGIN
         RAISE NOTICE 'Electrify table %', _quoted_name;
 
         PERFORM <%= @schema %>.__validate_table_column_types(_quoted_name);
+        PERFORM <%= @schema %>.__validate_table_column_defaults(_quoted_name);
 
         -- insert the required ddl into the migrations table
         SELECT <%= @schema %>.ddlgen_create(_oid) INTO _create_sql;

components/electric/lib/electric/postgres/extension/functions/validate_table_column_defaults.sql.eex

@@ -0,0 +1,27 @@
+-- This function validates each column of the table that's being electrified
+-- and aborts electrification if any column has DEFAULT expression.
+
+CREATE OR REPLACE FUNCTION <%= @schema %>.__validate_table_column_defaults(table_name text)
+RETURNS VOID AS $function$
+DECLARE
+    _col_name text;
+    _col_has_default boolean;
+    _invalid_cols text[];
+BEGIN
+    FOR _col_name, _col_has_default IN
+        SELECT attname, atthasdef
+            FROM pg_attribute
+            WHERE attrelid = table_name::regclass AND attnum > 0 AND NOT attisdropped
+            ORDER BY attnum
+    LOOP
+        IF _col_has_default THEN
+            _invalid_cols = array_append(_invalid_cols, format('%I', _col_name));
+        END IF;
+    END LOOP;
+
+    IF _invalid_cols IS NOT NULL THEN
+        RAISE EXCEPTION E'Cannot electrify "%" because some of its columns have DEFAULT expression which is not currently supported by Electric:\n  %',
+                        table_name, array_to_string(_invalid_cols, E'\n  ');
+    END IF;
+END;
+$function$ LANGUAGE PLPGSQL;

components/electric/lib/electric/postgres/extension/functions/validate_table_column_types.sql.eex

@@ -1,3 +1,6 @@
+-- This function validates the type of each column of the table that's being electrified,
+-- to check if the type is supported by Electric.
+
 <%
   valid_column_types =
     Electric.Postgres.supported_types()
@@ -25,7 +28,7 @@ BEGIN
            -- We only support unsized varchar type
            OR ('varchar' IN (<%= valid_column_types %>) AND _col_type = 'varchar' AND _col_typmod <> -1)
         THEN
-            _invalid_cols = array_append(_invalid_cols, format('"%s" %s', _col_name, _col_type_pretty));
+            _invalid_cols = array_append(_invalid_cols, format('%I %s', _col_name, _col_type_pretty));
         END IF;
     END LOOP;
 

components/electric/test/electric/postgres/extension/electrify_test.exs

@@ -16,7 +16,7 @@ defmodule Electric.Postgres.Extension.ElectrifyTest do
   end
 
   test_tx "inserts a row into the electrified table", fn conn ->
-    sql = "CREATE TABLE buttercup (id uuid PRIMARY KEY DEFAULT uuid_generate_v4());"
+    sql = "CREATE TABLE buttercup (id uuid PRIMARY KEY);"
     {:ok, _cols, _rows} = :epgsql.squery(conn, sql)
 
     sql = "CALL electric.electrify('buttercup');"
@@ -32,7 +32,7 @@ defmodule Electric.Postgres.Extension.ElectrifyTest do
   test_tx "inserts the DDL for the table into the migration table", fn conn ->
     sql = """
     CREATE TABLE buttercup (
-      id uuid PRIMARY KEY DEFAULT uuid_generate_v4(),
+      id uuid PRIMARY KEY,
       value text,
       secret integer
     );
@@ -56,7 +56,7 @@ defmodule Electric.Postgres.Extension.ElectrifyTest do
   test_tx "duplicate call does not raise", fn conn ->
     sql = """
     CREATE TABLE buttercup (
-      id uuid PRIMARY KEY DEFAULT uuid_generate_v4(),
+      id uuid PRIMARY KEY,
       value text,
       secret integer
     );
@@ -73,10 +73,10 @@ defmodule Electric.Postgres.Extension.ElectrifyTest do
   end
 
   test_tx "handles quoted table names", fn conn ->
-    sql = "CREATE TABLE \"la la daisy\" (id uuid PRIMARY KEY DEFAULT uuid_generate_v4());"
+    sql = "CREATE TABLE \"la la daisy\" (id uuid PRIMARY KEY);"
     {:ok, _cols, _rows} = :epgsql.squery(conn, sql)
 
-    sql = "CREATE TABLE \"la la buttercup\" (id uuid PRIMARY KEY DEFAULT uuid_generate_v4());"
+    sql = "CREATE TABLE \"la la buttercup\" (id uuid PRIMARY KEY);"
     {:ok, _cols, _rows} = :epgsql.squery(conn, sql)
 
     sql = "CALL electric.electrify('public', 'la la daisy');"
@@ -94,7 +94,7 @@ defmodule Electric.Postgres.Extension.ElectrifyTest do
   end
 
   test_tx "allows for namespaced table names", fn conn ->
-    sql = "CREATE TABLE daisy (id uuid PRIMARY KEY DEFAULT uuid_generate_v4());"
+    sql = "CREATE TABLE daisy (id uuid PRIMARY KEY);"
     {:ok, _cols, _rows} = :epgsql.squery(conn, sql)
 
     sql = "CALL electric.electrify('public.daisy');"
@@ -121,7 +121,7 @@ defmodule Electric.Postgres.Extension.ElectrifyTest do
 
     sql = """
     CREATE TABLE balloons.buttercup (
-      id uuid PRIMARY KEY DEFAULT uuid_generate_v4(),
+      id uuid PRIMARY KEY,
       value text,
       secret integer
     );
@@ -165,7 +165,7 @@ defmodule Electric.Postgres.Extension.ElectrifyTest do
   test_tx "adds the electrified table to the publication", fn conn ->
     assert published_tables(conn) == []
 
-    sql = "CREATE TABLE buttercup (id uuid PRIMARY KEY DEFAULT uuid_generate_v4(), value text);"
+    sql = "CREATE TABLE buttercup (id uuid PRIMARY KEY, value text);"
 
     {:ok, _cols, _rows} = :epgsql.squery(conn, sql)
 
@@ -183,7 +183,7 @@ defmodule Electric.Postgres.Extension.ElectrifyTest do
 
     sql = """
     CREATE TABLE buttercup (
-      id uuid PRIMARY KEY DEFAULT uuid_generate_v4(),
+      id uuid PRIMARY KEY,
       value text,
       secret integer
     );

components/electric/test/electric/postgres/extension_test.exs

@@ -456,11 +456,11 @@ defmodule Electric.Postgres.ExtensionTest do
                  id UUID PRIMARY KEY,
                  c1 CHARACTER,
                  c2 CHARACTER(11),
-                 c3 VARCHAR(11),
+                 "C3" VARCHAR(11),
                  num8a INT8,
                  num8b BIGINT,
                  real4a FLOAT4,
-                 real4b REAL,
+                 "Real4b" REAL,
                  created_at TIMETZ
                );
                CALL electric.electrify('public.t1');
@@ -469,14 +469,14 @@ defmodule Electric.Postgres.ExtensionTest do
       assert error_msg ==
                """
                Cannot electrify "public.t1" because some of its columns have types not supported by Electric:
-                 "c1" character(1)
-                 "c2" character(11)
-                 "c3" character varying(11)
-                 "num8a" bigint
-                 "num8b" bigint
-                 "real4a" real
-                 "real4b" real
-                 "created_at" time with time zone
+                 c1 character(1)
+                 c2 character(11)
+                 "C3" character varying(11)
+                 num8a bigint
+                 num8b bigint
+                 real4a real
+                 "Real4b" real
+                 created_at time with time zone
                """
                |> String.trim()
     end
@@ -496,6 +496,31 @@ defmodule Electric.Postgres.ExtensionTest do
       assert {:ok, false} = Extension.electrified?(conn, "daisy")
       assert {:ok, false} = Extension.electrified?(conn, "public", "daisy")
     end
+
+    test_tx "table electrification rejects default column expressions", fn conn ->
+      assert [
+               {:ok, [], []},
+               {:error, {:error, :error, _, :raise_exception, error_msg, _}}
+             ] =
+               :epgsql.squery(conn, """
+               CREATE TABLE public.t1 (
+                 id UUID PRIMARY KEY,
+                 t1 TEXT DEFAULT '',
+                 num INTEGER NOT NULL,
+                 "Ts" TIMESTAMP DEFAULT now(),
+                 name VARCHAR
+               );
+               CALL electric.electrify('public.t1');
+               """)
+
+      assert error_msg ==
+               """
+               Cannot electrify "public.t1" because some of its columns have DEFAULT expression which is not currently supported by Electric:
+                 t1
+                 "Ts"
+               """
+               |> String.trim()
+    end
   end
 
   defp migration_history(conn, after_version \\ nil) do

components/electric/test/electric/replication/shapes/shape_request_test.exs

@@ -39,7 +39,7 @@ defmodule Electric.Replication.Shapes.ShapeRequestTest do
     setup :load_schema
 
     @tag with_sql: """
-         INSERT INTO public.my_entries (content) VALUES ('test content');
+         INSERT INTO public.my_entries (id, content) VALUES (gen_random_uuid(), 'test content');
          """
     test "should be able to fulfill full-table request", %{
       origin: origin,
@@ -84,7 +84,7 @@ defmodule Electric.Replication.Shapes.ShapeRequestTest do
     end
 
     @tag with_sql: """
-         INSERT INTO public.my_entries (content) VALUES ('test content');
+         INSERT INTO public.my_entries (id, content) VALUES (gen_random_uuid(), 'test content');
          """
     test "should not fulfill full-table requests if the table has already been sent", %{
       origin: origin,

components/electric/test/electric/satellite/subscriptions_test.exs

@@ -123,7 +123,10 @@ defmodule Electric.Satellite.SubscriptionsTest do
         assert [%SatOpInsert{row_data: %{values: [_, "John"]}}] = received[request_id]
 
         {:ok, 1} =
-          :epgsql.equery(pg_conn, "INSERT INTO public.my_entries (content) VALUES ($1)", ["WRONG"])
+          :epgsql.equery(pg_conn, "INSERT INTO public.my_entries (id, content) VALUES ($1, $2)", [
+            uuid4(),
+            "WRONG"
+          ])
 
         {:ok, 1} =
           :epgsql.equery(pg_conn, "INSERT INTO public.users (id, name) VALUES ($1, $2)", [
@@ -196,7 +199,8 @@ defmodule Electric.Satellite.SubscriptionsTest do
         assert [] = received[request_id2]
 
         {:ok, 1} =
-          :epgsql.equery(pg_conn, "INSERT INTO public.my_entries (content) VALUES ($1)", [
+          :epgsql.equery(pg_conn, "INSERT INTO public.my_entries (id, content) VALUES ($1, $2)", [
+            uuid4(),
             "Correct"
           ])
 
@@ -229,8 +233,8 @@ defmodule Electric.Satellite.SubscriptionsTest do
     end
 
     @tag with_sql: """
-         INSERT INTO public.users (id, name) VALUES ('#{uuid4()}', 'John');
-         INSERT INTO public.my_entries (content) VALUES ('Old');
+         INSERT INTO public.users (id, name) VALUES (gen_random_uuid(), 'John');
+         INSERT INTO public.my_entries (id, content) VALUES (gen_random_uuid(), 'Old');
          """
     test "The client can connect and subscribe, and that works with multiple subscriptions",
          %{conn: pg_conn} = ctx do
@@ -282,7 +286,8 @@ defmodule Electric.Satellite.SubscriptionsTest do
         assert [%SatOpInsert{row_data: %{values: [_, "Old", _]}}] = received[request_id2]
 
         {:ok, 1} =
-          :epgsql.equery(pg_conn, "INSERT INTO public.my_entries (content) VALUES ($1)", [
+          :epgsql.equery(pg_conn, "INSERT INTO public.my_entries (id, content) VALUES ($1, $2)", [
+            uuid4(),
             "Correct"
           ])
 

components/electric/test/support/postgres_test_connection.ex

@@ -159,7 +159,7 @@ defmodule Electric.Postgres.TestConnection do
     {:ok, [], []} =
       :epgsql.squery(conn, """
       CREATE TABLE public.my_entries (
-        id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
+        id UUID PRIMARY KEY,
         content VARCHAR NOT NULL,
         content_b TEXT
       );

e2e/init.sql

@@ -1,11 +1,11 @@
 CREATE TABLE entries (
-  id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
+  id UUID PRIMARY KEY,
   content VARCHAR NOT NULL,
   content_b TEXT
 );
 
 CREATE TABLE owned_entries (
-  id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
+  id UUID PRIMARY KEY,
   electric_user_id TEXT NOT NULL,
   content VARCHAR NOT NULL
 );

e2e/tests/03.04_node_satellite_correctly_updates_serialization_caches.lux

@@ -47,7 +47,7 @@
 [shell pg_1]
     # And insert data which affect the new column
     [invoke log "Insert data into new column"]
-    !INSERT INTO public.items (content, increment) VALUES ('${migration_version_2}/content', '${migration_version_2}/increment');
+    !INSERT INTO public.items (id, content, increment) VALUES ('00000000-0000-0000-0000-000000000001', '${migration_version_2}/content', '${migration_version_2}/increment');
     ?$psql
 
 [invoke log "Verify that pg insert has reached both Satellites"]

e2e/tests/03.05_fresh_node_satellite_receives_all_migrations_during_initial_sync.lux

@@ -20,7 +20,7 @@
     BEGIN;
 
     CREATE TABLE items (
-      id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
+      id UUID PRIMARY KEY,
       content VARCHAR NOT NULL
     );
     -- CALL electric.electrify('public.items');

e2e/tests/03.11_node_satellite_compensations_work.lux

@@ -9,25 +9,18 @@
 # PREPARATION: Set up dependent tables and add a row that will be referenced
 
 [shell pg_1]
+    [invoke migrate_items_table 001]
+
     [local sql=
         """
-        CREATE TABLE public.items (
-            id TEXT PRIMARY KEY,
-            content TEXT NOT NULL,
-            content_text_null TEXT,
-            content_text_null_default TEXT DEFAULT '',
-            intvalue_null integer,
-            intvalue_null_default integer DEFAULT 10
-        );
         CREATE TABLE public.other_items (
             id TEXT PRIMARY KEY,
             content TEXT NOT NULL,
-            item_id TEXT REFERENCES public.items(id)
+            item_id UUID REFERENCES public.items(id)
         );
-        CALL electric.electrify('public.items');
         CALL electric.electrify('public.other_items');
         """]
-    [invoke migrate_pg 11111 $sql]
+    [invoke migrate_pg 002 $sql]
 
 [shell satellite_1]
     ??[rpc] recv: #SatInStartReplicationResp
@@ -39,7 +32,7 @@
 
     """!await db.db.items.create({
       data: {
-        id: "test_id_1",
+        id: "00000000-0000-0000-0000-000000000001",
         content: "hello world"
       }
     })
@@ -53,7 +46,7 @@
 
 [shell pg_1]
     # Concurrently, update and then delete the referenced row on the server
-    !DELETE FROM public.items WHERE id = 'test_id_1';
+    !DELETE FROM public.items WHERE id = '00000000-0000-0000-0000-000000000001';
     ?$psql
 
 [shell satellite_1]
@@ -63,7 +56,7 @@
       data: {
         id: "other_test_id_1",
         content: "",
-        item_id: "test_id_1"
+        item_id: "00000000-0000-0000-0000-000000000001"
       }
     })
     """

e2e/tests/03.13_node_satellite_can_sync_timestamps.lux

@@ -8,9 +8,9 @@
     [local sql=
         """
         CREATE TABLE public.timestamps (
-            id TEXT PRIMARY KEY DEFAULT uuid_generate_v4(),
-            created_at TIMESTAMP NOT NULL DEFAULT now(),
-            updated_at TIMESTAMPTZ NOT NULL DEFAULT now()
+            id TEXT PRIMARY KEY,
+            created_at TIMESTAMP NOT NULL,
+            updated_at TIMESTAMPTZ NOT NULL
         );
         CALL electric.electrify('public.timestamps');
         """]
@@ -23,7 +23,7 @@
     [invoke node_sync_table "timestamps"]
 
 [shell pg_1]
-    !INSERT INTO public.timestamps (id) VALUES ('00000000-0000-0000-0000-000000000001');
+    !INSERT INTO public.timestamps (id, created_at, updated_at) VALUES ('00000000-0000-0000-0000-000000000001', now(), now());
     ??INSERT 0 1
 
 [shell satellite_1]

e2e/tests/03.14_node_satellite_can_sync_dates_and_times.lux

@@ -8,7 +8,7 @@
     [local sql=
         """
         CREATE TABLE public.datetimes (
-            id TEXT PRIMARY KEY DEFAULT uuid_generate_v4(),
+            id TEXT PRIMARY KEY,
             d DATE,
             t TIME
         );

e2e/tests/03.15_node_satellite_can_sync_booleans.lux

@@ -8,7 +8,7 @@
     [local sql=
         """
         CREATE TABLE public.bools (
-            id TEXT PRIMARY KEY DEFAULT uuid_generate_v4(),
+            id TEXT PRIMARY KEY,
             b BOOLEAN
         );
         CALL electric.electrify('public.bools');