schema_dumper.rb in torque-postgresql-3.1.0

- old
+ new

@@ -10,20 +10,40 @@
 
           @connection.dump_mode!
           stream
         end
 
+        def extensions(stream) # :nodoc:
+          super
+          user_defined_schemas(stream)
+        end
+
         # Translate +:enum_set+ into +:enum+
         def schema_type(column)
           column.type == :enum_set ? :enum : super
         end
 
         private
 
           def tables(stream) # :nodoc:
+            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
+            sorted_tables = (@connection.tables - @connection.views).sort_by do |table_name|
+              table_name.split(/(?:public)?\./).reverse
+            end
 
             stream.puts "  # These are the common tables"
             (sorted_tables - inherited_tables.keys).each do |table_name|
               table(table_name, stream) unless ignored?(table_name)
             end
@@ -36,11 +56,11 @@
                 sub_stream = StringIO.new
                 table(table_name, sub_stream)
 
                 # Add the inherits setting
                 sub_stream.rewind
-                inherits.map!(&:to_sym)
+                inherits.map! { |parent| parent.to_s.sub(/\Apublic\./, '') }
                 inherits = inherits.first if inherits.size === 1
                 inherits = ", inherits: #{inherits.inspect} do |t|"
                 table_dump = sub_stream.read.gsub(/ do \|t\|$/, inherits)
 
                 # Ensure bodyless definitions
@@ -53,16 +73,28 @@
             if @connection.supports_foreign_keys?
               sorted_tables.each do |tbl|
                 foreign_keys(tbl, stream) unless ignored?(tbl)
               end
             end
+          end
 
-            # Scenic integration
-            views(stream) if defined?(::Scenic)
+          # Make sure to remove the schema from the table name
+          def remove_prefix_and_suffix(table)
+            super(table.sub(/\A[a-z0-9_]*\./, ''))
+          end
 
-            # FX integration
-            functions(stream) if defined?(::Fx::SchemaDumper::Function)
-            triggers(stream) if defined?(::Fx::SchemaDumper::Trigger)
+          # Dump user defined schemas
+          def user_defined_schemas(stream)
+            return if (list = (@connection.user_defined_schemas - ['public'])).empty?
+
+            stream.puts "  # Custom schemas defined in this database."
+            list.each { |name| stream.puts "  create_schema \"#{name}\", force: :cascade" }
+            stream.puts
+          end
+
+          def fx_functions_position
+            return unless defined?(::Fx::SchemaDumper::Function)
+            Fx.configuration.dump_functions_at_beginning_of_schema ? :beginning : :end
           end
       end
 
       ActiveRecord::ConnectionAdapters::PostgreSQL::SchemaDumper.prepend SchemaDumper
     end