Improve how tables are dumped

Author: Carlos Silva

lib/torque/postgresql/adapter/schema_dumper.rb

@@ -20,11 +20,19 @@ def schema_type(column)
         private
 
           def tables(stream) # :nodoc:
-            # FX integration
-            if defined?(::Fx::SchemaDumper::Function)
-              functions(stream) if Fx.configuration.dump_functions_at_beginning_of_schema
-            end
+            around_tables(stream) { dump_tables(stream) }
+          end
+
+          def around_tables(stream)
+            functions(stream) if fx_functions_position == :beginning
+
+            yield
+
+            functions(stream) if fx_functions_position == :end
+            triggers(stream) if defined?(::Fx::SchemaDumper::Trigger)
+          end
 
+          def dump_tables(stream)
             inherited_tables = @connection.inherited_tables
             sorted_tables = @connection.tables.sort - @connection.views
 
@@ -60,18 +68,11 @@ def tables(stream) # :nodoc:
                 foreign_keys(tbl, stream) unless ignored?(tbl)
               end
             end
+          end
 
-            # Scenic integration
-            views(stream) if defined?(::Scenic)
-
-            # FX integration
-            if defined?(::Fx::SchemaDumper::Function)
-              functions(stream) unless Fx.configuration.dump_functions_at_beginning_of_schema
-            end
-
-            if defined?(::Fx::SchemaDumper::Trigger)
-              triggers(stream)
-            end
+          def fx_functions_position
+            return unless defined?(::Fx::SchemaDumper::Function)
+            Fx.configuration.dump_functions_at_beginning_of_schema ? :beginning : :end
           end
       end