Standardrb

Author: aidanharan

CHANGELOG.md

@@ -4,7 +4,7 @@
 
 - [#1301](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1301) Add support for `INDEX INCLUDE`.
 - [#1312](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1312) Add support for `insert_all` and `upsert_all`.
-- [#](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/) Added support for computed columns.
+- [#1367](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1367) Added support for computed columns.
 
 #### Changed
 

lib/active_record/connection_adapters/sqlserver/schema_creation.rb

@@ -66,11 +66,11 @@ def add_column_options!(sql, options)
           sql << " DEFAULT #{quote_default_expression_for_column_definition(options[:default], options[:column])}" if options_include_default?(options)
 
           sql << " COLLATE #{options[:collation]}" if options[:collation].present?
-          sql << " NOT NULL"                       if options[:null] == false
-          sql << " IDENTITY(1,1)"                  if options[:is_identity] == true
-          sql << " PRIMARY KEY"                    if options[:primary_key] == true
+          sql << " NOT NULL" if options[:null] == false
+          sql << " IDENTITY(1,1)" if options[:is_identity] == true
+          sql << " PRIMARY KEY" if options[:primary_key] == true
 
-          if as = options[:as]
+          if (as = options[:as])
             sql << " AS #{as}"
             sql << " PERSISTED" if options[:stored]
           end

lib/active_record/connection_adapters/sqlserver/schema_dumper.rb

@@ -14,7 +14,7 @@ def prepare_column_options(column)
           if @connection.supports_virtual_columns? && column.virtual?
             spec[:as] = extract_expression_for_virtual_column(column)
             spec[:stored] = column.virtual_stored?
-            spec = { type: schema_type(column).inspect }.merge!(spec)
+            spec = {type: schema_type(column).inspect}.merge!(spec)
           end
 
           spec

lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -85,34 +85,26 @@ def index_include_columns(table_name, index_name)
           select_all(sql, "SCHEMA").map { |row| row["column_name"] }
         end
 
+        def columns(table_name)
+          return [] if table_name.blank?
 
-        # def columns(table_name)
-        #   return [] if table_name.blank?
-        #
-        #   definitions = column_definitions(table_name)
-        #   definitions.map do |field|
-        #     new_column_from_field(table_name, field, definitions)
-        #   end
-        # end
+          definitions = column_definitions(table_name)
+          definitions.map do |field|
+            new_column_from_field(table_name, field, definitions)
+          end
+        end
 
         def new_column_from_field(table_name, field, definitions)
           sqlserver_options = field.slice(:ordinal_position, :is_primary, :is_identity, :table_name)
           sql_type_metadata = fetch_type_metadata(field[:type], sqlserver_options)
           generated_type = extract_generated_type(field)
 
-
-
-
-          if generated_type.present?
-            # binding.pry if field[:name] == "mutated_name"
-
-
-            default_function = field[:computed_formula]
+          default_function = if generated_type.present?
+            field[:computed_formula]
           else
-            default_function = field[:default_function]
+            field[:default_function]
           end
 
-
           SQLServer::Column.new(
             field[:name],
             lookup_cast_type(field[:type]),

lib/active_record/connection_adapters/sqlserver_column.rb

@@ -33,9 +33,6 @@ def case_sensitive?
         end
 
         def virtual?
-
-          # binding.pry
-
           @generated_type.present?
         end
 

test/cases/virtual_column_test_sqlserver.rb

@@ -12,7 +12,7 @@ class VirtualColumn < ActiveRecord::Base
   def setup
     @connection = ActiveRecord::Base.lease_connection
     @connection.create_table :virtual_columns, force: true do |t|
-      t.string  :name
+      t.string :name
       t.virtual :upper_name, type: :string, as: "UPPER(name)", stored: true
       t.virtual :lower_name, type: :string, as: "LOWER(name)", stored: false
       t.virtual :octet_name, type: :integer, as: "LEN(name)"
@@ -110,4 +110,3 @@ def test_build_fixture_sql
     assert_equal 2, fixtures.size
   end
 end
-