pg_migrate 0.1.11 → 0.1.12

data/lib/pg_migrate/templates/bootstrap.erb

@@ -1,175 +1,175 @@
--- pg_migrate bootstrap
--- purpose: responsible for creating or updating pg_migration internal tables
--- when:    this script should be called before every migration attempt, to be safe.
---  except:  if you know you have not updated the pg_migrate tool itself,
---           and you know you have run this file at least once before on the current database,
---           then you don't have to run this again.
-
-\set ON_ERROR_STOP 1
-
-BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-
--- bootstrap in the pgmigrate schema namespace, if it doesn't exist
-DO $$DECLARE already_exists boolean;
-BEGIN
-
-    SELECT exists INTO STRICT already_exists (select * from pg_catalog.pg_namespace where nspname = 'pgmigrate');
-
-    IF NOT already_exists THEN
-        create schema pgmigrate;
-    END IF;
-
-END$$;
-
-
-CREATE OR REPLACE FUNCTION pgmigrate.bootstrap_pg_migrate() RETURNS void AS $$
-DECLARE
-    found_pg_migrate information_schema.tables;
-    found_pg_migrations information_schema.tables;
-
-BEGIN
-    BEGIN
-        SELECT * INTO STRICT found_pg_migrate FROM information_schema.tables WHERE table_name = 'pg_migrate' and table_schema = 'pgmigrate';
-
-        EXCEPTION
-            WHEN NO_DATA_FOUND THEN
-                CREATE TABLE pgmigrate.pg_migrate (id BIGSERIAL PRIMARY KEY, template_version VARCHAR(255), builder_version VARCHAR(255), migrator_version VARCHAR(255), database_version VARCHAR(1024));
-                CREATE INDEX pg_migrate_unique_index ON pgmigrate.pg_migrate (template_version, builder_version, migrator_version, database_version);
-
-            WHEN TOO_MANY_ROWS THEN
-                RAISE EXCEPTION 'Multiple pg_migrate tables.  Unique key on information_schema.tables should have prevented this.';
-    END;
-
-    BEGIN
-        SELECT * INTO STRICT found_pg_migrations FROM information_schema.tables WHERE table_name = 'pg_migrations' and table_schema = 'pgmigrate';
-
-        EXCEPTION
-            WHEN NO_DATA_FOUND THEN
-                CREATE TABLE pgmigrate.pg_migrations(
-                    name VARCHAR(255) PRIMARY KEY,
-                    ordinal INTEGER NOT NULL,
-                    created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-                    finalized SMALLINT DEFAULT 1,
-                    pg_migrate_id BIGINT NOT NULL REFERENCES pgmigrate.pg_migrate(id));
-            WHEN TOO_MANY_ROWS THEN
-                RAISE EXCEPTION 'Multiple pg_migrations tables.  Unique key on information_schema.tables should have prevented this.';
-    END;
-
-END;
-$$ LANGUAGE plpgsql;
-
-
-SELECT pgmigrate.bootstrap_pg_migrate();
-
--- verifies that the specified migration name has the expected ordinal.  No exception is thrown if no migration
--- of this name exists, and no exception is thrown if the migration + ordinal pair is found on a single row.
--- Only if the migrtion is found with the wrong row is an exception thrown.
-CREATE OR REPLACE FUNCTION pgmigrate.verify_against_existing_migrations(migration varchar(255), ordinal integer) RETURNS VOID AS $$
-DECLARE
- found_migration pgmigrate.pg_migrations;
-BEGIN
-  BEGIN
-   EXECUTE 'SELECT * FROM pgmigrate.pg_migrations WHERE name=$1' INTO STRICT found_migration USING migration;
-   EXCEPTION
-     WHEN NO_DATA_FOUND THEN
-        -- if no data, then this migration is unrun.  One more check remains...
-        -- if the last run migration's ordinal is 1 less than this one, we are ready to go.
-        IF coalesce((SELECT MAX(p.ordinal) FROM pgmigrate.pg_migrations as p), -1) <> ordinal - 1 THEN
-            RAISE EXCEPTION 'pg_migrate: code=missing_migration, migration=%, ordinal=%, last_ordinal=%', migration, ordinal, (SELECT MAX(p.ordinal) FROM pgmigrate.pg_migrations as p);
-        END IF;
-
-        RETURN;
-     WHEN TOO_MANY_ROWS THEN
-        -- this is certainly an odd scenario, because how could this happen unless the user dropped unique key on 'name' column?
-        RAISE EXCEPTION 'pg_migrate: code=pg_migrations_uniqueness_error, migration=%', migration;
-  END;
-
-  -- one row has been found; verify ordinal is correct
-  IF found_migration.ordinal <> ordinal THEN
-    RAISE EXCEPTION 'pg_migrate: code=incorrect_ordinal, migration=%, expected_ordinal=%, actual_ordinal', migration, ordinal, found_migration.ordinal;
-  END IF;
-
-END;
-$$ LANGUAGE plpgsql;
-
-
--- checks if the current script has been executed or not, and throws an exception if so
--- callers should check for 'pg_migrate: code=migration_exists' to know whether they should quietly ignore exception.
--- psql can only do this by calling \set ON_ERROR_STOP 1 (which is done by templates already)
-CREATE OR REPLACE FUNCTION pgmigrate.bypass_existing_migration(migration varchar(255)) RETURNS VOID AS $$
-DECLARE
- found_migration pgmigrate.pg_migrations;
-BEGIN
-  BEGIN
-   EXECUTE 'SELECT * FROM pgmigrate.pg_migrations WHERE name=$1' INTO STRICT found_migration USING migration ;
-   EXCEPTION
-     WHEN NO_DATA_FOUND THEN
-        -- if no data, then success.  just return with no exception thrown
-        RETURN;
-     WHEN TOO_MANY_ROWS THEN
-        -- this path should never happen because this same condition is already checked via 'verify_against_existing_migrations'
-        RAISE EXCEPTION 'pg_migrate: code=pg_migrations_uniqueness_error, migration=%', migration;
-  END;
-
-  RAISE EXCEPTION 'pg_migrate: code=migration_exists, migration=%', migration;
-END;
-$$ LANGUAGE plpgsql;
-
-
--- used to verify that the migration being applied is the same as this set or newer.  While the parameter
--- today is called 'manifest_version', in reality this is just the highest ordinal from the manifest.
--- so if we find that the database has a higher ordinal than the manifest that built this migration,
--- then we can kick this out
-CREATE OR REPLACE FUNCTION pgmigrate.verify_manifest_is_not_old(manifest_version INTEGER) RETURNS VOID AS $$
-DECLARE
-    max_ordinal INTEGER;
-BEGIN
-    EXECUTE 'SELECT max(ordinal) FROM pgmigrate.pg_migrations' INTO max_ordinal;
-
-    IF max_ordinal > manifest_version THEN
-        RAISE EXCEPTION 'pg_migrate: code=old_manifest, max_ordinal_in_db=%, manifest_version=%', max_ordinal, manifest_version;
-    END IF;
-END;
-$$ LANGUAGE plpgsql;
-
-
--- used to mark a migration as finished
-CREATE OR REPLACE FUNCTION pgmigrate.record_migration(migration varchar(255), ordinal INTEGER, template_version VARCHAR(255), builder_version VARCHAR(255)) RETURNS VOID AS $$
-DECLARE
-    found_pg_migrate_id BIGINT;
-    migrator_version VARCHAR(255);
-BEGIN
-
-    EXECUTE 'SELECT current_setting(''application_name'')' INTO migrator_version;
-
-    BEGIN
-        -- first look for existing pg_migrate row satisfying version columns
-        -- but if not found, create that row
-        -- in either case, found_pg_migrate_id will have the row id
-        EXECUTE 'SELECT id FROM pgmigrate.pg_migrate WHERE
-                    template_version=$1 and builder_version=$2 and migrator_version=$3 and database_version=$4'
-                INTO found_pg_migrate_id USING template_version, builder_version, migrator_version, (select version());
-        EXCEPTION
-            WHEN NO_DATA_FOUND THEN
-                found_pg_migrate_id = NULL;
-            WHEN TOO_MANY_ROWS THEN
-                -- this path should never occur because of the multi-column index on pg_migrate
-                RAISE EXCEPTION 'pg_migrate: code=pg_migrate_uniqueness_error, migration=%, ordinal=%, template_version=%, builder_version=%, migrator_version=%, database_version', migration, ordinal, template_version, builder_version, migrator_version, (select version());
-    END;
-
-    IF found_pg_migrate_id IS NULL THEN
-        INSERT INTO pgmigrate.pg_migrate(id, template_version, builder_version, migrator_version, database_version)
-            VALUES (default, template_version, builder_version, migrator_version, (select version())) RETURNING id INTO found_pg_migrate_id;
-    END IF;
-
-    -- create a new record in pg_migrations table, ensuring this migration won't be run again
-    EXECUTE 'INSERT INTO pgmigrate.pg_migrations(name, ordinal, created, finalized, pg_migrate_id)
-        VALUES ($1, $2, CURRENT_TIMESTAMP, 1, $3)' USING migration, ordinal, found_pg_migrate_id;
-
-END;
-$$ LANGUAGE plpgsql;
-
-COMMIT;
-
-
-
+-- pg_migrate bootstrap
+-- purpose: responsible for creating or updating pg_migration internal tables
+-- when:    this script should be called before every migration attempt, to be safe.
+--  except:  if you know you have not updated the pg_migrate tool itself,
+--           and you know you have run this file at least once before on the current database,
+--           then you don't have to run this again.
+
+\set ON_ERROR_STOP 1
+
+BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
+
+-- bootstrap in the pgmigrate schema namespace, if it doesn't exist
+DO $$DECLARE already_exists boolean;
+BEGIN
+
+    SELECT exists INTO STRICT already_exists (select * from pg_catalog.pg_namespace where nspname = 'pgmigrate');
+
+    IF NOT already_exists THEN
+        create schema pgmigrate;
+    END IF;
+
+END$$;
+
+
+CREATE OR REPLACE FUNCTION pgmigrate.bootstrap_pg_migrate() RETURNS void AS $$
+DECLARE
+    found_pg_migrate information_schema.tables;
+    found_pg_migrations information_schema.tables;
+
+BEGIN
+    BEGIN
+        SELECT * INTO STRICT found_pg_migrate FROM information_schema.tables WHERE table_name = 'pg_migrate' and table_schema = 'pgmigrate';
+
+        EXCEPTION
+            WHEN NO_DATA_FOUND THEN
+                CREATE TABLE pgmigrate.pg_migrate (id BIGSERIAL PRIMARY KEY, template_version VARCHAR(255), builder_version VARCHAR(255), migrator_version VARCHAR(255), database_version VARCHAR(1024));
+                CREATE INDEX pg_migrate_unique_index ON pgmigrate.pg_migrate (template_version, builder_version, migrator_version, database_version);
+
+            WHEN TOO_MANY_ROWS THEN
+                RAISE EXCEPTION 'Multiple pg_migrate tables.  Unique key on information_schema.tables should have prevented this.';
+    END;
+
+    BEGIN
+        SELECT * INTO STRICT found_pg_migrations FROM information_schema.tables WHERE table_name = 'pg_migrations' and table_schema = 'pgmigrate';
+
+        EXCEPTION
+            WHEN NO_DATA_FOUND THEN
+                CREATE TABLE pgmigrate.pg_migrations(
+                    name VARCHAR(255) PRIMARY KEY,
+                    ordinal INTEGER NOT NULL,
+                    created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+                    finalized SMALLINT DEFAULT 1,
+                    pg_migrate_id BIGINT NOT NULL REFERENCES pgmigrate.pg_migrate(id));
+            WHEN TOO_MANY_ROWS THEN
+                RAISE EXCEPTION 'Multiple pg_migrations tables.  Unique key on information_schema.tables should have prevented this.';
+    END;
+
+END;
+$$ LANGUAGE plpgsql;
+
+
+SELECT pgmigrate.bootstrap_pg_migrate();
+
+-- verifies that the specified migration name has the expected ordinal.  No exception is thrown if no migration
+-- of this name exists, and no exception is thrown if the migration + ordinal pair is found on a single row.
+-- Only if the migrtion is found with the wrong row is an exception thrown.
+CREATE OR REPLACE FUNCTION pgmigrate.verify_against_existing_migrations(migration varchar(255), ordinal integer) RETURNS VOID AS $$
+DECLARE
+ found_migration pgmigrate.pg_migrations;
+BEGIN
+  BEGIN
+   EXECUTE 'SELECT * FROM pgmigrate.pg_migrations WHERE name=$1' INTO STRICT found_migration USING migration;
+   EXCEPTION
+     WHEN NO_DATA_FOUND THEN
+        -- if no data, then this migration is unrun.  One more check remains...
+        -- if the last run migration's ordinal is 1 less than this one, we are ready to go.
+        IF coalesce((SELECT MAX(p.ordinal) FROM pgmigrate.pg_migrations as p), -1) <> ordinal - 1 THEN
+            RAISE EXCEPTION 'pg_migrate: code=missing_migration, migration=%, ordinal=%, last_ordinal=%', migration, ordinal, (SELECT MAX(p.ordinal) FROM pgmigrate.pg_migrations as p);
+        END IF;
+
+        RETURN;
+     WHEN TOO_MANY_ROWS THEN
+        -- this is certainly an odd scenario, because how could this happen unless the user dropped unique key on 'name' column?
+        RAISE EXCEPTION 'pg_migrate: code=pg_migrations_uniqueness_error, migration=%', migration;
+  END;
+
+  -- one row has been found; verify ordinal is correct
+  IF found_migration.ordinal <> ordinal THEN
+    RAISE EXCEPTION 'pg_migrate: code=incorrect_ordinal, migration=%, expected_ordinal=%, actual_ordinal', migration, ordinal, found_migration.ordinal;
+  END IF;
+
+END;
+$$ LANGUAGE plpgsql;
+
+
+-- checks if the current script has been executed or not, and throws an exception if so
+-- callers should check for 'pg_migrate: code=migration_exists' to know whether they should quietly ignore exception.
+-- psql can only do this by calling \set ON_ERROR_STOP 1 (which is done by templates already)
+CREATE OR REPLACE FUNCTION pgmigrate.bypass_existing_migration(migration varchar(255)) RETURNS VOID AS $$
+DECLARE
+ found_migration pgmigrate.pg_migrations;
+BEGIN
+  BEGIN
+   EXECUTE 'SELECT * FROM pgmigrate.pg_migrations WHERE name=$1' INTO STRICT found_migration USING migration ;
+   EXCEPTION
+     WHEN NO_DATA_FOUND THEN
+        -- if no data, then success.  just return with no exception thrown
+        RETURN;
+     WHEN TOO_MANY_ROWS THEN
+        -- this path should never happen because this same condition is already checked via 'verify_against_existing_migrations'
+        RAISE EXCEPTION 'pg_migrate: code=pg_migrations_uniqueness_error, migration=%', migration;
+  END;
+
+  RAISE EXCEPTION 'pg_migrate: code=migration_exists, migration=%', migration;
+END;
+$$ LANGUAGE plpgsql;
+
+
+-- used to verify that the migration being applied is the same as this set or newer.  While the parameter
+-- today is called 'manifest_version', in reality this is just the highest ordinal from the manifest.
+-- so if we find that the database has a higher ordinal than the manifest that built this migration,
+-- then we can kick this out
+CREATE OR REPLACE FUNCTION pgmigrate.verify_manifest_is_not_old(manifest_version INTEGER) RETURNS VOID AS $$
+DECLARE
+    max_ordinal INTEGER;
+BEGIN
+    EXECUTE 'SELECT max(ordinal) FROM pgmigrate.pg_migrations' INTO max_ordinal;
+
+    IF max_ordinal > manifest_version THEN
+        RAISE EXCEPTION 'pg_migrate: code=old_manifest, max_ordinal_in_db=%, manifest_version=%', max_ordinal, manifest_version;
+    END IF;
+END;
+$$ LANGUAGE plpgsql;
+
+
+-- used to mark a migration as finished
+CREATE OR REPLACE FUNCTION pgmigrate.record_migration(migration varchar(255), ordinal INTEGER, template_version VARCHAR(255), builder_version VARCHAR(255)) RETURNS VOID AS $$
+DECLARE
+    found_pg_migrate_id BIGINT;
+    migrator_version VARCHAR(255);
+BEGIN
+
+    EXECUTE 'SELECT current_setting(''application_name'')' INTO migrator_version;
+
+    BEGIN
+        -- first look for existing pg_migrate row satisfying version columns
+        -- but if not found, create that row
+        -- in either case, found_pg_migrate_id will have the row id
+        EXECUTE 'SELECT id FROM pgmigrate.pg_migrate WHERE
+                    template_version=$1 and builder_version=$2 and migrator_version=$3 and database_version=$4'
+                INTO found_pg_migrate_id USING template_version, builder_version, migrator_version, (select version());
+        EXCEPTION
+            WHEN NO_DATA_FOUND THEN
+                found_pg_migrate_id = NULL;
+            WHEN TOO_MANY_ROWS THEN
+                -- this path should never occur because of the multi-column index on pg_migrate
+                RAISE EXCEPTION 'pg_migrate: code=pg_migrate_uniqueness_error, migration=%, ordinal=%, template_version=%, builder_version=%, migrator_version=%, database_version', migration, ordinal, template_version, builder_version, migrator_version, (select version());
+    END;
+
+    IF found_pg_migrate_id IS NULL THEN
+        INSERT INTO pgmigrate.pg_migrate(id, template_version, builder_version, migrator_version, database_version)
+            VALUES (default, template_version, builder_version, migrator_version, (select version())) RETURNING id INTO found_pg_migrate_id;
+    END IF;
+
+    -- create a new record in pg_migrations table, ensuring this migration won't be run again
+    EXECUTE 'INSERT INTO pgmigrate.pg_migrations(name, ordinal, created, finalized, pg_migrate_id)
+        VALUES ($1, $2, CURRENT_TIMESTAMP, 1, $3)' USING migration, ordinal, found_pg_migrate_id;
+
+END;
+$$ LANGUAGE plpgsql;
+
+COMMIT;
+
+
+

data/lib/pg_migrate/templates/up.erb

@@ -1,30 +1,30 @@
--- beginning pg_migrate header, migration=<%= migration_def.name %>
-\set ON_ERROR_STOP 1
-
-BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
-
--- we want to ensure no one else is running this migration concurrently
-LOCK TABLE pgmigrate.pg_migrations IN ACCESS EXCLUSIVE MODE;
-
-SELECT pgmigrate.verify_manifest_is_not_old(<%= manifest_version %>);
-
-SELECT pgmigrate.verify_against_existing_migrations('<%= migration_def.name %>', <%= migration_def.ordinal %>);
-
--- to allow exception in CHECK_IF_MIGRATED to cause rollback, not failure
-\set ON_ERROR_STOP 0
-
-SELECT pgmigrate.bypass_existing_migration('<%= migration_def.name %>');
-
--- if the content of the migration is bad, we want psql to stop.
-\set ON_ERROR_STOP 1
-
--- beginning user sql, migration=<%= migration_def.name %>
-
-<%= migration_content %>
-
--- beginning pg_migrate footer, migration=<%= migration_def.name %>
-
-SELECT pgmigrate.record_migration('<%= migration_def.name %>', <%= migration_def.ordinal %>, '0.1.0', '<%= builder_version %>');
-
-COMMIT;
--- end pg_migrate migration, migration=<%= migration_def.name %>
+-- beginning pg_migrate header, migration=<%= migration_def.name %>
+\set ON_ERROR_STOP 1
+
+BEGIN TRANSACTION ISOLATION LEVEL SERIALIZABLE;
+
+-- we want to ensure no one else is running this migration concurrently
+LOCK TABLE pgmigrate.pg_migrations IN ACCESS EXCLUSIVE MODE;
+
+SELECT pgmigrate.verify_manifest_is_not_old(<%= manifest_version %>);
+
+SELECT pgmigrate.verify_against_existing_migrations('<%= migration_def.name %>', <%= migration_def.ordinal %>);
+
+-- to allow exception in CHECK_IF_MIGRATED to cause rollback, not failure
+\set ON_ERROR_STOP 0
+
+SELECT pgmigrate.bypass_existing_migration('<%= migration_def.name %>');
+
+-- if the content of the migration is bad, we want psql to stop.
+\set ON_ERROR_STOP 1
+
+-- beginning user sql, migration=<%= migration_def.name %>
+
+<%= migration_content %>
+
+-- beginning pg_migrate footer, migration=<%= migration_def.name %>
+
+SELECT pgmigrate.record_migration('<%= migration_def.name %>', <%= migration_def.ordinal %>, '0.1.0', '<%= builder_version %>');
+
+COMMIT;
+-- end pg_migrate migration, migration=<%= migration_def.name %>

data/lib/pg_migrate/util.rb

@@ -1,73 +1,73 @@
-module PgMigrate
-
-  class Util
-
-    LOGGER = Logging.logger[self]
-
-    # recommended to create all connections via this method,
-    # so that we can put NOTICE/CONTEXT into logger instead of stderr
-    def self.create_conn(args)
-      conn = PG::Connection.open(args)
-      conn.set_notice_receiver do |result|
-          #result.res_status(result.result_status)
-          LOGGER.debug result.error_message
-      end
-      return conn
-    end
-
-    def self.get_conn(connection_options)
-      if !connection_options[:pgconn].nil?
-        return connection_options[:pgconn]
-      elsif !connection_options[:connstring].nil?
-        create_conn(connection_options[:connstring])
-      elsif !connection_options[:connopts].nil?
-        return create_conn(connection_options[:connopts])
-      else
-        return create_conn(connection_options)
-      end
-    end
-
-    # the 'out-of-band' conn is a connection to a database that you aren't
-    # interested in modifying; it's basically a landing pad so that you can do:
-    # DROP DATABSE BLAH; CREATE DATABASE BLAH -- for testing
-    def self.get_oob_conn(connection_options)
-
-      if !connection_options[:oob_pgconn].nil?
-        return connection_options[:oob_pgconn]
-      elsif !connection_options[:oob_connstring].nil?
-        return create_conn(connection_options[:oob_connstring])
-      elsif !connection_options[:oob_connopts].nil?
-        return create_conn(connection_options[:oob_connopts])
-      else
-        return create_conn(connection_options)
-      end
-    end
-
-    # finds dbname from connection_options
-    def self.get_db_name(connection_options)
-      dbname = nil
-      if !connection_options[:pgconn].nil?
-        dbname = connection_options[:pgconn].db
-      elsif !connection_options[:connstring].nil?
-        connstring = connection_options[:connstring]
-        bits = connstring.split(" ")
-        bits.each do |bit|
-          if bit.start_with? "dbname="
-            dbname = bit["dbname=".length..-1]
-            break
-          end
-        end
-      elsif !connection_options[:connopts].nil?
-        dbname = connection_options[:connopts]["dbname"]
-      else
-        dbname = connection_options["dbname"]
-      end
-
-      if dbname.nil?
-        raise "db name is null.  tried finding dbname in #{connection_options.inspect}"
-      end
-
-      return dbname
-    end
-  end
-end
+module PgMigrate
+
+  class Util
+
+    LOGGER = Logging.logger[self]
+
+    # recommended to create all connections via this method,
+    # so that we can put NOTICE/CONTEXT into logger instead of stderr
+    def self.create_conn(args)
+      conn = PG::Connection.open(args)
+      conn.set_notice_receiver do |result|
+          #result.res_status(result.result_status)
+          LOGGER.debug result.error_message
+      end
+      return conn
+    end
+
+    def self.get_conn(connection_options)
+      if !connection_options[:pgconn].nil?
+        return connection_options[:pgconn]
+      elsif !connection_options[:connstring].nil?
+        create_conn(connection_options[:connstring])
+      elsif !connection_options[:connopts].nil?
+        return create_conn(connection_options[:connopts])
+      else
+        return create_conn(connection_options)
+      end
+    end
+
+    # the 'out-of-band' conn is a connection to a database that you aren't
+    # interested in modifying; it's basically a landing pad so that you can do:
+    # DROP DATABSE BLAH; CREATE DATABASE BLAH -- for testing
+    def self.get_oob_conn(connection_options)
+
+      if !connection_options[:oob_pgconn].nil?
+        return connection_options[:oob_pgconn]
+      elsif !connection_options[:oob_connstring].nil?
+        return create_conn(connection_options[:oob_connstring])
+      elsif !connection_options[:oob_connopts].nil?
+        return create_conn(connection_options[:oob_connopts])
+      else
+        return create_conn(connection_options)
+      end
+    end
+
+    # finds dbname from connection_options
+    def self.get_db_name(connection_options)
+      dbname = nil
+      if !connection_options[:pgconn].nil?
+        dbname = connection_options[:pgconn].db
+      elsif !connection_options[:connstring].nil?
+        connstring = connection_options[:connstring]
+        bits = connstring.split(" ")
+        bits.each do |bit|
+          if bit.start_with? "dbname="
+            dbname = bit["dbname=".length..-1]
+            break
+          end
+        end
+      elsif !connection_options[:connopts].nil?
+        dbname = connection_options[:connopts]["dbname"]
+      else
+        dbname = connection_options["dbname"]
+      end
+
+      if dbname.nil?
+        raise "db name is null.  tried finding dbname in #{connection_options.inspect}"
+      end
+
+      return dbname
+    end
+  end
+end

data/lib/pg_migrate/version.rb

@@ -1,3 +1,3 @@
-module PgMigrate
-  VERSION = "0.1.11"
-end
+module PgMigrate
+  VERSION = "0.1.12"
+end

data/lib/pg_migrate.rb

@@ -1,40 +1,40 @@
-require 'logging'
-require 'pg'
-require 'thor'
-require "pg_migrate/version"
-require "pg_migrate/props"
-require "pg_migrate/migration"
-require "pg_migrate/sql_reader"
-require "pg_migrate/manifest_reader"
-require "pg_migrate/migrator"
-require "pg_migrate/config_parser"
-require "pg_migrate/builder"
-require "pg_migrate/package"
-require "pg_migrate/command_line"
-require "pg_migrate/util"
-
-# name of the manifest file
-MANIFEST_FILENAME = 'manifest'
-# name of the 'forward' migration folder
-UP_DIRNAME = 'up'
-# name of the 'backwards' migration folder
-DOWN_DIRNAME = 'down'
-# name of the 'test' migration folder
-TESTDIRNAME = 'test'
-# name of the bootstrap.sql file
-BOOTSTRAP_FILENAME = "bootstrap.sql"
-# built manifest version header
-BUILDER_VERSION_HEADER ="# pg_migrate-"
-# name of project configuration defaults
-PG_CONFIG ='.pg_migrate'
-
-
-### SQL CONSTANTS ###
-PG_MIGRATE_TABLE = "pg_migrate"
-PG_MIGRATIONS_TABLE = "pg_migrations"
-
-
-
-module PgMigrate
-  # Your code goes here...
-end
+require 'logging'
+require 'pg'
+require 'thor'
+require "pg_migrate/version"
+require "pg_migrate/props"
+require "pg_migrate/migration"
+require "pg_migrate/sql_reader"
+require "pg_migrate/manifest_reader"
+require "pg_migrate/migrator"
+require "pg_migrate/config_parser"
+require "pg_migrate/builder"
+require "pg_migrate/package"
+require "pg_migrate/command_line"
+require "pg_migrate/util"
+
+# name of the manifest file
+MANIFEST_FILENAME = 'manifest'
+# name of the 'forward' migration folder
+UP_DIRNAME = 'up'
+# name of the 'backwards' migration folder
+DOWN_DIRNAME = 'down'
+# name of the 'test' migration folder
+TESTDIRNAME = 'test'
+# name of the bootstrap.sql file
+BOOTSTRAP_FILENAME = "bootstrap.sql"
+# built manifest version header
+BUILDER_VERSION_HEADER ="# pg_migrate-"
+# name of project configuration defaults
+PG_CONFIG ='.pg_migrate'
+
+
+### SQL CONSTANTS ###
+PG_MIGRATE_TABLE = "pg_migrate"
+PG_MIGRATIONS_TABLE = "pg_migrations"
+
+
+
+module PgMigrate
+  # Your code goes here...
+end