Incorporate feedback

Author: MSNexploder

activerecord/CHANGELOG.md

@@ -6,7 +6,7 @@
     ```ruby
     create_table :users do |t|
       t.string :name
-      t.virtual :name_upcased, type: :string, as: 'upper(name)'
+      t.virtual :name_upcased, type: :string, as: 'upper(name)', stored: true
     end
     ```
 

activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb

@@ -456,7 +456,7 @@ def default_insert_value(column)
         end
 
         def build_fixture_sql(fixtures, table_name)
-          columns = schema_cache.columns_hash(table_name)
+          columns = schema_cache.columns_hash(table_name).reject { |_, column| supports_virtual_columns? && column.virtual? }
 
           values_list = fixtures.map do |fixture|
             fixture = fixture.stringify_keys

activerecord/lib/active_record/connection_adapters/postgresql/column.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "active_support/core_ext/object/blank"
+
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL
@@ -17,7 +19,8 @@ def serial?
         end
 
         def virtual?
-          @generated == "s"
+          # We assume every generated column is virtual, no matter the concrete type
+          @generated.present?
         end
 
         def has_default?

activerecord/test/cases/adapters/postgresql/virtual_column_test.rb

@@ -69,5 +69,9 @@ def test_schema_dumping
       assert_match(/t\.virtual\s+"name_length",\s+type: :integer,\s+as: "length\(\(name\)::text\)", stored: true$/i, output)
       assert_match(/t\.virtual\s+"name_octet_length",\s+type: :integer,\s+as: "octet_length\(\(name\)::text\)", stored: true$/i, output)
     end
+
+    def test_build_fixture_sql
+      ActiveRecord::FixtureSet.create_fixtures(FIXTURES_ROOT, :virtual_columns)
+    end
   end
 end

activerecord/test/fixtures/virtual_columns.yml

@@ -0,0 +1,5 @@
+one:
+  name: hello
+
+two:
+  name: world

guides/source/active_record_postgresql.md

@@ -512,7 +512,7 @@ NOTE: Generated columns are supported since version 12.0 of PostgreSQL.
 # db/migrate/20131220144913_create_users.rb
 create_table :users do |t|
   t.string :name
-  t.virtual :name_upcased, type: :string, as: 'upper(name)'
+  t.virtual :name_upcased, type: :string, as: 'upper(name)', stored: true
 end
 
 # app/models/user.rb