pg-migrator 1.1.1 → 1.2.0

data/lib/pg-migrator/tasks.rb

@@ -12,7 +12,7 @@ namespace :db do
     end
   end
 
-  desc 'Drops the "public" schema and runs all the migrations'
+  desc 'Drops all schemas currently in the search_path and then applies all the migrations'
   task :reset => :setup do
     @migrator.reset 
   end

data/lib/pg-migrator/version.rb

@@ -1,5 +1,5 @@
 module PG
   class Migrator
-    VERSION = "1.1.1"
+    VERSION = "1.2.0"
   end
 end

data/lib/pg-migrator.rb

@@ -19,8 +19,19 @@ module PG
 
     def reset
       @pg.transaction do |conn|
-        conn.exec 'DROP SCHEMA public CASCADE'
-        conn.exec 'CREATE SCHEMA public'
+        search_path = conn.exec("SHOW search_path").values.first.first
+        current_user = conn.exec("SELECT CURRENT_USER").values.first.first
+        schemas_sql = "SELECT nspname FROM pg_namespace 
+               WHERE NOT(nspname LIKE 'pg_%') 
+               AND nspname != 'information_schema'
+        "
+        schemas = conn.exec(schemas_sql).values.flatten
+        search_path.split(',').each do |p|
+          p = p.strip.sub /"\$user"/, current_user
+          next unless schemas.include? p
+          conn.exec "DROP SCHEMA #{p} CASCADE; 
+                     CREATE SCHEMA #{p};"
+        end
       end
       migrate_up
     end

data/spec/migrator_spec.rb

@@ -4,6 +4,7 @@ require './lib/pg-migrator'
 describe PG::Migrator do
   before do
     @pg = PGconn.connect :dbname => 'pg-migrator'
+    @pg.exec 'SET client_min_messages = warning'
     logger = Logger.new STDERR
     logger.level = Logger::FATAL
     @migrator = PG::Migrator.new({:dbname => 'pg-migrator'}, '/tmp', logger)
@@ -14,12 +15,32 @@ describe PG::Migrator do
   end
 
   describe 'reset' do
-    it 'deletes previous tables' do
+    it 'drops tables' do
       @pg.exec 'create table bar (id int)'
       @migrator.reset
       tables = @pg.exec "select tablename from pg_tables where schemaname = 'public'"
       refute_includes tables.values.flatten, 'bar'
     end
+
+    it 'drops tables from all schemas in search_path' do
+      @pg.exec "
+        drop schema if exists foo cascade;
+        create schema foo
+          create table bar (id int);
+        drop schema if exists foobar cascade;
+        create schema foobar
+          create table bar (id int);
+        create table public.bar (id int);
+      "
+      pg = PGconn.connect :dbname => 'pg-migrator'
+      pg.exec 'SET search_path TO foo, public'
+      migrator = PG::Migrator.new(pg)
+      migrator.reset
+      migrator.close
+      tables = @pg.exec "select schemaname, tablename from pg_tables where tablename = 'bar'"
+      assert_equal [['foobar', 'bar']], tables.values
+      @pg.exec 'drop schema if exists foobar cascade'
+    end
   end
 
   describe 'migrate' do
@@ -49,9 +70,6 @@ describe PG::Migrator do
         assert_includes tables.values.flatten, 'foo'
       end
 
-      it 'executes sql files in order' do
-      end
-
       it 'adds records to the migration table' do
         @migrator.migrate_up
         migrations = @pg.exec "select * from migration"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg-migrator
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-28 00:00:00.000000000Z
+date: 2011-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70324143022020 !ruby/object:Gem::Requirement
+  requirement: &70326906755800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324143022020
+  version_requirements: *70326906755800
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70324143021600 !ruby/object:Gem::Requirement
+  requirement: &70326906755380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70324143021600
+  version_requirements: *70326906755380
 description: Rake migration tasks which utilities pure SQL files
 email:
 - carl.hoerberg@gmail.com
@@ -69,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Drop raw SQL files in db/migrations and add require 'pg-migrator/tasks' to