activerecord-jdbc-adapter 5.0.pre1 → 51.0

data/lib/arjdbc/sqlite3/adapter.rb

@@ -1,16 +1,25 @@
 ArJdbc.load_java_part :SQLite3
 
-require "arjdbc/common_jdbc_methods"
+require "arjdbc/abstract/core"
+require "arjdbc/abstract/database_statements"
+require 'arjdbc/abstract/statement_cache'
+require "arjdbc/abstract/transaction_support"
+require "active_record/connection_adapters/abstract_adapter"
 require "active_record/connection_adapters/statement_pool"
-require "active_record/connection_adapters/abstract/database_statements"
 require "active_record/connection_adapters/sqlite3/explain_pretty_printer"
 require "active_record/connection_adapters/sqlite3/quoting"
 require "active_record/connection_adapters/sqlite3/schema_creation"
+require "active_record/connection_adapters/sqlite3/schema_definitions"
+require "active_record/connection_adapters/sqlite3/schema_dumper"
+require "active_record/connection_adapters/sqlite3/schema_statements"
 
 module ArJdbc
   # All the code in this module is a copy of ConnectionAdapters::SQLite3Adapter from active_record 5.
   # The constants at the front of this file are to allow the rest of the file to remain with no modifications
-  # from its original source.
+  # from its original source.  If you hack on this file try not to modify this module and instead try and
+  # put those overrides in SQL3Adapter below.  We try and keep a copy of the Rails this adapter supports
+  # with the current goal of being able to diff changes easily over time and to also eventually remove
+  # this module from ARJDBC altogether.
   module SQLite3
     # DIFFERENCE: Some common constant names to reduce differences in rest of this module from AR5 version
     ConnectionAdapters = ::ActiveRecord::ConnectionAdapters
@@ -22,7 +31,10 @@ module ArJdbc
 
     ADAPTER_NAME = 'SQLite'.freeze
 
-    include Quoting
+    # DIFFERENCE: FQN
+    include ::ActiveRecord::ConnectionAdapters::SQLite3::Quoting
+    include ::ActiveRecord::ConnectionAdapters::SQLite3::ColumnDumper
+    include ::ActiveRecord::ConnectionAdapters::SQLite3::SchemaStatements
 
     NATIVE_DATABASE_TYPES = {
         primary_key:  "INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL",
@@ -46,15 +58,22 @@ module ArJdbc
       end
     end
 
+    def update_table_definition(table_name, base) # :nodoc:
+      # DIFFERENCE: FQN
+      ::ActiveRecord::ConnectionAdapters::SQLite3::Table.new(table_name, base)
+    end
+
     def schema_creation # :nodoc:
-      SQLite3::SchemaCreation.new self
+      # DIFFERENCE: FQN
+      ::ActiveRecord::ConnectionAdapters::SQLite3::SchemaCreation.new self
     end
 
     def arel_visitor # :nodoc:
       Arel::Visitors::SQLite.new(self)
     end
 
-    def initialize(connection, logger, connection_options, config)
+    # Difference we remove connection_options because we are not using it.
+    def initialize(connection, logger, config)
       super(connection, logger, config)
 
       @active     = nil
@@ -79,17 +98,12 @@ module ArJdbc
       true
     end
 
-    # Returns true, since this connection adapter supports migrations.
-    def supports_migrations? #:nodoc:
-      true
-    end
-
-    def supports_primary_key? #:nodoc:
+    def requires_reloading?
       true
     end
 
-    def requires_reloading?
-      true
+    def supports_foreign_keys_in_create?
+      sqlite_version >= "3.6.19"
     end
 
     def supports_views?
@@ -125,10 +139,6 @@ module ArJdbc
       true
     end
 
-    def valid_type?(type)
-      true
-    end
-
     # Returns 62. SQLite supports index names up to 64
     # characters. The rest is used by Rails internally to perform
     # temporary rename operations
@@ -149,45 +159,61 @@ module ArJdbc
       true
     end
 
+    # REFERENTIAL INTEGRITY ====================================
+
+    def disable_referential_integrity # :nodoc:
+      old = query_value("PRAGMA foreign_keys")
+
+      begin
+        execute("PRAGMA foreign_keys = OFF")
+        yield
+      ensure
+        execute("PRAGMA foreign_keys = #{old}")
+      end
+    end
+    
     #--
     # DATABASE STATEMENTS ======================================
     #++
 
     def explain(arel, binds = [])
       sql = "EXPLAIN QUERY PLAN #{to_sql(arel, binds)}"
+      # DIFFERENCE: FQN
       ::ActiveRecord::ConnectionAdapters::SQLite3::ExplainPrettyPrinter.new.pp(exec_query(sql, "EXPLAIN", []))
     end
 
     def exec_query(sql, name = nil, binds = [], prepare: false)
-      type_casted_binds = binds.map { |attr| type_cast(attr.value_for_database) }
-
-      log(sql, name, binds) do
-        # Don't cache statements if they are not prepared
-        unless prepare
-          stmt    = @connection.prepare(sql)
-          begin
-            cols    = stmt.columns
-            unless without_prepared_statement?(binds)
-              stmt.bind_params(type_casted_binds)
+      type_casted_binds = type_casted_binds(binds)
+
+      log(sql, name, binds, type_casted_binds) do
+        ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
+          # Don't cache statements if they are not prepared
+          unless prepare
+            stmt = @connection.prepare(sql)
+            begin
+              cols = stmt.columns
+              unless without_prepared_statement?(binds)
+                stmt.bind_params(type_casted_binds)
+              end
+              records = stmt.to_a
+            ensure
+              stmt.close
             end
+          else
+            cache = @statements[sql] ||= {
+              stmt: @connection.prepare(sql)
+            }
+            stmt = cache[:stmt]
+            cols = cache[:cols] ||= stmt.columns
+            stmt.reset!
+            stmt.bind_params(type_casted_binds)
             records = stmt.to_a
-          ensure
-            stmt.close
           end
-          stmt = records
-        else
-          cache = @statements[sql] ||= {
-              :stmt => @connection.prepare(sql)
-          }
-          stmt = cache[:stmt]
-          cols = cache[:cols] ||= stmt.columns
-          stmt.reset!
-          stmt.bind_params(type_casted_binds)
-        end
 
-        ActiveRecord::Result.new(cols, stmt.to_a)
+          ActiveRecord::Result.new(cols, records)
+        end
       end
-    end
+    end    
 
     def exec_delete(sql, name = 'SQL', binds = [])
       exec_query(sql, name, binds)
@@ -200,7 +226,11 @@ module ArJdbc
     end
 
     def execute(sql, name = nil) #:nodoc:
-      log(sql, name) { @connection.execute(sql) }
+      log(sql, name) do
+        ActiveSupport::Dependencies.interlock.permit_concurrent_loads do
+          @connection.execute(sql)
+        end
+      end
     end
 
     def begin_db_transaction #:nodoc:
@@ -217,80 +247,30 @@ module ArJdbc
 
     # SCHEMA STATEMENTS ========================================
 
-    def tables(name = nil) # :nodoc:
-      ActiveSupport::Deprecation.warn(<<-MSG.squish)
-          #tables currently returns both tables and views.
-          This behavior is deprecated and will be changed with Rails 5.1 to only return tables.
-          Use #data_sources instead.
-      MSG
-
-      if name
-        ActiveSupport::Deprecation.warn(<<-MSG.squish)
-            Passing arguments to #tables is deprecated without replacement.
-        MSG
+    def new_column_from_field(table_name, field) # :nondoc:
+      case field["dflt_value"]
+      when /^null$/i
+        field["dflt_value"] = nil
+      when /^'(.*)'$/m
+        field["dflt_value"] = $1.gsub("''", "'")
+      when /^"(.*)"$/m
+        field["dflt_value"] = $1.gsub('""', '"')
       end
 
-      data_sources
-    end
-
-    def data_sources
-      select_values("SELECT name FROM sqlite_master WHERE type IN ('table','view') AND name <> 'sqlite_sequence'", "SCHEMA")
-    end
-
-    def table_exists?(table_name)
-      ActiveSupport::Deprecation.warn(<<-MSG.squish)
-          #table_exists? currently checks both tables and views.
-          This behavior is deprecated and will be changed with Rails 5.1 to only check tables.
-          Use #data_source_exists? instead.
-      MSG
-
-      data_source_exists?(table_name)
-    end
-
-    def data_source_exists?(table_name)
-      return false unless table_name.present?
-
-      sql = "SELECT name FROM sqlite_master WHERE type IN ('table','view') AND name <> 'sqlite_sequence'"
-      sql << " AND name = #{quote(table_name)}"
-
-      select_values(sql, "SCHEMA").any?
-    end
-
-    def views # :nodoc:
-      select_values("SELECT name FROM sqlite_master WHERE type = 'view' AND name <> 'sqlite_sequence'", "SCHEMA")
-    end
-
-    def view_exists?(view_name) # :nodoc:
-      return false unless view_name.present?
-
-      sql = "SELECT name FROM sqlite_master WHERE type = 'view' AND name <> 'sqlite_sequence'"
-      sql << " AND name = #{quote(view_name)}"
-
-      select_values(sql, "SCHEMA").any?
-    end
-
-    # Returns an array of +Column+ objects for the table specified by +table_name+.
-    def columns(table_name) # :nodoc:
-      table_name = table_name.to_s
-      table_structure(table_name).map do |field|
-        case field["dflt_value"]
-          when /^null$/i
-            field["dflt_value"] = nil
-          when /^'(.*)'$/m
-            field["dflt_value"] = $1.gsub("''", "'")
-          when /^"(.*)"$/m
-            field["dflt_value"] = $1.gsub('""', '"')
-        end
-
-        collation = field["collation"]
-        sql_type = field["type"]
-        type_metadata = fetch_type_metadata(sql_type)
-        new_column(field["name"], field["dflt_value"], type_metadata, field["notnull"].to_i == 0, table_name, nil, collation)
-      end
+      collation = field["collation"]
+      sql_type = field["type"]
+      type_metadata = fetch_type_metadata(sql_type)
+      new_column(field["name"], field["dflt_value"], type_metadata, field["notnull"].to_i == 0, table_name, nil, collation)
     end
 
     # Returns an array of indexes for the given table.
     def indexes(table_name, name = nil) #:nodoc:
+      if name
+        ActiveSupport::Deprecation.warn(<<-MSG.squish)
+            Passing name to #indexes is deprecated without replacement.
+          MSG
+      end
+
       exec_query("PRAGMA index_list(#{quote_table_name(table_name)})", "SCHEMA").map do |row|
         sql = <<-SQL
             SELECT sql
@@ -300,17 +280,17 @@ module ArJdbc
             SELECT sql
             FROM sqlite_temp_master
             WHERE name=#{quote(row['name'])} AND type='index'
-        SQL
+          SQL
         index_sql = exec_query(sql).first["sql"]
         match = /\sWHERE\s+(.+)$/i.match(index_sql)
         where = match[1] if match
         IndexDefinition.new(
-            table_name,
-            row["name"],
-            row["unique"] != 0,
-            exec_query("PRAGMA index_info('#{row['name']}')", "SCHEMA").map { |col|
-              col["name"]
-            }, nil, nil, where)
+          table_name,
+          row["name"],
+          row["unique"] != 0,
+          exec_query("PRAGMA index_info('#{row['name']}')", "SCHEMA").map { |col|
+            col["name"]
+          }, nil, nil, where)
       end
     end
 
@@ -393,14 +373,34 @@ module ArJdbc
       rename_column_indexes(table_name, column.name, new_column_name)
     end
 
-    protected
+    def add_reference(table_name, ref_name, **options) # :nodoc:
+      super(table_name, ref_name, type: :integer, **options)
+    end
+    alias :add_belongs_to :add_reference
+
+    def foreign_keys(table_name)
+      fk_info = exec_query("PRAGMA foreign_key_list(#{quote(table_name)})", "SCHEMA")
+      fk_info.map do |row|
+        options = {
+          column: row["from"],
+          primary_key: row["to"],
+          on_delete: extract_foreign_key_action(row["on_delete"]),
+          on_update: extract_foreign_key_action(row["on_update"])
+        }
+        # DIFFERENCE: FQN
+        ::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new(table_name, row["table"], options)
+      end
+    end
+    
+    private
 
     def table_structure(table_name)
       structure = exec_query("PRAGMA table_info(#{quote_table_name(table_name)})", "SCHEMA")
       raise(ActiveRecord::StatementInvalid, "Could not find table '#{table_name}'") if structure.empty?
       table_structure_with_collation(table_name, structure)
     end
-
+    alias column_definitions table_structure
+    
     def alter_table(table_name, options = {}) #:nodoc:
       altered_table_name = "a#{table_name}"
       caller = lambda { |definition| yield definition if block_given? }
@@ -490,43 +490,51 @@ module ArJdbc
         # Older versions of SQLite return:
         #   column *column_name* is not unique
         when /column(s)? .* (is|are) not unique/, /UNIQUE constraint failed: .*/
-          RecordNotUnique.new(message)
+          # DIFFERENCE: FQN
+          ::ActiveRecord::RecordNotUnique.new(message)
+        when /.* may not be NULL/, /NOT NULL constraint failed: .*/
+          # DIFFERENCE: FQN
+          ::ActiveRecord::NotNullViolation.new(message)
+        when /FOREIGN KEY constraint failed/i
+          # DIFFERENCE: FQN
+          ::ActiveRecord::InvalidForeignKey.new(message)
         else
           super
       end
     end
 
-    private
     COLLATE_REGEX = /.*\"(\w+)\".*collate\s+\"(\w+)\".*/i.freeze
 
     def table_structure_with_collation(table_name, basic_structure)
       collation_hash = {}
-      sql            = "SELECT sql FROM
-                              (SELECT * FROM sqlite_master UNION ALL
-                               SELECT * FROM sqlite_temp_master)
-                            WHERE type='table' and name='#{ table_name }' \;"
+      sql = <<-SQL
+            SELECT sql FROM
+              (SELECT * FROM sqlite_master UNION ALL
+               SELECT * FROM sqlite_temp_master)
+            WHERE type = 'table' AND name = #{quote(table_name)}
+          SQL
 
       # Result will have following sample string
       # CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
       #                       "password_digest" varchar COLLATE "NOCASE");
-      result = exec_query(sql, 'SCHEMA').first
+      result = exec_query(sql, "SCHEMA").first
 
       if result
         # Splitting with left parentheses and picking up last will return all
         # columns separated with comma(,).
-        columns_string = result["sql"].split('(').last
+        columns_string = result["sql"].split("(").last
 
-        columns_string.split(',').each do |column_string|
+        columns_string.split(",").each do |column_string|
           # This regex will match the column name and collation type and will save
           # the value in $1 and $2 respectively.
-          collation_hash[$1] = $2 if (COLLATE_REGEX =~ column_string)
+          collation_hash[$1] = $2 if COLLATE_REGEX =~ column_string
         end
 
         basic_structure.map! do |column|
-          column_name = column['name']
+          column_name = column["name"]
 
           if collation_hash.has_key? column_name
-            column['collation'] = collation_hash[column_name]
+            column["collation"] = collation_hash[column_name]
           end
 
           column
@@ -535,6 +543,23 @@ module ArJdbc
         basic_structure.to_hash
       end
     end
+
+    def create_table_definition(*args)
+      # DIFFERENCE: FQN
+      ::ActiveRecord::ConnectionAdapters::SQLite3::TableDefinition.new(*args)
+    end
+
+    def extract_foreign_key_action(specifier)
+      case specifier
+      when "CASCADE"; :cascade
+      when "SET NULL"; :nullify
+      when "RESTRICT"; :restrict
+      end
+    end
+
+    def configure_connection
+      execute("PRAGMA foreign_keys = ON", "SCHEMA")
+    end
   end
 end
 
@@ -639,50 +664,26 @@ module ActiveRecord::ConnectionAdapters
   # ActiveRecord::ConnectionAdapters::SQLite3Adapter.  Once we can do that we can remove the
   # module SQLite3 above and remove a majority of this file.
   class SQLite3Adapter < AbstractAdapter
-    include ArJdbc::CommonJdbcMethods
+    include ArJdbc::Abstract::Core
     include ArJdbc::SQLite3
+    include ArJdbc::Abstract::DatabaseStatements
+    include ArJdbc::Abstract::StatementCache
+    include ArJdbc::Abstract::TransactionSupport
 
-    # FIXME: Add @connection.encoding then remove this method
-    def encoding
-      select_value 'PRAGMA encoding'
-    end
-
-    def exec_query(sql, name = nil, binds = [], prepare: false)
-      use_prepared = prepare || !without_prepared_statement?(binds)
-
-      if use_prepared
-        type_casted_binds = prepare_binds_for_jdbc(binds)
-        log(sql, name, binds) { @connection.execute_prepared(sql, type_casted_binds) }
-      else
-        log(sql, name) { @connection.execute(sql) }
-      end
-    end
-
-    def exec_update(sql, name = nil, binds = [])
-      use_prepared = !without_prepared_statement?(binds)
-
-      if use_prepared
-        type_casted_binds = prepare_binds_for_jdbc(binds)
-        log(sql, name, binds) { @connection.execute_prepared_update(sql, type_casted_binds) }
-      else
-        log(sql, name) { @connection.execute_update(sql, nil) }
-      end
+    def begin_isolated_db_transaction(isolation)
+      raise ActiveRecord::TransactionIsolationError, 'adapter does not support setting transaction isolation'
     end
-    alias :exec_delete :exec_update
 
-    # Sqlite3 JDBC types in prepared statements seem to report blob as varchar (12).
-    # So to work around this we will pass attribute type in with the value so we can
-    # then remap to appropriate type in JDBC without needing to ask JDBC what type
-    # it should be using.  No one likes a stinking liar...
-    def prepare_binds_for_jdbc(binds)
-      binds.map do |attribute|
-        [attribute.type.type, type_cast(attribute.value_for_database)]
-      end
+    # FIXME: 5.1 crashes without this.  I think this is Arel hitting a fallback path in to_sql.rb.
+    # So maybe an untested code path in their source.  Still means we are doing something wrong to
+    # even hit it.
+    def quote(value, comment=nil)
+      super(value)
     end
 
-    # last two values passed but not used so I cannot alias to exec_query
-    def exec_insert(sql, name, binds, pk = nil, sequence_name = nil)
-      exec_update(sql, name, binds)
+    # FIXME: Add @connection.encoding then remove this method
+    def encoding
+      select_value 'PRAGMA encoding'
     end
 
     def indexes(table_name, name = nil) #:nodoc:

data/lib/arjdbc/tasks/database_tasks.rb

@@ -32,11 +32,9 @@ module ArJdbc
     require 'arjdbc/tasks/h2_database_tasks'
     require 'arjdbc/tasks/hsqldb_database_tasks'
     require 'arjdbc/tasks/mssql_database_tasks'
-    require 'arjdbc/tasks/oracle_database_tasks'
 
     # re-invent built-in (but deprecated on 4.0) tasks :
     register_tasks(/sqlserver/, MSSQLDatabaseTasks)
-    register_tasks(/(oci|oracle)/, OracleDatabaseTasks)
     register_tasks(/mssql/, MSSQLDatabaseTasks) # (built-in) alias
     # tasks for custom (JDBC) adapters :
     register_tasks(/db2/, DB2DatabaseTasks)
@@ -51,4 +49,4 @@ module ArJdbc
     # - while on 2.3/3.x we keep the AR built-in task behavior
 
   end
-end
+end

data/lib/arjdbc/tasks/db2_database_tasks.rb

@@ -82,9 +82,9 @@ module ArJdbc
           ensure
             pk_rs.close
           end
-          primary_keys.each do |name, cols|
+          primary_keys.each do |constraint_name, cols|
             dump << "ALTER TABLE #{connection.quote_table_name(table_name)}\n"
-            dump << "  ADD CONSTRAINT #{name}\n"
+            dump << "  ADD CONSTRAINT #{constraint_name}\n"
             dump << "    PRIMARY KEY (#{cols.join(', ')});\n\n"
           end
         end

data/lib/arjdbc/version.rb

@@ -1,5 +1,5 @@
 module ArJdbc
-  VERSION = "5.0.pre1"
+  VERSION = "51.0"
   # @deprecated
   module Version
     # @private 1.2.x compatibility

data/pom.xml

@@ -12,7 +12,7 @@
   <url>http://github.com/jruby/activerecord-jdbc-adapter/wiki</url>
 
   <properties>
-    <jruby.version>1.6.8</jruby.version>
+    <jruby.version>9.1.6.0</jruby.version>
   </properties>
 
   <issueManagement>
@@ -103,8 +103,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.5.1</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.7</source>
+          <target>1.7</target>
         </configuration>
       </plugin>
     </plugins>

data/rakelib/02-test.rake

@@ -17,15 +17,6 @@ task 'test_postgresql_with_hint' do
   end
 end
 
-task 'test_appraisal_hint' do
-  next if File.exists?('.disable-appraisal-hint')
-  unless (ENV['BUNDLE_GEMFILE'] || '') =~ /gemfiles\/.*?\.gemfile/
-    appraisals = []; Appraisal::File.each { |file| appraisals << file.name }
-    puts "HINT: specify AR version with `rake appraisal:{version} test_{adapter}'" +
-         " where version=(#{appraisals.join('|')}) (`touch .disable-appraisal-hint' to disable)"
-  end
-end
-
 Rake::TestTask.class_eval { attr_reader :test_files }
 
 def test_task_for(adapter, options = {})
@@ -34,9 +25,6 @@ def test_task_for(adapter, options = {})
   adapter = adapter.to_s.downcase
   driver = adapter if ( driver = options[:driver] ).nil?
   prereqs = options[:prereqs] || []
-  unless prereqs.frozen?
-    prereqs = [ prereqs ].flatten; prereqs << 'test_appraisal_hint'
-  end
   name = options[:name] || "test_#{adapter}"
   test_task = Rake::TestTask.new(name => prereqs) do |test_task|
     files = options[:files] || begin

data/rakelib/compile.rake

@@ -11,7 +11,7 @@ begin
   file jar_file => FileList['src/java/**/*.java', 'pkg/classes'] do
     rm_rf FileList["#{classes}/**/*"]
     ant.javac :srcdir => "src/java", :destdir => "pkg/classes",
-      :source => "1.6", :target => "1.6", :debug => true, :deprecation => true,
+      :source => "7", :target => "7", :debug => true, :deprecation => true,
       :classpath => "${java.class.path}:${sun.boot.class.path}:#{driver_jars.join(':')}",
       :includeantRuntime => false
 

data/rakelib/db.rake

@@ -6,6 +6,7 @@ namespace :db do
   task :mysql do
     fail "could not create test database: mysql executable not found" unless mysql = which('mysql')
     load 'test/db/mysql_config.rb' # rescue nil
+    puts MYSQL_CONFIG.inspect if $VERBOSE
     script = sql_script <<-SQL, 'mysql'
 DROP DATABASE IF EXISTS `#{MYSQL_CONFIG[:database]}`;
 CREATE USER #{MYSQL_CONFIG[:username]}@localhost;
@@ -15,13 +16,13 @@ GRANT ALL PRIVILEGES ON `test\_%`.* TO #{MYSQL_CONFIG[:username]}@localhost;
 SET PASSWORD FOR #{MYSQL_CONFIG[:username]}@localhost = PASSWORD('#{MYSQL_CONFIG[:password]}');
 SQL
     params = { '-u' => 'root' }
-    if ENV['DATABASE_YML']
-      require 'yaml'
-      password = YAML.load(File.new(ENV['DATABASE_YML']))["production"]["password"]
-      params['--password'] = password
+    if ENV['DATABASE_YML']; require 'yaml'
+      params['-p'] = YAML.load(File.new(ENV['DATABASE_YML']))["production"]["password"]
     end
+    params['-u'] = ENV['MY_USER'] if ENV['MY_USER']
+    params['-p'] = ENV['MY_PASSWORD'] if ENV['MY_PASSWORD']
     puts "Creating MySQL (test) database: #{MYSQL_CONFIG[:database]}"
-    sh "cat #{script.path} | #{mysql} -f #{params.to_a.join(' ')}", :verbose => $VERBOSE # so password is not echoed
+    sh "cat #{script.path} | #{mysql} -f #{params.map {|k, v| "#{k}#{v}"}.join(' ')}", :verbose => $VERBOSE # so password is not echoed
   end
 
   desc "Creates the test database for PostgreSQL"
@@ -29,6 +30,7 @@ SQL
     fail 'could not create test database: psql executable not found' unless psql = which('psql')
     fail 'could not create test database: missing "postgres" role' unless PostgresHelper.postgres_role?
     load 'test/db/postgres_config.rb' # rescue nil
+    puts POSTGRES_CONFIG.inspect if $VERBOSE
     script = sql_script <<-SQL, 'psql'
 DROP DATABASE IF EXISTS #{POSTGRES_CONFIG[:database]};
 DROP USER IF EXISTS #{POSTGRES_CONFIG[:username]};