ActiveRecord-JDBC 0.2.3 → 0.2.4

data/test/models/auto_id.rb

@@ -1,4 +1,3 @@
-require 'jdbc_adapter'
 require 'rubygems'
 require 'active_record'
 

data/test/models/data_types.rb

@@ -1,19 +1,18 @@
-require 'jdbc_adapter'
-require 'rubygems'
-require 'active_record'
-
-class DbTypeMigration < ActiveRecord::Migration
-  def self.up
-    create_table "db_types", :force => true do |t|
-      t.column :sample_timestamp, :timestamp
-      t.column :sample_decimal, :decimal, :precision=> 15, :scale => 0
-    end
-  end
-
-  def self.down
-    drop_table "db_types"
-  end
-end
-
-class DbType < ActiveRecord::Base
-end
+require 'rubygems'
+require 'active_record'
+
+class DbTypeMigration < ActiveRecord::Migration
+  def self.up
+    create_table "db_types", :force => true do |t|
+      t.column :sample_timestamp, :timestamp
+      t.column :sample_decimal, :decimal, :precision=> 15, :scale => 0
+    end
+  end
+
+  def self.down
+    drop_table "db_types"
+  end
+end
+
+class DbType < ActiveRecord::Base
+end

data/test/models/entry.rb

@@ -1,4 +1,3 @@
-require 'jdbc_adapter'
 require 'rubygems'
 require 'active_record'
 

data/test/mysql_simple_test.rb

@@ -4,12 +4,8 @@
 #   create database weblog_development;
 #   grant all on weblog_development.* to blog@localhost;
 
-
-require 'models/auto_id'
-require 'models/entry'
+require 'jdbc_common'
 require 'db/mysql'
-require 'simple'
-require 'test/unit'
 
 class MysqlSimpleTest < Test::Unit::TestCase
   include SimpleTestMethods

data/test/postgres_simple_test.rb

@@ -0,0 +1,12 @@
+# To run this script, set up the following postgres user and database:
+#
+#   sudo -u postgres createuser -D -A -P blog
+#   sudo -u postgres createdb -O blog weblog_development
+#
+
+require 'jdbc_common'
+require 'db/postgres'
+
+class PostgresSimpleTest < Test::Unit::TestCase
+  include SimpleTestMethods
+end

data/test/simple.rb

@@ -95,10 +95,10 @@ module SimpleTestMethods
   def test_dumping_schema
     require 'active_record/schema_dumper'
     @connection.add_index :entries, :title
-    stio = StringIO.open('', 'w') do |io|
+    StringIO.open do |io|
       ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, io)
+      assert_match(/add_index "entries",/, io.string)
     end
-    assert_match(/add_index "entries",/, stio.string)
     @connection.remove_index :entries, :title
 
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ActiveRecord-JDBC
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
-date: 2007-03-05 00:00:00 -06:00
+  version: 0.2.4
+date: 2007-04-24 00:00:00 -05:00
 summary: JDBC adapter for ActiveRecord, for use within JRuby on Rails.
 require_paths: 
 - lib
@@ -34,10 +34,8 @@ files:
 - README.txt
 - Rakefile
 - LICENSE
-- lib/jdbc_adapter.rb
 - lib/active_record/connection_adapters/jdbc_adapter.rb
 - lib/active_record/connection_adapters/jdbc_adapter_spec.rb
-- lib/active_record/connection_adapters/jndi_adapter.rb
 - lib/jdbc_adapter/jdbc_db2.rb
 - lib/jdbc_adapter/jdbc_derby.rb
 - lib/jdbc_adapter/jdbc_firebird.rb
@@ -47,29 +45,37 @@ files:
 - lib/jdbc_adapter/jdbc_mysql.rb
 - lib/jdbc_adapter/jdbc_oracle.rb
 - lib/jdbc_adapter/jdbc_postgre.rb
-- test/derby_simple_test.rb
-- test/h2_simple_test.rb
-- test/hsqldb_simple_test.rb
-- test/manualTestDatabase.rb
-- test/minirunit.rb
-- test/mysql_simple_test.rb
-- test/simple.rb
+- lib/jdbc_adapter/missing_functionality_helper.rb
+- lib/jdbc_adapter.rb
+- lib/jdbc_adapter_internal.jar
 - test/activerecord/connection_adapters/type_conversion_test.rb
 - test/activerecord/connections/native_jdbc_mysql/connection.rb
 - test/db/derby.rb
 - test/db/h2.rb
 - test/db/hsqldb.rb
+- test/db/jndi_config.rb
 - test/db/logger.rb
 - test/db/mysql.rb
+- test/db/postgres.rb
+- test/derby_simple_test.rb
+- test/h2_simple_test.rb
+- test/hsqldb_simple_test.rb
+- test/jdbc_common.rb
+- test/jndi_test.rb
+- test/manualTestDatabase.rb
 - test/minirunit/testConnect.rb
 - test/minirunit/testH2.rb
 - test/minirunit/testHsqldb.rb
 - test/minirunit/testLoadActiveRecord.rb
 - test/minirunit/testMysql.rb
 - test/minirunit/testRawSelect.rb
+- test/minirunit.rb
 - test/models/auto_id.rb
 - test/models/data_types.rb
 - test/models/entry.rb
+- test/mysql_simple_test.rb
+- test/postgres_simple_test.rb
+- test/simple.rb
 test_files: []
 
 rdoc_options: []

data/lib/active_record/connection_adapters/jndi_adapter.rb

@@ -1,51 +0,0 @@
-require 'active_record/connection_adapters/jdbc_adapter'
-
-module ActiveRecord #:nodoc:
-  class Base #:nodoc:
-    def self.jdbc_connection(config)
-      config.symbolize_keys
-      if config[:jndi]
-        connection = ConnectionAdapters::JndiConnection.new(config)
-      else
-        connection = ConnectionAdapters::JdbcConnection.new(config)
-      end
-      ConnectionAdapters::JdbcAdapter.new(connection, logger, config)
-    end
-  end
-
-  module ConnectionAdapters #:nodoc:
-    
-    # This adapter allows ActiveRecord to use JNDI to retrieve
-    # a JDBC connection from a previously configured DataSource.
-    # The ActiveRecord configuration looks like this:
-    #
-    #       ActiveRecord::Base.establish_connection(
-    #         :adapter => 'jdbc',
-    #         :jndi => 'java:comp/env/jdbc/test',
-	  #					:driver => 'sqlserver'		
-    #       )
-    #
-    # Right now, enough driver information needs to be supplied so that AR-JDBC
-    # can genrate the right flavor of SQL. However, it's not necessary to know
-    # exactly which driver is being used, just enough so the right SQL is generated.
-    #
-    class JndiConnection < JdbcConnection
-
-      def initialize(config)
-        @config = config
-        jndi = @config[:jndi].to_s
-
-        ctx = javax.naming.InitialContext.new
-        ds = ctx.lookup(jndi)
-        @connection = ds.connection
-        set_native_database_types
-
-        @stmts = {}
-      rescue Exception => e
-        raise "The driver encountered an error: #{e}"
-      end
-
-    end
-  end
-end
-