sinatra-activerecord 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebc762631ec940416f6da6a0556185e825435d19
-  data.tar.gz: 803dbda8bdd9f0d0337a1b5a76e498325b759d07
+  metadata.gz: 55dde46fae3e419004fc3d736d20cc9f3a264dfb
+  data.tar.gz: cedff4d701cc24e94c1709cf9260a63b4173a72d
 SHA512:
-  metadata.gz: c549c27517bf69e71989ca6c0e538e69bf81f83876a3236ad5dcc65b48f3c5a276365ae2c46046b00fcbab7d5cdc9fdcf767a8b35f3b2ebb416ca668a8fbc1bd
-  data.tar.gz: e26325d3743f08312be6d94feeb67edd44864d1cbf4f1a22f25ae5c343ba8ce6632b9fe1b8a95bfb046303f5dfc8560a7a83f7a6b8a095d2564d513f37c34622
+  metadata.gz: d13de960d2b4110c257c2997227930e009f302523f0a69743d12b9fbb5ae53247b0cbdc8165f945263e1abdcbee474e4248d21f772b516061247521bc5152547
+  data.tar.gz: 30137e9fe91ea7207c05db286bb94d691177dbbac6cd5d3255482627e912523ce7a6a1065f87fecd9d5f7ffac381cab265cd57f09f2878e84449e517e1e8e6ea

data/lib/sinatra/activerecord/rake.rb

@@ -78,6 +78,10 @@ module Sinatra
       end
     end
 
+    def dump_structure(file_name = 'db/structure.sql')
+      ActiveRecord::Tasks::DatabaseTasks.structure_dump(config, file_name)
+    end
+
     def purge
       if config
         ActiveRecord::Tasks::DatabaseTasks.purge(config)
@@ -90,6 +94,10 @@ module Sinatra
       load(file_name)
     end
 
+    def load_structure(file_name = 'db/structure.sql')
+      ActiveRecord::Tasks::DatabaseTasks.structure_load(config, file_name)
+    end
+
     def with_config_environment(environment, &block)
       previous_environment = config_environment
       begin
@@ -111,7 +119,9 @@ module Sinatra
     end
 
     def config
-      ActiveRecord::Base.configurations[config_environment]
+      ActiveRecord::Base.configurations[config_environment] ||
+        #active record expects the keys to be strings, but connection_config returns them as symbols
+        Hash[ActiveRecord::Base.connection_config.map{|key, value| [key.to_s, value]}]
     end
 
     def migrations_dir

data/lib/sinatra/activerecord/tasks.rake

@@ -29,13 +29,21 @@ namespace :db do
   desc "migrate the database (use version with VERSION=n)"
   task :migrate do
     Sinatra::ActiveRecordTasks.migrate(ENV["VERSION"])
-    Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
+
+    case ActiveRecord::Base.schema_format
+      when :ruby then Rake::Task["db:schema:dump"].invoke
+      when :sql  then Rake::Task["db:structure:dump"].invoke
+    end
   end
 
   desc "roll back the migration (use steps with STEP=n)"
   task :rollback do
     Sinatra::ActiveRecordTasks.rollback(ENV["STEP"])
-    Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
+
+    case ActiveRecord::Base.schema_format
+      when :ruby then Rake::Task["db:schema:dump"].invoke
+      when :sql  then Rake::Task["db:structure:dump"].invoke
+    end
   end
 
   namespace :schema do
@@ -50,6 +58,18 @@ namespace :db do
     end
   end
 
+  namespace :structure do
+    desc "dump schema into a file as SQL"
+    task :dump do
+      Sinatra::ActiveRecordTasks.dump_structure()
+    end
+
+    desc "load schema into database"
+    task :load do
+      Sinatra::ActiveRecordTasks.load_structure()
+    end
+  end
+
   namespace :test do
     task :purge do
       Sinatra::ActiveRecordTasks.with_config_environment 'test' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Blake Mizerany
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra