activerecord-jdbc-adapter 1.2.1 → 1.2.2

data/lib/arjdbc/sqlite3/adapter.rb

@@ -147,7 +147,7 @@ module ::ArJdbc
 
     def insert_sql(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = []) #:nodoc:
       sql = substitute_binds(sql, binds)
-      @connection.execute_update(sql)
+      log(sql, name) { @connection.execute_update(sql) }
       id_value || last_insert_id
     end
 
@@ -208,9 +208,12 @@ module ::ArJdbc
     end
 
     def table_structure(table_name)
-      structure = @connection.execute_query("PRAGMA table_info(#{quote_table_name(table_name)})")
-      raise ActiveRecord::StatementInvalid, "Could not find table '#{table_name}'" if structure.empty?
-      structure
+      sql = "PRAGMA table_info(#{quote_table_name(table_name)})"
+      log(sql, 'SCHEMA') { @connection.execute_query(sql) }
+    rescue ActiveRecord::JDBCError => error
+      e = ActiveRecord::StatementInvalid.new("Could not find table '#{table_name}'")
+      e.set_backtrace error.backtrace
+      raise e
     end
 
     def jdbc_columns(table_name, name = nil) #:nodoc:
@@ -283,6 +286,8 @@ module ::ArJdbc
           self.limit   = options[:limit] if options.include?(:limit)
           self.default = options[:default] if include_default
           self.null    = options[:null] if options.include?(:null)
+          self.precision = options[:precision] if options.include?(:precision)
+          self.scale   = options[:scale] if options.include?(:scale)
         end
       end
     end

data/lib/arjdbc/version.rb

@@ -1,6 +1,6 @@
 module ArJdbc
   module Version
-    VERSION = "1.2.1"
+    VERSION = "1.2.2"
   end
 end
 # Compatibility with older versions of ar-jdbc for other extensions out there

data/rakelib/db.rake

@@ -2,26 +2,38 @@ namespace :db do
   desc "Creates the test database for MySQL."
   task :mysql do
     load 'test/db/mysql.rb' rescue nil
-    IO.popen("mysql -u root", "w") do |io|
-      io.puts <<-SQL
+    t = Tempfile.new("mysql")
+    t.puts <<-SQL
 DROP DATABASE IF EXISTS `#{MYSQL_CONFIG[:database]}`;
 CREATE DATABASE `#{MYSQL_CONFIG[:database]}` DEFAULT CHARACTER SET `utf8`;
 GRANT ALL PRIVILEGES ON `#{MYSQL_CONFIG[:database]}`.* TO #{MYSQL_CONFIG[:username]}@localhost;
+GRANT ALL PRIVILEGES ON `test\_%`.* TO #{MYSQL_CONFIG[:username]}@localhost;
 SET PASSWORD FOR #{MYSQL_CONFIG[:username]}@localhost = PASSWORD('#{MYSQL_CONFIG[:password]}');
 SQL
+    t.close
+    at_exit { t.unlink }
+    password = ""
+    if ENV['DATABASE_YML']
+      require 'yaml'
+      password = YAML.load(File.new(ENV['DATABASE_YML']))["production"]["password"]
+      password_arg = " --password=#{password}"
     end
+    sh "cat #{t.path} | mysql -u root#{password_arg}", :verbose => false # so password is not echoed
   end
 
   desc "Creates the test database for PostgreSQL."
   task :postgres do
+    fail unless have_postgres?
     load 'test/db/postgres.rb' rescue nil
-    IO.popen("psql", "w") do |io|
-      io.puts <<-SQL
+    t = Tempfile.new("psql")
+    t.puts <<-SQL
 DROP DATABASE IF EXISTS #{POSTGRES_CONFIG[:database]};
 DROP USER IF EXISTS #{POSTGRES_CONFIG[:username]};
 CREATE USER #{POSTGRES_CONFIG[:username]} CREATEDB SUPERUSER LOGIN PASSWORD '#{POSTGRES_CONFIG[:password]}';
 CREATE DATABASE #{POSTGRES_CONFIG[:database]} OWNER #{POSTGRES_CONFIG[:username]};
 SQL
-    end
+    t.close
+    at_exit { t.unlink }
+    sh "cat #{t.path} | psql -U postgres"
   end
 end

data/src/java/arjdbc/jdbc/RubyJdbcConnection.java

@@ -970,11 +970,13 @@ public class RubyJdbcConnection extends RubyObject {
         return RubyString.newUnicodeString(runtime, string);
     }
 
-    private static final int TABLE_NAME = 3;
 
     protected SQLBlock tableLookupBlock(final Ruby runtime,
             final String catalog, final String schemapat,
             final String tablepat, final String[] types, final boolean downCase) {
+        final int TABLE_SCHEM = 2;
+        final int TABLE_NAME = 3;
+        final int TABLE_TYPE = 4;
         return new SQLBlock() {
             public Object call(Connection c) throws SQLException {
                 ResultSet rs = null;
@@ -982,7 +984,8 @@ public class RubyJdbcConnection extends RubyObject {
                     DatabaseMetaData metadata = c.getMetaData();
                     String clzName = metadata.getClass().getName().toLowerCase();
                     boolean isOracle = clzName.indexOf("oracle") != -1 || clzName.indexOf("oci") != -1;
-                    boolean isDerby = clzName.indexOf("derby") != 1;
+                    boolean isDerby = clzName.indexOf("derby") != -1;
+                    boolean isMssql = clzName.indexOf("sqlserver") != -1 || clzName.indexOf("tds") != -1;
 
                     String realschema = schemapat;
                     String realtablepat = tablepat;
@@ -995,6 +998,7 @@ public class RubyJdbcConnection extends RubyObject {
                     List arr = new ArrayList();
                     while (rs.next()) {
                         String name;
+                        String schema = rs.getString(TABLE_SCHEM) != null ? rs.getString(TABLE_SCHEM).toLowerCase() : null;
 
                         if (downCase) {
                             name = rs.getString(TABLE_NAME).toLowerCase();
@@ -1002,9 +1006,15 @@ public class RubyJdbcConnection extends RubyObject {
                             name = caseConvertIdentifierForRails(metadata, rs.getString(TABLE_NAME));
                         }
                         // Handle stupid Oracle 10g RecycleBin feature
-                        if (!isOracle || !name.startsWith("bin$")) {
-                            arr.add(RubyString.newUnicodeString(runtime, name));
+                        if (isOracle && name.startsWith("bin$")) {
+                            continue;
                         }
+                        // Under mssql, don't return system tables/views unless they're explicitly asked for.
+                        if (isMssql && realschema==null &&
+                            ("sys".equals(schema) || "information_schema".equals(schema))) {
+                            continue;
+                        }
+                        arr.add(RubyString.newUnicodeString(runtime, name));
                     }
                     return runtime.newArray(arr);
                 } finally {

data/src/java/arjdbc/postgresql/PostgresqlRubyJdbcConnection.java

@@ -27,6 +27,10 @@ package arjdbc.postgresql;
 
 import arjdbc.jdbc.RubyJdbcConnection;
 
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
 import org.jruby.runtime.ObjectAllocator;
@@ -49,6 +53,27 @@ public class PostgresqlRubyJdbcConnection extends RubyJdbcConnection {
         return clazz;
     }
 
+    /**
+     * Override jdbcToRuby type conversions to handle infinite timestamps.
+     * Handing timestamp off to ruby as string so adapter can perform type
+     * conversion to timestamp
+     */
+    @Override
+    protected IRubyObject jdbcToRuby(Ruby runtime, int column, int type, 
+                                     ResultSet resultSet)
+        throws SQLException {
+        if(type == Types.TIMESTAMP) {
+            try {
+                return stringToRuby(runtime, resultSet, 
+                                    resultSet.getString(column));
+            } catch(java.io.IOException ioe) {
+                SQLException ex = new SQLException(ioe.getMessage());
+                throw (SQLException) ex.initCause(ioe);
+            }
+        }
+        return super.jdbcToRuby(runtime, column, type, resultSet);
+    }
+
     private static ObjectAllocator POSTGRESQL_JDBCCONNECTION_ALLOCATOR = new ObjectAllocator() {
         public IRubyObject allocate(Ruby runtime, RubyClass klass) {
             return new PostgresqlRubyJdbcConnection(runtime, klass);

data/test/db/jdbc.rb

@@ -1,11 +1,12 @@
 require 'jdbc/mysql'
 
 config = {
-  :username => 'blog',
-  :password => '',
+  # see db/mysql.rb
+  :username => 'arjdbc',
+  :password => 'arjdbc',
   :adapter  => 'jdbc',
   :driver   => 'com.mysql.jdbc.Driver',
-  :url      => 'jdbc:mysql://localhost:3306/weblog_development'
+  :url      => 'jdbc:mysql://localhost:3306/arjdbc_test'
 }
 
 ActiveRecord::Base.establish_connection(config)

data/test/db2_reset_column_information_test.rb

@@ -0,0 +1,8 @@
+#! /usr/bin/env jruby
+
+require 'jdbc_common'
+require 'db/db2'
+
+class DB2ResetColumnInformationTest < Test::Unit::TestCase
+  include ResetColumnInformationTestMethods
+end

data/test/derby_reset_column_information_test.rb

@@ -0,0 +1,8 @@
+#! /usr/bin/env jruby
+
+require 'jdbc_common'
+require 'db/derby'
+
+class DerbyResetColumnInformationTest < Test::Unit::TestCase
+  include ResetColumnInformationTestMethods
+end

data/test/derby_row_locking_test.rb

@@ -0,0 +1,9 @@
+#! /usr/bin/env jruby
+
+require 'jdbc_common'
+require 'db/derby'
+
+class DerbyRowLockingTest < Test::Unit::TestCase
+  include MigrationSetup
+  include RowLockingTestMethods
+end

data/test/derby_simple_test.rb

@@ -96,4 +96,44 @@ class DerbySimpleTest < Test::Unit::TestCase
       end
     end
   end
+
+  def test_data_types
+    # From test/models/data_types.rb, with the modifications as noted in the comments.
+    expected_types = [
+      ["id",                          :integer,   { }],
+      ["sample_timestamp",            :datetime,  { }],   # :timestamp is just an alias for :datetime in Derby
+      ["sample_datetime",             :datetime,  { }],
+      ["sample_date",                 :date,      { }],
+      ["sample_time",                 :time,      { }],
+      ["sample_decimal",              :integer,   { :precision => 15, :scale => 0 }],   # it's an :integer because the :scale is 0 (...right?)
+      ["sample_small_decimal",        :decimal,   { :precision => 3,  :scale => 2 }],
+      ["sample_default_decimal",      :integer,   { }],                 # decimal and integer are the same type in Derby
+      ["sample_float",                :float,     { }],
+      ["sample_binary",               :binary,    { }],
+      ["sample_boolean",              :boolean,   { }],
+      ["sample_string",               :string,    { :default => '' }],
+      ["sample_integer",              :integer,   { }],                 # don't care about the limit
+      ["sample_integer_with_limit_2", :integer,   { }],                 # don't care about the limit
+      ["sample_integer_with_limit_8", :integer,   { }],                 # don't care about the limit
+      ["sample_integer_no_limit",     :integer,   { }],
+      ["sample_integer_neg_default",  :integer,   { :default => -1 }],
+      ["sample_text",                 :text,      { }],
+    ].sort{|a,b| a[0] <=> b[0]}
+
+    column_names = (expected_types.map{|et| et[0]} + DbType.column_names).sort.uniq
+    result = []
+    column_names.each do |column_name|
+      et = expected_types.detect{|t| t[0] == column_name }
+      col = DbType.columns_hash[column_name]
+      if col
+        attrs = et && Hash[et[2].keys.map{|k| [k, col.send(k)]}]
+        result << [col.name, col.type, attrs]
+      else
+        result << [column_name, nil, nil]
+      end
+    end
+    result.sort!{|a,b| a[0] <=> b[0]}
+
+    assert_equal expected_types, result
+  end
 end

data/test/h2_simple_test.rb

@@ -15,8 +15,8 @@ class H2SchemaTest < Test::Unit::TestCase
     @connection.execute("set schema s2");
     CreateUsers.up
     @connection.execute("set schema public");
-    Entry.set_table_name 's1.entries'
-    User.set_table_name 's2.users'
+    Entry.table_name = 's1.entries'
+    User.table_name = 's2.users'
     user = User.create! :login => "something"
     Entry.create! :title => "title", :content => "content", :rating => 123.45, :user => user
   end

data/test/helper.rb

@@ -2,16 +2,29 @@ module Kernel
   def find_executable?(name)
     ENV['PATH'].split(File::PATH_SEPARATOR).detect {|p| File.executable?(File.join(p, name))}
   end
+
+  def have_postgres?
+    if find_executable?("psql")
+      if `psql -c '\\l' -U postgres 2>&1` && $?.exitstatus == 0
+        true
+      else
+        warn "No \"postgres\" role? You might need to execute `createuser postgres -drs' first."
+        false
+      end
+    end
+  end
 end
 
 # assert_queries and SQLCounter taken from rails active_record tests
 require 'test/unit'
 class Test::Unit::TestCase
-  def assert_queries(num = 1)
+  def assert_queries(num = 1, matching = nil)
     ActiveRecord::SQLCounter.log = []
     yield
   ensure
-    assert_equal num, ActiveRecord::SQLCounter.log.size, "#{ActiveRecord::SQLCounter.log.size} instead of #{num} queries were executed.#{ActiveRecord::SQLCounter.log.size == 0 ? '' : "\nQueries:\n#{ActiveRecord::SQLCounter.log.join("\n")}"}"
+    queries = nil
+    ActiveRecord::SQLCounter.log.tap {|log| queries = (matching ? log.select {|s| s =~ matching } : log) }
+    assert_equal num, queries.size, "#{queries.size} instead of #{num} queries were executed.#{queries.size == 0 ? '' : "\nQueries:\n#{queries.join("\n")}"}"
   end
 end
 

data/test/jdbc_common.rb

@@ -16,6 +16,7 @@ require 'models/thing'
 require 'simple'
 require 'has_many_through'
 require 'helper'
+require 'row_locking'
 require 'test/unit'
 
 # Comment/uncomment to enable logging to be loaded for any of the database adapters

data/test/jndi_callbacks_test.rb

@@ -6,32 +6,28 @@ begin
 
 class JndiConnectionPoolCallbacksTest < Test::Unit::TestCase
   def setup
-    @connection = mock "JdbcConnection"
-    @connection.stubs(:jndi_connection?).returns(true)
-    @connection.stubs(:adapter=)
-    @logger = mock "logger"
+    @logger = stub_everything "logger"
     @config = JNDI_CONFIG
+    @connection = ActiveRecord::ConnectionAdapters::JdbcConnection.new @config
     Entry.connection_pool.disconnect!
     assert !Entry.connection_pool.connected?
     class << Entry.connection_pool; public :instance_variable_set; end
   end
 
   def teardown
-    @connection.stubs(:disconnect!)
     Entry.connection_pool.disconnect!
   end
 
   def test_should_call_hooks_on_checkout_and_checkin
-    @connection.stubs(:active?).returns(true)
-    @connection.expects(:disconnect!)
     @adapter = ActiveRecord::ConnectionAdapters::JdbcAdapter.new @connection, @logger, @config
     Entry.connection_pool.instance_variable_set "@connections", [@adapter]
+    assert !@connection.active?
 
-    @connection.expects(:reconnect!)
     Entry.connection_pool.checkout
+    assert @connection.active?
 
-    @connection.expects(:disconnect!)
     Entry.connection_pool.checkin @adapter
+    assert !@connection.active?
   end
 end
 

data/test/manualTestDatabase.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env jruby
 
-if ARGV.length < 2  
+if ARGV.length < 2
   $stderr.puts "syntax: #{__FILE__} [filename] [configuration-name]"
   $stderr.puts "  where filename points to a YAML database configuration file"
   $stderr.puts "  and the configuration name is in this file"
@@ -21,7 +21,7 @@ ActiveRecord::Base.establish_connection(cfg)
 ActiveRecord::Schema.define do
   drop_table :authors rescue nil
   drop_table :author rescue nil
-  
+
   create_table :author, :force => true do |t|
     t.column :name, :string, :null => false
   end
@@ -42,13 +42,13 @@ ActiveRecord::Schema.define do
   change_column_default :author, :female, false if /db2|derby|mssql|firebird/ !~ ARGV[1]
   remove_column :author, :died if /db2|derby/ !~ ARGV[1]
   rename_column :author, :wakeup_time, :waking_time if /db2|derby|mimer/ !~ ARGV[1]
- 
+
   add_index :author, :name, :unique if /db2/ !~ ARGV[1]
   add_index :author, [:age,:female], :name => :is_age_female if /db2/ !~ ARGV[1]
- 
+
   remove_index :author, :name if /db2/ !~ ARGV[1]
   remove_index :author, :name => :is_age_female if /db2/ !~ ARGV[1]
-  
+
   rename_table :author, :authors if /db2|firebird|mimer/ !~ ARGV[1]
 
 
@@ -73,7 +73,7 @@ ActiveRecord::Schema.define do
 end
 
 class Author < ActiveRecord::Base;
-  set_table_name "author" if /db2|firebird|mimer/ =~ ARGV[1]
+  self.table_name = "author" if /db2|firebird|mimer/ =~ ARGV[1]
 end
 
 class Order < ActiveRecord::Base
@@ -83,7 +83,7 @@ end
 class Product < ActiveRecord::Base
   has_many :orders, :through => :line_items
   has_many :line_items
-  
+
   def self.find_products_for_sale
     find(:all, :order => "title")
   end
@@ -95,51 +95,51 @@ class LineItem < ActiveRecord::Base
 end
 
     Product.create(:title => 'Pragmatic Project Automation',
-    :description => 
+    :description =>
     %{<p>
-       <em>Pragmatic Project Automation</em> shows you how to improve the 
-       consistency and repeatability of your project's procedures using 
+       <em>Pragmatic Project Automation</em> shows you how to improve the
+       consistency and repeatability of your project's procedures using
        automation to reduce risk and errors.
       </p>
       <p>
-        Simply put, we're going to put this thing called a computer to work 
-        for you doing the mundane (but important) project stuff. That means 
-        you'll have more time and energy to do the really 
+        Simply put, we're going to put this thing called a computer to work
+        for you doing the mundane (but important) project stuff. That means
+        you'll have more time and energy to do the really
         exciting---and difficult---stuff, like writing quality code.
       </p>},
-    :image_url =>   '/images/auto.jpg',    
+    :image_url =>   '/images/auto.jpg',
     :price => 29.95)
 
 
     Product.create(:title => 'Pragmatic Version Control',
       :description =>
       %{<p>
-         This book is a recipe-based approach to using Subversion that will 
-         get you up and 
-         running quickly---and correctly. All projects need version control: 
-         it's a foundational piece of any project's infrastructure. Yet half 
-         of all project teams in the U.S. don't use any version control at all. 
+         This book is a recipe-based approach to using Subversion that will
+         get you up and
+         running quickly---and correctly. All projects need version control:
+         it's a foundational piece of any project's infrastructure. Yet half
+         of all project teams in the U.S. don't use any version control at all.
          Many others don't use it well, and end up experiencing time-consuming problems.
       </p>},
     :image_url => '/images/svn.jpg',
     :price => 28.50)
-    
+
     # . . .
 
 
     Product.create(:title => 'Pragmatic Unit Testing (C#)',
-    :description => 
+    :description =>
     %{<p>
-        Pragmatic programmers use feedback to drive their development and 
-        personal processes. The most valuable feedback you can get while 
+        Pragmatic programmers use feedback to drive their development and
+        personal processes. The most valuable feedback you can get while
         coding comes from unit testing.
       </p>
       <p>
-        Without good tests in place, coding can become a frustrating game of 
-        "whack-a-mole." That's the carnival game where the player strikes at a 
-        mechanical mole; it retreats and another mole pops up on the opposite side 
-        of the field. The moles pop up and down so fast that you end up flailing 
-        your mallet helplessly as the moles continue to pop up where you least 
+        Without good tests in place, coding can become a frustrating game of
+        "whack-a-mole." That's the carnival game where the player strikes at a
+        mechanical mole; it retreats and another mole pops up on the opposite side
+        of the field. The moles pop up and down so fast that you end up flailing
+        your mallet helplessly as the moles continue to pop up where you least
         expect them.
       </p>},
     :image_url => '/images/utc.jpg',
@@ -148,7 +148,7 @@ end
 
 
 
-1.times do 
+1.times do
   $stderr.print '.'
   Author.destroy_all
   Author.create(:name => "Arne Svensson", :age => 30)
@@ -181,11 +181,11 @@ end
   puts "order: #{order.line_items.inspect}, with id: #{order.id} and name: #{order.name}"
 end
 
-ActiveRecord::Schema.define do 
+ActiveRecord::Schema.define do
     drop_table :line_items
     drop_table :orders
     drop_table :products
 
-  
+
   drop_table((/db2|firebird|mimer/=~ARGV[1]? :author : :authors ))
 end