rails-schema 0.1.6 → 0.1.8

data/lib/rails/schema/transformer/graph_builder.rb

@@ -7,10 +7,11 @@ module Rails
     module Transformer
       class GraphBuilder
         def initialize(column_reader: Extractor::ColumnReader.new, association_reader: Extractor::AssociationReader.new,
-                       configuration: ::Rails::Schema.configuration)
+                       configuration: ::Rails::Schema.configuration, view_tables: nil)
           @column_reader = column_reader
           @association_reader = association_reader
           @group_proc = configuration.resolved_group_proc
+          @view_tables = view_tables ? Set.new(view_tables) : Set.new
         end
 
         def build(models)
@@ -47,7 +48,8 @@ module Rails
             id: unique_id,
             table_name: model.table_name,
             columns: @column_reader.read(model),
-            group: group
+            group: group,
+            view: @view_tables.include?(model.table_name)
           )
         end
 

data/lib/rails/schema/transformer/node.rb

@@ -4,18 +4,20 @@ module Rails
   module Schema
     module Transformer
       class Node
-        attr_reader :id, :table_name, :columns, :group
+        attr_reader :id, :table_name, :columns, :group, :view
 
-        def initialize(id:, table_name:, columns: [], group: [])
+        def initialize(id:, table_name:, columns: [], group: [], view: false)
           @id = id
           @table_name = table_name
           @columns = columns
           @group = group
+          @view = view
         end
 
         def to_h
           h = { id: @id, table_name: @table_name, columns: @columns }
           h[:group] = @group unless @group.empty?
+          h[:view] = true if @view
           h
         end
       end

data/lib/rails/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Rails
   module Schema
-    VERSION = "0.1.6"
+    VERSION = "0.1.8"
   end
 end

data/lib/rails/schema.rb

@@ -52,10 +52,10 @@ module Rails
       private
 
       def generate_active_record(output:)
-        schema_data = parse_schema
+        schema_data, views = parse_schema
         models = Extractor::ModelScanner.new(schema_data: schema_data).scan
-        column_reader = Extractor::ColumnReader.new(schema_data: schema_data)
-        graph_data = Transformer::GraphBuilder.new(column_reader: column_reader).build(models)
+        column_reader = Extractor::ColumnReader.new(schema_data: schema_data, view_tables: views)
+        graph_data = Transformer::GraphBuilder.new(column_reader: column_reader, view_tables: views).build(models)
         graph_data[:metadata][:mode] = "active_record"
         generator = Renderer::HtmlGenerator.new(graph_data: graph_data)
         generator.render_to_file(output)
@@ -84,17 +84,24 @@ module Rails
         generator.render_to_file(output)
       end
 
+      # Returns [columns_by_table, view_table_names]. For :auto, falls through
+      # to structure.sql when schema.rb yields nothing.
       def parse_schema
         case configuration.schema_format
         when :ruby
-          Extractor::SchemaFileParser.new.parse
+          parse_with(Extractor::SchemaFileParser.new)
         when :sql
-          Extractor::StructureSqlParser.new.parse
+          parse_with(Extractor::StructureSqlParser.new)
         when :auto
-          data = Extractor::SchemaFileParser.new.parse
-          data.empty? ? Extractor::StructureSqlParser.new.parse : data
+          columns, views = parse_with(Extractor::SchemaFileParser.new)
+          columns.empty? ? parse_with(Extractor::StructureSqlParser.new) : [columns, views]
         end
       end
+
+      def parse_with(parser)
+        columns = parser.parse
+        [columns, parser.views]
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-schema
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Andrei Kislichenko