historiographer 4.4.2 → 4.4.4

data/spec/db/migrate/20250826000001_create_test_user_histories.rb

@@ -0,0 +1,18 @@
+class CreateTestUserHistories < ActiveRecord::Migration[7.0]
+  def change
+    create_table :test_user_histories do |t|
+      t.integer :test_user_id, null: false
+      t.string :name
+      t.timestamps
+      t.datetime :history_started_at, null: false
+      t.datetime :history_ended_at
+      t.integer :history_user_id
+      t.string :snapshot_id
+      
+      t.index :test_user_id
+      t.index :history_started_at
+      t.index :history_ended_at
+      t.index :snapshot_id
+    end
+  end
+end

data/spec/db/migrate/20250826000002_create_test_websites.rb

@@ -0,0 +1,9 @@
+class CreateTestWebsites < ActiveRecord::Migration[7.0]
+  def change
+    create_table :test_websites do |t|
+      t.string :name
+      t.integer :user_id
+      t.timestamps
+    end
+  end
+end

data/spec/db/migrate/20250826000003_create_test_website_histories.rb

@@ -0,0 +1,19 @@
+class CreateTestWebsiteHistories < ActiveRecord::Migration[7.0]
+  def change
+    create_table :test_website_histories do |t|
+      t.integer :test_website_id, null: false
+      t.string :name
+      t.integer :user_id
+      t.timestamps
+      t.datetime :history_started_at, null: false
+      t.datetime :history_ended_at
+      t.integer :history_user_id
+      t.string :snapshot_id
+      
+      t.index :test_website_id
+      t.index :history_started_at
+      t.index :history_ended_at
+      t.index :snapshot_id
+    end
+  end
+end

data/spec/db/migrate/20250827000000_create_templates.rb

@@ -0,0 +1,9 @@
+class CreateTemplates < ActiveRecord::Migration[7.0]
+  def change
+    create_table :templates do |t|
+      t.string :name, null: false
+      t.text :description
+      t.timestamps
+    end
+  end
+end

data/spec/db/migrate/20250827000001_create_template_histories.rb

@@ -0,0 +1,9 @@
+require 'historiographer/history_migration'
+
+class CreateTemplateHistories < ActiveRecord::Migration[7.0]
+  def change
+    create_table :template_histories do |t|
+      t.histories
+    end
+  end
+end

data/spec/db/migrate/20250827000002_create_websites.rb

@@ -0,0 +1,9 @@
+class CreateWebsites < ActiveRecord::Migration[7.0]
+  def change
+    create_table :websites do |t|
+      t.string :domain, null: false
+      t.references :template, foreign_key: true
+      t.timestamps
+    end
+  end
+end

data/spec/db/migrate/20250827000003_create_website_histories.rb

@@ -0,0 +1,9 @@
+require 'historiographer/history_migration'
+
+class CreateWebsiteHistories < ActiveRecord::Migration[7.0]
+  def change
+    create_table :website_histories do |t|
+      t.histories
+    end
+  end
+end

data/spec/db/migrate/20250827000004_create_template_files.rb

@@ -0,0 +1,15 @@
+class CreateTemplateFiles < ActiveRecord::Migration[7.0]
+  def change
+    create_table :template_files do |t|
+      t.references :template, foreign_key: true, null: false
+      t.string :path, null: false
+      t.text :content
+      t.tsvector :content_tsv
+      t.string :shasum
+      t.integer :file_specification_id
+      t.timestamps
+    end
+
+    add_index :template_files, [:template_id, :path], unique: true
+  end
+end

data/spec/db/migrate/20250827000005_create_template_file_histories.rb

@@ -0,0 +1,9 @@
+require 'historiographer/history_migration'
+
+class CreateTemplateFileHistories < ActiveRecord::Migration[7.0]
+  def change
+    create_table :template_file_histories do |t|
+      t.histories
+    end
+  end
+end

data/spec/db/migrate/20250827000006_create_website_files.rb

@@ -0,0 +1,15 @@
+class CreateWebsiteFiles < ActiveRecord::Migration[7.0]
+  def change
+    create_table :website_files do |t|
+      t.references :website, foreign_key: true, null: false
+      t.string :path, null: false
+      t.text :content
+      t.tsvector :content_tsv
+      t.string :shasum
+      t.integer :file_specification_id
+      t.timestamps
+    end
+
+    add_index :website_files, [:website_id, :path], unique: true
+  end
+end

data/spec/db/migrate/20250827000007_create_website_file_histories.rb

@@ -0,0 +1,9 @@
+require 'historiographer/history_migration'
+
+class CreateWebsiteFileHistories < ActiveRecord::Migration[7.0]
+  def change
+    create_table :website_file_histories do |t|
+      t.histories
+    end
+  end
+end

data/spec/db/migrate/20250827000008_create_code_files_view.rb

@@ -0,0 +1,62 @@
+class CreateCodeFilesView < ActiveRecord::Migration[7.0]
+  def up
+    execute <<-SQL
+      CREATE OR REPLACE VIEW code_files AS
+      WITH merged_files AS (
+        -- Get all website files
+        SELECT 
+          wf.website_id,
+          wf.path,
+          wf.content,
+          wf.content_tsv,
+          wf.shasum,
+          wf.file_specification_id,
+          wf.created_at,
+          wf.updated_at,
+          'WebsiteFile' AS source_type,
+          wf.id AS source_id
+        FROM website_files wf
+        
+        UNION ALL
+        
+        -- Get template files that don't have a matching website file
+        SELECT 
+          w.id AS website_id,
+          tf.path,
+          tf.content,
+          tf.content_tsv,
+          tf.shasum,
+          tf.file_specification_id,
+          tf.created_at,
+          tf.updated_at,
+          'TemplateFile' AS source_type,
+          tf.id AS source_id
+        FROM template_files tf
+        INNER JOIN websites w ON w.template_id = tf.template_id
+        WHERE NOT EXISTS (
+          SELECT 1 
+          FROM website_files wf2 
+          WHERE wf2.website_id = w.id 
+            AND wf2.path = tf.path
+        )
+      )
+      SELECT 
+        website_id,
+        path,
+        content,
+        content_tsv,
+        shasum,
+        file_specification_id,
+        source_type,
+        source_id,
+        created_at,
+        updated_at
+      FROM merged_files
+      ORDER BY website_id, path;
+    SQL
+  end
+
+  def down
+    execute "DROP VIEW IF EXISTS code_files;"
+  end
+end

data/spec/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.1].define(version: 2025_08_25_000000) do
+ActiveRecord::Schema[7.1].define(version: 2025_08_27_000008) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -299,6 +299,66 @@ ActiveRecord::Schema[7.1].define(version: 2025_08_25_000000) do
     t.index ["live_at"], name: "index_silent_posts_on_live_at"
   end
 
+  create_table "template_file_histories", force: :cascade do |t|
+    t.integer "template_file_id", null: false
+    t.integer "template_id", null: false
+    t.string "path", null: false
+    t.text "content"
+    t.tsvector "content_tsv"
+    t.string "shasum"
+    t.integer "file_specification_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.datetime "history_started_at", null: false
+    t.datetime "history_ended_at"
+    t.integer "history_user_id"
+    t.string "snapshot_id"
+    t.index ["history_ended_at"], name: "index_template_file_histories_on_history_ended_at"
+    t.index ["history_started_at"], name: "index_template_file_histories_on_history_started_at"
+    t.index ["history_user_id"], name: "index_template_file_histories_on_history_user_id"
+    t.index ["snapshot_id"], name: "index_template_file_histories_on_snapshot_id"
+    t.index ["template_file_id"], name: "index_template_file_histories_on_template_file_id"
+    t.index ["template_id", "path"], name: "index_template_file_histories_on_template_id_and_path"
+    t.index ["template_id"], name: "index_template_file_histories_on_template_id"
+  end
+
+  create_table "template_files", force: :cascade do |t|
+    t.bigint "template_id", null: false
+    t.string "path", null: false
+    t.text "content"
+    t.tsvector "content_tsv"
+    t.string "shasum"
+    t.integer "file_specification_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["template_id", "path"], name: "index_template_files_on_template_id_and_path", unique: true
+    t.index ["template_id"], name: "index_template_files_on_template_id"
+  end
+
+  create_table "template_histories", force: :cascade do |t|
+    t.integer "template_id", null: false
+    t.string "name", null: false
+    t.text "description"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.datetime "history_started_at", null: false
+    t.datetime "history_ended_at"
+    t.integer "history_user_id"
+    t.string "snapshot_id"
+    t.index ["history_ended_at"], name: "index_template_histories_on_history_ended_at"
+    t.index ["history_started_at"], name: "index_template_histories_on_history_started_at"
+    t.index ["history_user_id"], name: "index_template_histories_on_history_user_id"
+    t.index ["snapshot_id"], name: "index_template_histories_on_snapshot_id"
+    t.index ["template_id"], name: "index_template_histories_on_template_id"
+  end
+
+  create_table "templates", force: :cascade do |t|
+    t.string "name", null: false
+    t.text "description"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "test_article_histories", force: :cascade do |t|
     t.integer "test_article_id", null: false
     t.string "title"
@@ -345,6 +405,50 @@ ActiveRecord::Schema[7.1].define(version: 2025_08_25_000000) do
     t.index ["test_category_id"], name: "index_test_category_histories_on_test_category_id"
   end
 
+  create_table "test_user_histories", force: :cascade do |t|
+    t.integer "test_user_id", null: false
+    t.string "name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.datetime "history_started_at", null: false
+    t.datetime "history_ended_at"
+    t.integer "history_user_id"
+    t.string "snapshot_id"
+    t.index ["history_ended_at"], name: "index_test_user_histories_on_history_ended_at"
+    t.index ["history_started_at"], name: "index_test_user_histories_on_history_started_at"
+    t.index ["snapshot_id"], name: "index_test_user_histories_on_snapshot_id"
+    t.index ["test_user_id"], name: "index_test_user_histories_on_test_user_id"
+  end
+
+  create_table "test_users", force: :cascade do |t|
+    t.string "name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  create_table "test_website_histories", force: :cascade do |t|
+    t.integer "test_website_id", null: false
+    t.string "name"
+    t.integer "user_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.datetime "history_started_at", null: false
+    t.datetime "history_ended_at"
+    t.integer "history_user_id"
+    t.string "snapshot_id"
+    t.index ["history_ended_at"], name: "index_test_website_histories_on_history_ended_at"
+    t.index ["history_started_at"], name: "index_test_website_histories_on_history_started_at"
+    t.index ["snapshot_id"], name: "index_test_website_histories_on_snapshot_id"
+    t.index ["test_website_id"], name: "index_test_website_histories_on_test_website_id"
+  end
+
+  create_table "test_websites", force: :cascade do |t|
+    t.string "name"
+    t.integer "user_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "thing_with_compound_index_histories", force: :cascade do |t|
     t.integer "thing_with_compound_index_id", null: false
     t.string "key"
@@ -375,4 +479,69 @@ ActiveRecord::Schema[7.1].define(version: 2025_08_25_000000) do
     t.string "name"
   end
 
+  create_table "website_file_histories", force: :cascade do |t|
+    t.integer "website_file_id", null: false
+    t.integer "website_id", null: false
+    t.string "path", null: false
+    t.text "content"
+    t.tsvector "content_tsv"
+    t.string "shasum"
+    t.integer "file_specification_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.datetime "history_started_at", null: false
+    t.datetime "history_ended_at"
+    t.integer "history_user_id"
+    t.string "snapshot_id"
+    t.index ["history_ended_at"], name: "index_website_file_histories_on_history_ended_at"
+    t.index ["history_started_at"], name: "index_website_file_histories_on_history_started_at"
+    t.index ["history_user_id"], name: "index_website_file_histories_on_history_user_id"
+    t.index ["snapshot_id"], name: "index_website_file_histories_on_snapshot_id"
+    t.index ["website_file_id"], name: "index_website_file_histories_on_website_file_id"
+    t.index ["website_id", "path"], name: "index_website_file_histories_on_website_id_and_path"
+    t.index ["website_id"], name: "index_website_file_histories_on_website_id"
+  end
+
+  create_table "website_files", force: :cascade do |t|
+    t.bigint "website_id", null: false
+    t.string "path", null: false
+    t.text "content"
+    t.tsvector "content_tsv"
+    t.string "shasum"
+    t.integer "file_specification_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["website_id", "path"], name: "index_website_files_on_website_id_and_path", unique: true
+    t.index ["website_id"], name: "index_website_files_on_website_id"
+  end
+
+  create_table "website_histories", force: :cascade do |t|
+    t.integer "website_id", null: false
+    t.string "domain", null: false
+    t.integer "template_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.datetime "history_started_at", null: false
+    t.datetime "history_ended_at"
+    t.integer "history_user_id"
+    t.string "snapshot_id"
+    t.index ["history_ended_at"], name: "index_website_histories_on_history_ended_at"
+    t.index ["history_started_at"], name: "index_website_histories_on_history_started_at"
+    t.index ["history_user_id"], name: "index_website_histories_on_history_user_id"
+    t.index ["snapshot_id"], name: "index_website_histories_on_snapshot_id"
+    t.index ["template_id"], name: "index_website_histories_on_template_id"
+    t.index ["website_id"], name: "index_website_histories_on_website_id"
+  end
+
+  create_table "websites", force: :cascade do |t|
+    t.string "domain", null: false
+    t.bigint "template_id"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+    t.index ["template_id"], name: "index_websites_on_template_id"
+  end
+
+  add_foreign_key "template_files", "templates"
+  add_foreign_key "website_files", "websites"
+  add_foreign_key "websites", "templates"
 end

data/spec/examples.txt

@@ -0,0 +1,71 @@
+example_id                                                         | status | run_time        |
+------------------------------------------------------------------ | ------ | --------------- |
+./spec/historiographer_spec.rb[1:1:1]                              | passed | 0.06528 seconds |
+./spec/historiographer_spec.rb[1:1:2]                              | passed | 0.06876 seconds |
+./spec/historiographer_spec.rb[1:1:3]                              | passed | 0.06676 seconds |
+./spec/historiographer_spec.rb[1:2:1]                              | passed | 0.07069 seconds |
+./spec/historiographer_spec.rb[1:2:2]                              | passed | 0.05746 seconds |
+./spec/historiographer_spec.rb[1:2:3:1:1]                          | passed | 0.09942 seconds |
+./spec/historiographer_spec.rb[1:2:3:1:2]                          | passed | 0.09532 seconds |
+./spec/historiographer_spec.rb[1:2:3:2:1]                          | passed | 0.0666 seconds  |
+./spec/historiographer_spec.rb[1:2:3:2:2]                          | passed | 0.09223 seconds |
+./spec/historiographer_spec.rb[1:2:3:2:3]                          | passed | 0.16142 seconds |
+./spec/historiographer_spec.rb[1:2:3:3:1]                          | passed | 0.09003 seconds |
+./spec/historiographer_spec.rb[1:2:3:3:2]                          | passed | 0.0727 seconds  |
+./spec/historiographer_spec.rb[1:2:4:1]                            | passed | 0.07277 seconds |
+./spec/historiographer_spec.rb[1:2:4:2]                            | passed | 0.07295 seconds |
+./spec/historiographer_spec.rb[1:2:4:3]                            | passed | 0.06818 seconds |
+./spec/historiographer_spec.rb[1:2:5:1]                            | passed | 0.07794 seconds |
+./spec/historiographer_spec.rb[1:2:5:2]                            | passed | 0.06574 seconds |
+./spec/historiographer_spec.rb[1:2:5:3]                            | passed | 0.07246 seconds |
+./spec/historiographer_spec.rb[1:2:6]                              | passed | 0.05671 seconds |
+./spec/historiographer_spec.rb[1:2:7]                              | passed | 0.06192 seconds |
+./spec/historiographer_spec.rb[1:2:8]                              | passed | 0.06312 seconds |
+./spec/historiographer_spec.rb[1:3:1]                              | passed | 0.08252 seconds |
+./spec/historiographer_spec.rb[1:4:1]                              | passed | 0.08901 seconds |
+./spec/historiographer_spec.rb[1:5:1]                              | passed | 0.06204 seconds |
+./spec/historiographer_spec.rb[1:5:2]                              | passed | 0.06017 seconds |
+./spec/historiographer_spec.rb[1:6:1]                              | passed | 0.06542 seconds |
+./spec/historiographer_spec.rb[1:6:2]                              | passed | 0.07392 seconds |
+./spec/historiographer_spec.rb[1:7:1]                              | passed | 0.08007 seconds |
+./spec/historiographer_spec.rb[1:7:2]                              | passed | 0.06545 seconds |
+./spec/historiographer_spec.rb[1:7:3]                              | passed | 0.06212 seconds |
+./spec/historiographer_spec.rb[1:7:4]                              | passed | 0.06293 seconds |
+./spec/historiographer_spec.rb[1:7:5]                              | passed | 0.06288 seconds |
+./spec/historiographer_spec.rb[1:8:1]                              | passed | 0.062 seconds   |
+./spec/historiographer_spec.rb[1:9:1]                              | passed | 0.09362 seconds |
+./spec/historiographer_spec.rb[1:10:1]                             | passed | 0.05997 seconds |
+./spec/historiographer_spec.rb[1:11:1]                             | passed | 0.07282 seconds |
+./spec/historiographer_spec.rb[1:11:2]                             | passed | 0.06606 seconds |
+./spec/historiographer_spec.rb[1:11:3]                             | passed | 0.06809 seconds |
+./spec/historiographer_spec.rb[1:11:4]                             | passed | 0.07018 seconds |
+./spec/historiographer_spec.rb[1:12:1]                             | passed | 0.08426 seconds |
+./spec/historiographer_spec.rb[1:12:2]                             | passed | 0.06852 seconds |
+./spec/historiographer_spec.rb[1:12:3]                             | passed | 0.10016 seconds |
+./spec/historiographer_spec.rb[1:12:4]                             | passed | 0.09182 seconds |
+./spec/historiographer_spec.rb[1:12:5]                             | passed | 0.08378 seconds |
+./spec/historiographer_spec.rb[1:12:6]                             | passed | 0.11921 seconds |
+./spec/historiographer_spec.rb[1:13:1]                             | passed | 0.11958 seconds |
+./spec/historiographer_spec.rb[1:14:1]                             | passed | 0.05717 seconds |
+./spec/historiographer_spec.rb[1:14:2]                             | passed | 0.07805 seconds |
+./spec/historiographer_spec.rb[1:14:3]                             | passed | 0.06426 seconds |
+./spec/historiographer_spec.rb[1:14:4]                             | passed | 0.06178 seconds |
+./spec/historiographer_spec.rb[1:15:1]                             | passed | 0.06755 seconds |
+./spec/historiographer_spec.rb[1:15:2]                             | passed | 0.08706 seconds |
+./spec/historiographer_spec.rb[1:16:1]                             | passed | 0.06589 seconds |
+./spec/historiographer_spec.rb[1:16:2]                             | passed | 0.04756 seconds |
+./spec/historiographer_spec.rb[1:16:3]                             | passed | 0.04635 seconds |
+./spec/historiographer_spec.rb[1:16:4]                             | passed | 0.07578 seconds |
+./spec/historiographer_spec.rb[1:17:1:1]                           | passed | 0.06365 seconds |
+./spec/historiographer_spec.rb[1:17:1:2]                           | passed | 0.10348 seconds |
+./spec/historiographer_spec.rb[1:17:2:1]                           | passed | 0.06393 seconds |
+./spec/integration/historiographer_safe_integration_spec.rb[1:1:1] | passed | 0.06664 seconds |
+./spec/integration/historiographer_safe_integration_spec.rb[1:1:2] | passed | 0.07357 seconds |
+./spec/integration/historiographer_safe_integration_spec.rb[1:1:3] | passed | 0.05953 seconds |
+./spec/view_backed_model_spec.rb[1:1:1]                            | passed | 0.06878 seconds |
+./spec/view_backed_model_spec.rb[1:1:2]                            | passed | 0.08949 seconds |
+./spec/view_backed_model_spec.rb[1:1:3:1]                          | passed | 0.11878 seconds |
+./spec/view_backed_model_spec.rb[1:1:3:2]                          | passed | 0.1122 seconds  |
+./spec/view_backed_model_spec.rb[1:1:3:3]                          | passed | 0.10204 seconds |
+./spec/view_backed_model_spec.rb[1:1:3:4]                          | passed | 0.11072 seconds |
+./spec/view_backed_model_spec.rb[1:2:1]                            | passed | 0.07444 seconds |

data/spec/historiographer_spec.rb

@@ -1071,4 +1071,168 @@ describe Historiographer do
       expect { article.snapshot }.to_not raise_error
     end
   end
+
+  describe 'Foreign key handling' do
+    before(:all) do
+      # Ensure test tables exist
+      unless ActiveRecord::Base.connection.table_exists?(:test_users)
+        ActiveRecord::Base.connection.create_table :test_users do |t|
+          t.string :name
+          t.timestamps
+        end
+      end
+      
+      unless ActiveRecord::Base.connection.table_exists?(:test_user_histories)
+        ActiveRecord::Base.connection.create_table :test_user_histories do |t|
+          t.integer :test_user_id, null: false
+          t.string :name
+          t.timestamps
+          t.datetime :history_started_at, null: false
+          t.datetime :history_ended_at
+          t.integer :history_user_id
+          t.string :snapshot_id
+          
+          t.index :test_user_id
+          t.index :history_started_at
+          t.index :history_ended_at
+          t.index :snapshot_id
+        end
+      end
+      
+      unless ActiveRecord::Base.connection.table_exists?(:test_websites)
+        ActiveRecord::Base.connection.create_table :test_websites do |t|
+          t.string :name
+          t.integer :user_id
+          t.timestamps
+        end
+      end
+      
+      unless ActiveRecord::Base.connection.table_exists?(:test_website_histories)
+        ActiveRecord::Base.connection.create_table :test_website_histories do |t|
+          t.integer :test_website_id, null: false
+          t.string :name
+          t.integer :user_id
+          t.timestamps
+          t.datetime :history_started_at, null: false
+          t.datetime :history_ended_at
+          t.integer :history_user_id
+          t.string :snapshot_id
+          
+          t.index :test_website_id
+          t.index :history_started_at
+          t.index :history_ended_at
+          t.index :snapshot_id
+        end
+      end
+    end
+    
+    describe 'belongs_to associations on history models' do
+      it 'does not raise error about wrong column when accessing belongs_to associations' do
+        # This is the core issue: when a history model has a belongs_to association,
+        # it should not use the foreign key as the primary key for lookups
+        
+        # Create a user
+        user = TestUser.create!(name: 'Test User', history_user_id: 1)
+        
+        # Create a website belonging to the user
+        website = TestWebsite.create!(
+          name: 'Test Website',
+          user_id: user.id,
+          history_user_id: 1
+        )
+        
+        # Get the website history
+        website_history = TestWebsiteHistory.last
+        
+        # The history should have the correct user_id
+        expect(website_history.user_id).to eq(user.id)
+        
+        # The belongs_to association should work without errors
+        # Previously this would fail with "column users.user_id does not exist"
+        # because it was using primary_key: :user_id instead of the default :id
+        expect { website_history.user }.not_to raise_error
+      end
+      
+      it 'allows direct creation of history records with foreign keys' do
+        user = TestUser.create!(name: 'Another User', history_user_id: 1)
+        
+        # Create history attributes like in the original error case
+        attrs = {
+          "name" => "test.example",
+          "user_id" => user.id,
+          "created_at" => Time.now,
+          "updated_at" => Time.now,
+          "test_website_id" => 100,
+          "history_started_at" => Time.now,
+          "history_user_id" => 1,
+          "snapshot_id" => SecureRandom.uuid
+        }
+        
+        # This should not raise an error about test_users.user_id not existing
+        # The original bug was that it would look for test_users.user_id instead of test_users.id
+        expect { TestWebsiteHistory.create!(attrs) }.not_to raise_error
+        
+        history = TestWebsiteHistory.last
+        expect(history.user_id).to eq(user.id)
+      end
+    end
+    
+    describe 'snapshot associations with history models' do
+      it 'correctly filters associations by snapshot_id when using custom association methods' do
+        # First create regular history records
+        user = TestUser.create!(name: 'User One', history_user_id: 1)
+        website = TestWebsite.create!(
+          name: 'Website One',
+          user_id: user.id,
+          history_user_id: 1
+        )
+        
+        # Check that regular histories were created
+        expect(TestUserHistory.count).to eq(1)
+        expect(TestWebsiteHistory.count).to eq(1)
+        
+        # Now create snapshot histories directly (simulating what snapshot would do)
+        snapshot_id = SecureRandom.uuid
+        
+        # Create user history with snapshot
+        user_snapshot = TestUserHistory.create!(
+          test_user_id: user.id,
+          name: user.name,
+          created_at: user.created_at,
+          updated_at: user.updated_at,
+          history_started_at: Time.now,
+          history_user_id: 1,
+          snapshot_id: snapshot_id
+        )
+        
+        # Create website history with snapshot
+        website_snapshot = TestWebsiteHistory.create!(
+          test_website_id: website.id,
+          name: website.name,
+          user_id: user.id,
+          created_at: website.created_at,
+          updated_at: website.updated_at,
+          history_started_at: Time.now,
+          history_user_id: 1,
+          snapshot_id: snapshot_id
+        )
+        
+        # Now test that the association filtering works
+        # The website history's user association should find the user history with the same snapshot_id
+        user_from_association = website_snapshot.user
+        
+        # Since user association points to history when snapshots are involved,
+        # it should return the TestUserHistory with matching snapshot_id
+        if user_from_association.is_a?(TestUserHistory)
+          expect(user_from_association.snapshot_id).to eq(snapshot_id)
+          expect(user_from_association.name).to eq('User One')
+        else
+          # If it returns the regular TestUser (non-history), that's also acceptable
+          # as long as it doesn't error
+          expect(user_from_association).to be_a(TestUser)
+          expect(user_from_association.name).to eq('User One')
+        end
+      end
+    end
+  end
 end