chrono_model 0.5.0 → 0.5.1

data/README.md

@@ -184,11 +184,11 @@ them in your output, use `rake VERBOSE=true`.
 
  * The rules and temporal indexes cannot be saved in schema.rb. The AR
    schema dumper is quite basic, and it isn't (currently) extensible.
-   As we're using many database-specific features, you'll better off with
-   the SQL schema dumper (`config.active_record.schema_format = :sql` in
-   `config/application.rb`). Be sure to add [these
-   files](https://gist.github.com/4548844) in your `lib/tasks` if you want
-   `rake db:setup` to work.
+   As we're using many database-specific features, Chronomodel forces the
+   usage of the `:sql` schema dumper, and included rake tasks override
+   `db:schema:dump` and `db:schema:load` to do `db:structure:dump` and
+   `db:structure:load`. Two helper tasks are also added, `db:data:dump`
+   and `db:data:load`.
 
  * `.includes` still doesn't work, but it'll fixed.
 

data/lib/chrono_model/adapter.rb

@@ -432,10 +432,10 @@ module ChronoModel
     end
 
     TableCache = (Class.new(HashWithIndifferentAccess) do
-      def all         ; keys;                 ; end
-      def add!  table ; self[table] = true    ; end
-      def del!  table ; self[table] = nil     ; end
-      def fetch table ; self[table] ||= yield ; end
+      def all         ; keys;                      ; end
+      def add!  table ; self[table.to_s] = true    ; end
+      def del!  table ; self[table.to_s] = nil     ; end
+      def fetch table ; self[table.to_s] ||= yield ; end
     end).new
 
     # Returns true if the given name references a temporal table.

data/lib/chrono_model/railtie.rb

@@ -5,15 +5,15 @@ module ChronoModel
     end
 
     rake_tasks do
+      load 'chrono_model/schema_format.rake'
 
-     namespace :db do
-       namespace :chrono do
-         task :create_schemas do
-           puts 'create schemas'
-           ActiveRecord::Base.connection.chrono_create_schemas!
-         end
-       end
-     end
+      namespace :db do
+        namespace :chrono do
+          task :create_schemas do
+            ActiveRecord::Base.connection.chrono_create_schemas!
+          end
+        end
+      end
 
       task 'db:schema:load' => 'db:chrono:create_schemas'
     end

data/lib/chrono_model/schema_format.rake

@@ -0,0 +1,50 @@
+load File.expand_path(File.dirname(__FILE__) + '/schema_format.rb')
+
+namespace :db do
+  namespace :structure do
+    desc "desc 'Dump the database structure to db/structure.sql. Specify another file with DB_STRUCTURE=db/my_structure.sql"
+    task :dump => :environment do
+      config = PG.config!
+      target = ENV['DB_STRUCTURE'] || Rails.root.join('db', 'structure.sql')
+      schema = config[:schema_search_path] || 'public'
+
+      PG.make_dump target, *config.values_at(:username, :database),
+        '-s', '-O', '-n', schema,
+        '-n', ChronoModel::Adapter::TEMPORAL_SCHEMA,
+        '-n', ChronoModel::Adapter::HISTORY_SCHEMA
+
+      # Add migration information, after resetting the schema to the default one
+      File.open(target, 'a') do |f|
+        f.puts "SET search_path = #{schema}, pg_catalog;"
+        f.puts ActiveRecord::Base.connection.dump_schema_information
+      end
+    end
+
+
+    desc "Load structure.sql file into the current environment's database"
+    task :load => :environment do
+      # Loads the db/structure.sql file into current environment's database.
+      #
+      source = ENV['DB_STRUCTURE'] || Rails.root.join('db', 'structure.sql')
+
+      PG.load_dump source, *PG.config!.values_at(:username, :database, :template)
+    end
+  end
+
+  namespace :data do
+    desc "Save a dump of the database in ENV['DUMP'] or db/data.NOW.sql"
+    task :dump => :environment do
+      target = ENV['DUMP'] || Rails.root.join('db', "data.#{Time.now.to_f}.sql")
+
+      PG.make_dump target, *PG.config!.values_at(:username, :database), '-c'
+    end
+
+    desc "Load a dump of the database from ENV['DUMP']"
+    task :load => :environment do
+      source = ENV['DUMP'].presence or
+        raise ArgumentError, "Invoke as rake db:data:load DUMP=/path/to/data.sql"
+
+      PG.load_dump source, *PG.config!.values_at(:username, :database)
+    end
+  end
+end

data/lib/chrono_model/schema_format.rb

@@ -0,0 +1,78 @@
+# h/t http://stackoverflow.com/questions/4698467
+#
+Rails.application.config.active_record.schema_format = :sql
+
+# Clear Rails' ones
+%w( db:structure:dump db:structure:load ).each {|t| Rake::Task[t].clear }
+
+# Make schema:dump and schema:load invoke structure:dump and structure:load
+Rake::Task['db:schema:dump'].clear.enhance(['environment']) do
+  Rake::Task['db:structure:dump'].invoke
+end
+
+Rake::Task['db:schema:load'].clear.enhance(['environment']) do
+  Rake::Task['db:structure:load'].invoke
+end
+
+# PG utilities
+#
+module PG
+  extend self
+
+  def config!
+    ActiveRecord::Base.connection_pool.spec.config.tap do |config|
+      ENV['PGHOST']     = config[:host].to_s     if config.key?(:host)
+      ENV['PGPORT']     = config[:port].to_s     if config.key?(:port)
+      ENV['PGPASSWORD'] = config[:password].to_s if config.key?(:password)
+    end
+  end
+
+  def make_dump(target, username, database, *options)
+    exec 'pg_dump', '-f', target, '-U', username, database, *options
+  end
+
+  def load_dump(source, username, database, *options)
+    exec 'psql', '-U', username, '-f', source, database, *options
+  end
+
+  def exec(*argv)
+    argv = argv.compact.map(&:to_s)
+
+    print "> \033[1m#{argv.join(' ')}\033[0m... "
+    logger.info "PG: exec #{argv.join(' ')}"
+
+    stdout, stdout_w = IO.pipe
+    stderr, stderr_w = IO.pipe
+    pid = fork {
+      stdout.close; STDOUT.reopen(stdout_w)
+      stderr.close; STDERR.reopen(stderr_w)
+
+      Kernel.exec *argv
+    }
+    stdout_w.close; stderr_w.close
+    pid, status = Process.wait2
+
+    puts "exit #{status.exitstatus}"
+    logger.info "PG: exit #{status.exitstatus}"
+
+    out, err = stdout.read.chomp, stderr.read.chomp
+    stdout.close; stderr.close
+
+    if out.present?
+      logger.info "PG: -----8<----- stdout ----->8-----"
+      logger.info out
+      logger.info "PG: ----8<---- end stdout ---->8----"
+    end
+
+    if err.present?
+      logger.info "PG: -----8<----- stderr ----->8-----"
+      logger.info err
+      logger.info "PG: ----8<---- end stderr ---->8----"
+    end
+  end
+
+  def logger
+    ActiveRecord::Base.logger
+  end
+
+end

data/lib/chrono_model/version.rb

@@ -1,3 +1,3 @@
 module ChronoModel
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chrono_model
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &69702880 !ruby/object:Gem::Requirement
+  requirement: &70273330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *69702880
+  version_requirements: *70273330
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &69701390 !ruby/object:Gem::Requirement
+  requirement: &70273120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *69701390
+  version_requirements: *70273120
 description: Give your models as-of date temporal extensions. Built entirely for PostgreSQL
   >= 9.0
 email:
@@ -55,6 +55,8 @@ files:
 - lib/chrono_model/compatibility.rb
 - lib/chrono_model/patches.rb
 - lib/chrono_model/railtie.rb
+- lib/chrono_model/schema_format.rake
+- lib/chrono_model/schema_format.rb
 - lib/chrono_model/time_gate.rb
 - lib/chrono_model/time_machine.rb
 - lib/chrono_model/utils.rb
@@ -90,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Temporal extensions (SCD Type II) for Active Record