voomify_tasks 0.1.7 → 0.1.8

data/lib/run_psql.rb

@@ -1,6 +1,6 @@
 module RunPSQL
   def db_file_path(filename)
-    "#{Rails.root}/db/sql/#{filename}"
+    "#{Rails.root}/db/#{filename}"
   end
   def run_psql_file(config, filename)
     file_with_path = db_file_path(filename)
@@ -15,6 +15,6 @@ module RunPSQL
     port = config["port"]
     password = config["password"]
     pipe_to_file = output_file ? "> #{output_file}" : ""
-    `export PGPASSWORD="#{password}";#{command} -U #{username} -h #{host} -p #{port} #{database} #{pipe_to_file};export PGPASSWORD=""`
+    `export PGPASSWORD="#{password}";#{command} -U #{username} -h #{host} #{port ? '-p '+-port : ''} #{database} #{pipe_to_file};export PGPASSWORD=""`
   end
 end

data/lib/tasks/sql_schema_seeds_databases.rake

@@ -7,11 +7,11 @@ require 'fileutils'
 namespace :db do
   namespace :schema do
     override_task :load => :environment do
-      run_psql_file(current_env, "schema.sql")
+      run_psql_file(current_env, "sql/schema.sql")
     end                                                                                     
 
     override_task :dump => :environment do
-      output_file = db_file_path("schema.sql")
+      output_file = db_file_path("sql/schema.sql")
       FileUtils.mv(output_file, "#{output_file}.last") if FileTest.exists?(output_file)
       run_pg_command(current_env, "pg_dump -c -o -O -x -s", output_file)
       puts "Schema has been updated from the database. Last schema backed up to #{output_file}.last"
@@ -19,7 +19,7 @@ namespace :db do
   end
 
   override_task :seed => :environment do
-    run_psql_file(current_env, "seed.sql")
+    run_psql_file(current_env, "sql/seed.sql")
   end
 
   namespace :test do
@@ -28,8 +28,8 @@ namespace :db do
     end
 
     override_task :load => :environment do
-      run_psql_file(ActiveRecord::Base.configurations["test"], "schema.sql")
-      run_psql_file(ActiveRecord::Base.configurations["test"], "seed.sql")
+      run_psql_file(ActiveRecord::Base.configurations["test"], "sql/schema.sql")
+      run_psql_file(ActiveRecord::Base.configurations["test"], "sql/seed.sql")
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: voomify_tasks
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Russell Edens