activerecord-jdbc-adapter 1.2.8 → 1.2.9

data/src/java/arjdbc/mssql/MssqlRubyJdbcConnection.java

@@ -1,127 +1,40 @@
 /*
- **** BEGIN LICENSE BLOCK *****
- * Copyright (c) 2006-2010 Nick Sieger <nick@nicksieger.com>
- * Copyright (c) 2006-2007 Ola Bini <ola.bini@gmail.com>
- * Copyright (c) 2008-2009 Thomas E Enebo <enebo@acm.org>
+ * The MIT License
  *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
+ * Copyright 2013 Karol Bucek.
  *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- ***** END LICENSE BLOCK *****/
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
 package arjdbc.mssql;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.List;
-
-import arjdbc.jdbc.RubyJdbcConnection;
-import static arjdbc.jdbc.RubyJdbcConnection.ColumnData;
-
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
-import org.jruby.RubyString;
-import org.jruby.runtime.ObjectAllocator;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
 
 /**
- *
- * @author nicksieger
+ * @see MSSQLRubyJdbcConnection
+ * @deprecated only for Java API backwards-compatibility
  */
-public class MssqlRubyJdbcConnection extends RubyJdbcConnection {
-
-    private RubyString _row_num;
-
+@Deprecated
+public class MssqlRubyJdbcConnection extends MSSQLRubyJdbcConnection {
+    
     protected MssqlRubyJdbcConnection(Ruby runtime, RubyClass metaClass) {
         super(runtime, metaClass);
-        _row_num = runtime.newString("_row_num");
-    }
-
-    public static RubyClass createMssqlJdbcConnectionClass(Ruby runtime, RubyClass jdbcConnection) {
-        RubyClass clazz = RubyJdbcConnection.getConnectionAdapters(runtime).defineClassUnder("MssqlJdbcConnection",
-                jdbcConnection, MSSQL_JDBCCONNECTION_ALLOCATOR);
-        clazz.defineAnnotatedMethods(MssqlRubyJdbcConnection.class);
-
-        return clazz;
-    }
-
-    private static ObjectAllocator MSSQL_JDBCCONNECTION_ALLOCATOR = new ObjectAllocator() {
-        public IRubyObject allocate(Ruby runtime, RubyClass klass) {
-            return new MssqlRubyJdbcConnection(runtime, klass);
-        }
-    };
-
-    protected static IRubyObject booleanToRuby(Ruby runtime, ResultSet resultSet, boolean booleanValue)
-            throws SQLException {
-        if (booleanValue == false && resultSet.wasNull()) return runtime.getNil();
-        return runtime.newBoolean(booleanValue);
-    }
-
-    /**
-     * Treat LONGVARCHAR as CLOB on Mssql for purposes of converting a JDBC value to Ruby.
-     * Treat BOOLEAN/BIT as Boolean, rather than the default behaviour of conversion to string
-     */
-    @Override
-    protected IRubyObject jdbcToRuby(Ruby runtime, int column, int type, ResultSet resultSet)
-            throws SQLException {
-        if ( Types.BOOLEAN == type || Types.BIT == type ) {
-          return booleanToRuby(runtime, resultSet, resultSet.getBoolean(column));
-        }
-        if (type == Types.LONGVARCHAR) {
-            type = Types.CLOB;
-        }
-        return super.jdbcToRuby(runtime, column, type, resultSet);
-    }
-
-    /**
-     * Microsoft SQL 2000+ support schemas
-     */
-    @Override
-    protected boolean databaseSupportsSchemas() {
-        return true;
-    }
-
-    @Override
-    protected void populateFromResultSet(ThreadContext context, Ruby runtime, List results,
-                                         ResultSet resultSet, ColumnData[] columns) throws SQLException {
-        super.populateFromResultSet(context, runtime, results, resultSet, filterRowNumFromColumns(columns));
-    }
-
-    /**
-     * Filter out the <tt>_row_num</tt> column from results.
-     */
-    private ColumnData[] filterRowNumFromColumns(ColumnData[] columns) {
-        for (int i = 0; i < columns.length; i++) {
-            if (columns[i].name.equals(_row_num)) {
-                ColumnData[] filtered = new ColumnData[columns.length - 1];
-                if (i > 0) {
-                    System.arraycopy(columns, 0, filtered, 0, i);
-                }
-
-                if (i + 1 < columns.length) {
-                    System.arraycopy(columns, i + 1, filtered, i, columns.length - (i + 1));
-                }
-
-                return filtered;
-            }
-        }
-
-        return columns;
     }
+    
 }

data/test/db/mssql.rb

@@ -1,11 +1,11 @@
 require 'jdbc_common'
 
-MSSQL_CONFIG = {
-  :username => 'blog',
-  :password => '',
-  :adapter  => 'mssql',
-  :database => 'weblog_development'
-}
-MSSQL_CONFIG[:host] = ENV['SQLHOST'] if ENV['SQLHOST']
+MSSQL_CONFIG = { :adapter  => 'mssql' }
+MSSQL_CONFIG[:database] = ENV['SQLDATABASE'] || 'weblog_development'
+MSSQL_CONFIG[:username] = ENV['SQLUSER'] || 'blog'
+MSSQL_CONFIG[:password] = ENV['SQLPASS'] || ''
 
-ActiveRecord::Base.establish_connection(MSSQL_CONFIG)
+MSSQL_CONFIG[:host] = ENV['SQLHOST'] || 'localhost'
+MSSQL_CONFIG[:port] = ENV['SQLPORT'] if ENV['SQLPORT']
+
+ActiveRecord::Base.establish_connection(MSSQL_CONFIG)

data/test/db2_simple_test.rb

@@ -1,8 +1,15 @@
 require 'jdbc_common'
 require 'db/db2'
 
+DbTypeMigration.big_decimal_precision = 31
+
 class DB2SimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
+  include ActiveRecord3TestMethods
+  include DirtyAttributeTests
+  include XmlColumnTests
+  
+  def xml_sql_type; 'XML'; end
 
   # For backwards compatibility with how the DB2 code in
   # jdbc_adapter 0.9.x handled booleans.

data/test/models/entry.rb

@@ -2,10 +2,10 @@ class CreateEntries < ActiveRecord::Migration
   def self.up
     create_table "entries", :force => true do |t|
       t.column :title, :string, :limit => 100
-      t.column :updated_on, :datetime
       t.column :content, :text
       t.column :rating, :decimal, :precision => 10, :scale => 2
       t.column :user_id, :integer
+      t.column :updated_on, :datetime # treated as date "_on" convention
     end
   end
 
@@ -26,6 +26,7 @@ class CreateUsers < ActiveRecord::Migration
   def self.up
     create_table "users", :force => true do |t|
       t.column :login, :string, :limit => 100, :null => false
+      t.timestamps # created_at / updated_at
     end
   end
 

data/test/mssql_binary_test.rb

@@ -0,0 +1,6 @@
+require 'db/mssql'
+require 'binary'
+
+class MSSQLBinaryTest < Test::Unit::TestCase
+  include BinaryTestMethods
+end

data/test/mssql_db_create_test.rb

@@ -18,8 +18,11 @@ class MysqlDbCreateTest < Test::Unit::TestCase
       end
     end
     ActiveRecord::Base.establish_connection(db_config.merge(:database => "master"))
-    select = "SELECT NAME FROM sys.sysdatabases"
-    select = "SELECT name FROM master..sysdatabases ORDER BY name" if ActiveRecord::Base.connection.sqlserver_version == "2000"
+    if ActiveRecord::Base.connection.send(:sqlserver_2000?)
+      select = "SELECT name FROM master..sysdatabases ORDER BY name"
+    else
+      select = "SELECT name FROM sys.sysdatabases"
+    end
     databases = ActiveRecord::Base.connection.select_rows(select).flatten
     assert databases.include?(@db_name)
   end

data/test/mssql_identity_insert_test.rb

@@ -1,8 +1,7 @@
 require 'jdbc_common'
 require 'db/mssql'
 
-class MsSQLIdentityInsertTest < Test::Unit::TestCase
-
+class MSSQLIdentityInsertTest < Test::Unit::TestCase
   include MigrationSetup
   
   def test_enable_identity_insert_when_necessary

data/test/mssql_ignore_system_views_test.rb

@@ -1,8 +1,7 @@
 require 'jdbc_common'
 require 'db/mssql'
 
-class IgnoreSystemViewsTest < Test::Unit::TestCase
-
+class MSSQLIgnoreSystemViewsTest < Test::Unit::TestCase
   include MigrationSetup
 
   def test_system_views_ignored
@@ -23,8 +22,9 @@ class IgnoreSystemViewsTest < Test::Unit::TestCase
 
   private
 
-    def table_exists?(*args)
-      !!ActiveRecord::Base.connection.table_exists?(*args)
-    end
+  def table_exists?(*args)
+    ActiveRecord::Base.connection.table_exists?(*args)
+  end
+    
 end
 

data/test/mssql_limit_offset_test.rb

@@ -1,88 +1,84 @@
 require 'jdbc_common'
 require 'db/mssql'
 
-ActiveRecord::Schema.verbose = false
+class MSSQLLimitOffsetTest < Test::Unit::TestCase
 
-class CreateLegacyShips < ActiveRecord::Migration
+  class CreateLegacyShips < ActiveRecord::Migration
 
-  def self.up
-    create_table "legacy_ships",{:primary_key => :ShipKey} do |t|
-      t.string "name", :limit => 50, :null => false
-      t.integer "width", :default => 123
-      t.integer "length", :default => 456
+    def self.up
+      create_table "legacy_ships",{:primary_key => :ShipKey} do |t|
+        t.string "name", :limit => 50, :null => false
+        t.integer "width", :default => 123
+        t.integer "length", :default => 456
+      end
+    end
+
+    def self.down
+      drop_table "legacy_ships"
     end
-  end
 
-  def self.down
-    drop_table "legacy_ships"
   end
 
-end
+  class LegacyShip < ActiveRecord::Base
+    self.primary_key = "ShipKey"
+  end
 
-class LegacyShip < ActiveRecord::Base
-  self.primary_key = "ShipKey"
-end
+  class CreateLongShips < ActiveRecord::Migration
 
-class CreateLongShips < ActiveRecord::Migration
+    def self.up
+      create_table "long_ships", :force => true do |t|
+        t.string "name", :limit => 50, :null => false
+        t.integer "width", :default => 123
+        t.integer "length", :default => 456
+      end
+    end
 
-  def self.up
-    create_table "long_ships", :force => true do |t|
-      t.string "name", :limit => 50, :null => false
-      t.integer "width", :default => 123
-      t.integer "length", :default => 456
+    def self.down
+      drop_table "long_ships"
     end
-  end
 
-  def self.down
-    drop_table "long_ships"
   end
 
-end
+  class LongShip < ActiveRecord::Base
+    has_many :vikings
+  end
 
-class LongShip < ActiveRecord::Base
-  has_many :vikings
-end
+  class CreateVikings < ActiveRecord::Migration
 
-class CreateVikings < ActiveRecord::Migration
+    def self.up
+      create_table "vikings", :force => true do |t|
+        t.integer "long_ship_id", :null => false
+        t.string "name", :limit => 50, :default => "Sven"
+      end
+    end
 
-  def self.up
-    create_table "vikings", :force => true do |t|
-      t.integer "long_ship_id", :null => false
-      t.string "name", :limit => 50, :default => "Sven"
+    def self.down
+      drop_table "vikings"
     end
-  end
 
-  def self.down
-    drop_table "vikings"
   end
 
-end
+  class Viking < ActiveRecord::Base
+    belongs_to :long_ship
+  end
 
-class Viking < ActiveRecord::Base
-  belongs_to :long_ship
-end
 
+  class CreateNoIdVikings < ActiveRecord::Migration
+    def self.up
+      create_table "no_id_vikings", :force => true do |t|
+        t.string "name", :limit => 50, :default => "Sven"
+      end
+      remove_column "no_id_vikings", "id"
+    end
 
-class CreateNoIdVikings < ActiveRecord::Migration
-  def self.up
-    create_table "no_id_vikings", :force => true do |t|
-      t.string "name", :limit => 50, :default => "Sven"
+    def self.down
+      drop_table "no_id_vikings"
     end
-    remove_column "no_id_vikings", "id"
   end
 
-  def self.down
-    drop_table "no_id_vikings"
+  class NoIdViking < ActiveRecord::Base
   end
-end
-
-class NoIdViking < ActiveRecord::Base
-end
-
-
-
-class MsSQLLimitOffsetTest < Test::Unit::TestCase
-
+  
   def setup
     CreateLegacyShips.up
     CreateLongShips.up

data/test/mssql_multibyte_test.rb

@@ -2,8 +2,7 @@
 require 'jdbc_common'
 require 'db/mssql'
 
-class MsSQLMultibyteTest < Test::Unit::TestCase
-  
+class MSSQLMultibyteTest < Test::Unit::TestCase
   include MultibyteTestMethods
 
   def test_select_multibyte_string

data/test/mssql_row_locking_test.rb

@@ -1,7 +1,7 @@
 require 'jdbc_common'
 require 'db/mssql'
 
-class MssqlRowLockingTest < Test::Unit::TestCase
+class MSSQLRowLockingTest < Test::Unit::TestCase
   include MigrationSetup
   include RowLockingTestMethods
 end

data/test/mssql_simple_test.rb

@@ -1,12 +1,12 @@
 require 'jdbc_common'
 require 'db/mssql'
 
-class MsSQLSimpleTest < Test::Unit::TestCase
-
+class MSSQLSimpleTest < Test::Unit::TestCase
   include SimpleTestMethods
+  include ActiveRecord3TestMethods
+  include DirtyAttributeTests
 
-  # MS SQL 2005 doesn't have a DATE class, only TIMESTAMP.
-  undef_method :test_save_date
+  # MS SQL 2005 doesn't have a DATE class, only TIMESTAMP
 
   # String comparisons are insensitive by default
   undef_method :test_validates_uniqueness_of_strings_case_sensitive
@@ -21,7 +21,6 @@ class MsSQLSimpleTest < Test::Unit::TestCase
   end
 
   def test_change_column_default
-
     Entry.connection.change_column "entries", "title", :string, :default => "new default"
     Entry.reset_column_information
     assert_equal("new default", Entry.new.title)
@@ -29,11 +28,9 @@ class MsSQLSimpleTest < Test::Unit::TestCase
     Entry.connection.change_column "entries", "title", :string, :default => nil
     Entry.reset_column_information
     assert_equal(nil, Entry.new.title)
-
   end
 
   def test_change_column_nullability
-    
     Entry.connection.change_column "entries", "title", :string, :null => true
     Entry.reset_column_information
     title_column = Entry.columns.find { |c| c.name == "title" }
@@ -43,13 +40,12 @@ class MsSQLSimpleTest < Test::Unit::TestCase
     Entry.reset_column_information
     title_column = Entry.columns.find { |c| c.name == "title" }
     assert(!title_column.null)
-
   end
 
   # ACTIVERECORD_JDBC-124
   def test_model_does_not_have_row_num_column
     entry = Entry.first
-    assert !entry.attributes.keys.include?("_row_num")
-    assert !entry.respond_to?(:_row_num)
+    assert_false entry.attributes.keys.include?("_row_num")
+    assert_false entry.respond_to?(:_row_num)
   end
 end