Skip to content

A platform for community discussion. Free, open, simple.

FIX: Make data table names unique case-insensitively

Régis Hanol71861ef9eaae
diff --git a/db/structure.sql b/db/structure.sql
index ba46ba6018f..62d3dc8b3f0 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -19997,10 +19997,10 @@ CREATE INDEX idx_dwf_data_tables_on_created_by_id ON public.discourse_workflows_
--
--- Name: idx_dwf_data_tables_on_name; Type: INDEX; Schema: public; Owner: -
+-- Name: idx_dwf_data_tables_on_lower_name; Type: INDEX; Schema: public; Owner: -
--
-CREATE UNIQUE INDEX idx_dwf_data_tables_on_name ON public.discourse_workflows_data_tables USING btree (name);
+CREATE UNIQUE INDEX idx_dwf_data_tables_on_lower_name ON public.discourse_workflows_data_tables USING btree (lower((name)::text));
--
@@ -26091,6 +26091,7 @@ SET search_path TO "$user", public;
INSERT INTO "schema_migrations" (version) VALUES
('20261019105124'),
+('20261019104439'),
('20261018172000'),
('20261015175355'),
('20261015175340'),
diff --git a/plugins/discourse-workflows/app/models/discourse_workflows/data_table.rb b/plugins/discourse-workflows/app/models/discourse_workflows/data_table.rb
index b68e3368626..5559d662293 100644
--- a/plugins/discourse-workflows/app/models/discourse_workflows/data_table.rb
+++ b/plugins/discourse-workflows/app/models/discourse_workflows/data_table.rb
@@ -10,7 +10,9 @@ module DiscourseWorkflows
validates :name,
presence: true,
- uniqueness: true,
+ uniqueness: {
+ case_sensitive: false,
+ },
length: {
maximum: 100,
},
@@ -18,6 +20,8 @@ module DiscourseWorkflows
with: /\A[a-zA-Z_][a-zA-Z0-9_ ]*\z/,
}
+ scope :named, ->(names) { where("LOWER(name) IN (?)", Array(names).map(&:downcase)) }
+
before_destroy :drop_storage_table
# Postgres can't reorder physical columns, so the display order lives in `column_order`.
@@ -73,6 +77,6 @@ end
# Indexes
#
# idx_dwf_data_tables_on_created_by_id (created_by_id)
-# idx_dwf_data_tables_on_name (name) UNIQUE
+# idx_dwf_data_tables_on_lower_name (lower((name)::text)) UNIQUE
# idx_dwf_data_tables_on_updated_by_id (updated_by_id)
#
diff --git a/plugins/discourse-workflows/db/migrate/20261019104439_add_case_insensitive_name_index_to_discourse_workflows_data_tables.rb b/plugins/discourse-workflows/db/migrate/20261019104439_add_case_insensitive_name_index_to_discourse_workflows_data_tables.rb
new file mode 100644
index 00000000000..6fee612b4b2
--- /dev/null
+++ b/plugins/discourse-workflows/db/migrate/20261019104439_add_case_insensitive_name_index_to_discourse_workflows_data_tables.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class AddCaseInsensitiveNameIndexToDiscourseWorkflowsDataTables < ActiveRecord::Migration[8.0]
+ def up
+ execute <<~SQL
+ DO $$
+ DECLARE
+ duplicate RECORD;
+ suffix BIGINT;
+ candidate TEXT;
+ BEGIN
+ FOR duplicate IN
+ SELECT id, name FROM (
+ SELECT id, name, ROW_NUMBER() OVER (PARTITION BY LOWER(name) ORDER BY id) AS position
+ FROM discourse_workflows_data_tables
+ ) AS ranked
+ WHERE position > 1
+ ORDER BY id
+ LOOP
+ suffix := duplicate.id;
+
+ LOOP
+ candidate := LEFT(duplicate.name, 100 - LENGTH(suffix::text) - 1) || '_' || suffix;
+ EXIT WHEN NOT EXISTS (
+ SELECT 1 FROM discourse_workflows_data_tables WHERE LOWER(name) = LOWER(candidate)
+ );
+ suffix := suffix + 1;
+ END LOOP;
+
+ UPDATE discourse_workflows_data_tables SET name = candidate WHERE id = duplicate.id;
+ END LOOP;
+ END $$;
+ SQL
+
+ remove_index :discourse_workflows_data_tables, name: "idx_dwf_data_tables_on_name"
+ add_index :discourse_workflows_data_tables,
+ "LOWER(name)",
+ unique: true,
+ name: "idx_dwf_data_tables_on_lower_name"
+ end
+
+ def down
+ remove_index :discourse_workflows_data_tables, name: "idx_dwf_data_tables_on_lower_name"
+ add_index :discourse_workflows_data_tables,
+ :name,
+ unique: true,
+ name: "idx_dwf_data_tables_on_name"
+ end
+end
diff --git a/plugins/discourse-workflows/spec/migrations/add_case_insensitive_name_index_to_discourse_workflows_data_tables_spec.rb b/plugins/discourse-workflows/spec/migrations/add_case_insensitive_name_index_to_discourse_workflows_data_tables_spec.rb
new file mode 100644
index 00000000000..b029069829f
--- /dev/null
+++ b/plugins/discourse-workflows/spec/migrations/add_case_insensitive_name_index_to_discourse_workflows_data_tables_spec.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require Rails.root.join(
+ "plugins/discourse-workflows/db/migrate/20261019104439_add_case_insensitive_name_index_to_discourse_workflows_data_tables.rb",
+ )
+
+RSpec.describe AddCaseInsensitiveNameIndexToDiscourseWorkflowsDataTables do
+ TABLE = "discourse_workflows_data_tables"
+ LOWER_NAME_INDEX = "idx_dwf_data_tables_on_lower_name"
+
+ before do
+ @original_verbose = ActiveRecord::Migration.verbose
+ ActiveRecord::Migration.verbose = false
+ described_class.new.down
+ end
+
+ after { ActiveRecord::Migration.verbose = @original_verbose }
+
+ def insert(name)
+ DB.query_single(
+ "INSERT INTO #{TABLE} (name, created_at, updated_at) VALUES (:name, NOW(), NOW()) RETURNING id",
+ name:,
+ ).first
+ end
+
+ it "renames later case duplicates after their id and enforces case-insensitive uniqueness" do
+ original = insert("Contacts")
+ duplicate = insert("contacts")
+ insert("orders")
+
+ described_class.new.up
+
+ expect(DB.query_single("SELECT name FROM #{TABLE} ORDER BY id")).to eq(
+ ["Contacts", "contacts_#{duplicate}", "orders"],
+ )
+ expect(DB.query_single("SELECT id FROM #{TABLE} WHERE name = 'Contacts'")).to eq([original])
+ expect(ActiveRecord::Base.connection.indexes(TABLE).map(&:name)).to include(LOWER_NAME_INDEX)
+ expect { insert("ORDERS") }.to raise_error(PG::UniqueViolation)
+ end
+
+ it "skips generated names already taken by another table in any case" do
+ insert("Contacts")
+ duplicate = insert("contacts")
+ insert("CONTACTS_#{duplicate}")
+
+ described_class.new.up
+
+ expect(DB.query_single("SELECT name FROM #{TABLE} WHERE id = :id", id: duplicate)).to eq(
+ ["contacts_#{duplicate + 1}"],
+ )
+ expect(ActiveRecord::Base.connection.indexes(TABLE).map(&:name)).to include(LOWER_NAME_INDEX)
+ end
+end
diff --git a/plugins/discourse-workflows/spec/models/discourse_workflows/data_table_spec.rb b/plugins/discourse-workflows/spec/models/discourse_workflows/data_table_spec.rb
index c69fb40e02e..4614de3a735 100644
--- a/plugins/discourse-workflows/spec/models/discourse_workflows/data_table_spec.rb
+++ b/plugins/discourse-workflows/spec/models/discourse_workflows/data_table_spec.rb
@@ -11,6 +11,8 @@ RSpec.describe DiscourseWorkflows::DataTable do
)
end
+ it { is_expected.to validate_uniqueness_of(:name).case_insensitive }
+
describe "#columns" do
it "orders user columns by column_order between id and the timestamps" do
DiscourseWorkflows::DataTables::Facade.new(data_table).add_column!("notes", "string")