Ticket #1418: 1455.patch

test/deprecated_associations_test.rb

@@ -311 +311 @@
-  end
-
-  def test_has_many_find_all
-
+
+
+
+
+
+
-    assert_equal 1, Firm.find_first.find_all_in_clients("name = 'Summit'").length
-  end
-

test/connections/native_firebird/connection.rb

@@ +1 @@
+print "Using native Firebird\n"
+require 'fixtures/course'
+require 'logger'
+
+ActiveRecord::Base.logger = Logger.new("debug.log")
+
+db1 = '/db/activerecord_unittest.fdb'
+db2 = '/db/activerecord_unittest2.fdb'
+
+ActiveRecord::Base.establish_connection(
+  :adapter  => "firebird",
+  :host     => "localhost", 
+  :username => "",
+  :password => "",
+  :database => db1
+)
+
+Course.establish_connection(
+  :adapter  => "firebird",
+  :host     => "localhost", 
+  :username => "",
+  :password => "", 
+  :database => db2
+)

test/aaa_create_tables_test.rb

@@ -12 +12 @@
-  
-  def each_statement()
-    statement = ''
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  end
-end
-
@@ -36 +58 @@
-  def run_sql_file(connection, path)
-    sql_file = SqlFile.new(path)
-    sql_file.each_statement { |statement|
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-  end
-
-  def test_table_creation

test/associations_test.rb

@@ -338 +338 @@
-  def test_find_all
-    firm = Firm.find_first
-    assert_equal firm.clients, firm.clients.find_all
-
+
+
+
+
+
+
-    assert_equal 1, firm.clients.find(:all, :conditions => "name = 'Summit'").length
-  end
-
@@ -354 +359 @@
-    firm = Firm.find_first
-    client2 = Client.find(2)
-    assert_equal firm.clients.first, firm.clients.find_first
-
-
+
+
+
+
+
+
-  end
-
-  def test_find_first_sanitized
-    firm = Firm.find_first
-    client2 = Client.find(2)
-
-
-
+
+
+
+
+
+
+
+
+
+
-  end
-
-  def test_find_in_collection

test/base_test.rb

@@ -817 +817 @@
-  end
-
-  def test_count_with_join
-
+
+
+
+
+
+
-    res2 = res + 1
-    assert_nothing_raised do
-
-
+
+
+
+
+
+
-    end
-    assert_equal res, res2
-  end

test/binary_test.rb

@@ -17 +17 @@
-    if ActiveRecord::ConnectionAdapters.const_defined? :OracleAdapter
-      return true if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::OracleAdapter)
-    end
+
+    if ActiveRecord::ConnectionAdapters.const_defined? :FirebirdAdapter
+      return true if ActiveRecord::Base.connection.instance_of?(ActiveRecord::ConnectionAdapters::FirebirdAdapter)
+    end
+
-    bin = Binary.new
-    bin.data = @data
-

test/inheritance_test.rb

@@ -6 +6 @@
-  fixtures :companies, :projects
-
-  def test_a_bad_type_column
-
+
+
+
+
+
+
-    assert_raises(ActiveRecord::SubclassNotFound) { Company.find(100) }
-  end
-

test/fixtures/db_definitions/firebird.sql

@@ +1 @@
+CREATE DOMAIN BOOLEAN AS SMALLINT
+         default 0
+         check (value in (0,1));
+CREATE DOMAIN SERIAL AS INTEGER NOT NULL;
+CREATE DOMAIN TEXT AS BLOB SUB_TYPE TEXT SEGMENT SIZE 80;
+
+CREATE GENERATOR GEN_ACCOUNTS_ID;
+CREATE GENERATOR GEN_AUTO_ID_TESTS_AUTO_ID;
+CREATE GENERATOR GEN_BINARIES_ID;
+CREATE GENERATOR GEN_BOOLEANTESTS_ID;
+CREATE GENERATOR GEN_COLNAMETESTS_ID;
+CREATE GENERATOR GEN_COMMENTS_ID;
+CREATE GENERATOR GEN_COMPANIES_ID;
+CREATE GENERATOR GEN_COMPUTERS_ID;
+CREATE GENERATOR GEN_CUSTOMERS_ID;
+CREATE GENERATOR GEN_DEVELOPERS_ID;
+CREATE GENERATOR GEN_ENTRANTS_ID;
+CREATE GENERATOR GEN_FK_TEST_HAS_FK_ID;
+CREATE GENERATOR GEN_FK_TEST_HAS_PK_ID;
+CREATE GENERATOR GEN_MIXINS_ID;
+CREATE GENERATOR GEN_MOVIES_MOVIEID;
+CREATE GENERATOR GEN_POSTS_ID;
+CREATE GENERATOR GEN_PROJECTS_ID;
+CREATE GENERATOR GEN_TASKS_ID;
+CREATE GENERATOR GEN_TOPICS_ID;
+
+CREATE TABLE ACCOUNTS (ID SERIAL,
+                FIRM_ID INTEGER,
+                CREDIT_LIMIT INTEGER,
+PRIMARY KEY (ID));
+
+CREATE TABLE AUTO_ID_TESTS (AUTO_ID SERIAL,
+                "VALUE" INTEGER,
+PRIMARY KEY (AUTO_ID));
+
+CREATE TABLE BINARIES (ID SERIAL,
+                DATA BLOB,
+PRIMARY KEY (ID));
+
+CREATE TABLE BOOLEANTESTS (ID SERIAL,
+                "VALUE" BOOLEAN,
+PRIMARY KEY (ID));
+
+CREATE TABLE COLNAMETESTS (ID SERIAL,
+                "REFERENCES" INTEGER NOT NULL,
+PRIMARY KEY (ID));
+
+CREATE TABLE COMMENTS (ID SERIAL,
+                POST_ID INTEGER NOT NULL,
+                "TYPE" VARCHAR(255) NOT NULL,
+                BODY TEXT NOT NULL,
+PRIMARY KEY (ID));
+
+CREATE TABLE COMPANIES (ID SERIAL,
+                "TYPE" VARCHAR(50),
+                RUBY_TYPE VARCHAR(50),
+                FIRM_ID INTEGER,
+                NAME VARCHAR(50) NOT NULL,
+                CLIENT_OF INTEGER,
+                RATING INTEGER DEFAULT 1,
+PRIMARY KEY (ID));
+
+CREATE TABLE COMPUTERS (ID SERIAL,
+                DEVELOPER INTEGER NOT NULL,
+                EXTENDEDWARRANTY INTEGER NOT NULL,
+PRIMARY KEY (ID));
+
+CREATE TABLE CUSTOMERS (ID SERIAL,
+                NAME VARCHAR(100),
+                BALANCE INTEGER DEFAULT 0,
+                ADDRESS_STREET VARCHAR(100),
+                ADDRESS_CITY VARCHAR(100),
+                ADDRESS_COUNTRY VARCHAR(100),
+                GPS_LOCATION VARCHAR(100),
+PRIMARY KEY (ID));
+
+CREATE TABLE DEVELOPERS (ID SERIAL,
+                NAME VARCHAR(100),
+                SALARY INTEGER DEFAULT 70000,
+                CRTEATED_AT TIMESTAMP DEFAULT NULL,
+                UPDATED_AT TIMESTAMP DEFAULT NULL,
+PRIMARY KEY (ID));
+
+CREATE TABLE DEVELOPERS_PROJECTS (DEVELOPER_ID INTEGER NOT NULL,
+                PROJECT_ID INTEGER NOT NULL,
+                JOINED_ON DATE);
+
+CREATE TABLE ENTRANTS (ID SERIAL,
+                NAME VARCHAR(255) NOT NULL,
+                COURSE_ID INTEGER NOT NULL,
+PRIMARY KEY (ID));
+
+CREATE TABLE FK_TEST_HAS_FK (ID SERIAL,
+                FK_ID INTEGER NOT NULL,
+PRIMARY KEY (ID));
+
+CREATE TABLE FK_TEST_HAS_PK (ID SERIAL,
+PRIMARY KEY (ID));
+
+ALTER TABLE FK_TEST_HAS_FK (
+FOREIGN KEY (FK_ID) REFERENCES FK_TEST_HAS_PK (ID));
+
+CREATE TABLE MIXINS (ID SERIAL,
+                PARENT_ID INTEGER DEFAULT NULL,
+                POS INTEGER DEFAULT NULL,
+                CREATED_AT TIMESTAMP DEFAULT NULL,
+                UPDATED_AT TIMESTAMP DEFAULT NULL,
+                LFT INTEGER DEFAULT NULL,
+                RGT INTEGER DEFAULT NULL,
+                ROOT_ID INTEGER DEFAULT NULL,
+                "TYPE" VARCHAR(40) DEFAULT NULL,
+PRIMARY KEY (ID));
+
+CREATE TABLE MOVIES (MOVIEID SERIAL,
+                NAME VARCHAR(100),
+PRIMARY KEY (MOVIEID));
+
+CREATE TABLE PEOPLE (ID SERIAL,
+                FIRST_NAME VARCHAR(40) NOT NULL,
+                LOCK_VERSION INTEGER DEFAULT 0 NOT NULL,
+PRIMARY KEY (ID));
+                
+CREATE TABLE POSTS (ID SERIAL,
+                AUTHOR_ID INTEGER,
+                TITLE VARCHAR(255) NOT NULL,
+                "TYPE" VARCHAR(255) NOT NULL,
+                BODY TEXT NOT NULL,
+PRIMARY KEY(ID));
+
+CREATE TABLE PROJECTS (ID SERIAL,
+                NAME VARCHAR(100),
+PRIMARY KEY (ID));
+
+CREATE TABLE SUBSCRIBERS (NICK VARCHAR(100) NOT NULL,
+                NAME VARCHAR(100),
+PRIMARY KEY (NICK));
+
+CREATE TABLE TASKS (ID SERIAL,
+                "STARTING" TIMESTAMP DEFAULT NULL,
+                "ENDING" TIMESTAMP DEFAULT NULL,
+PRIMARY KEY (ID));
+
+CREATE TABLE TOPICS (ID SERIAL,
+                TITLE VARCHAR(255) DEFAULT NULL,
+                AUTHOR_NAME VARCHAR(255) DEFAULT NULL,
+                AUTHOR_EMAIL_ADDRESS VARCHAR(255) DEFAULT NULL,
+                WRITTEN_ON TIMESTAMP DEFAULT NULL,
+                BONUS_TIME TIME DEFAULT NULL,
+                LAST_READ DATE DEFAULT NULL,
+                CONTENT TEXT,
+                APPROVED SMALLINT DEFAULT 1,
+                REPLIES_COUNT INTEGER default 0,
+                PARENT_ID INTEGER DEFAULT NULL,
+                "TYPE" VARCHAR(50) DEFAULT NULL,
+PRIMARY KEY (ID));
+
+SET TERM !!;
+CREATE TRIGGER ACCOUNTS_INSERT FOR ACCOUNTS 
+ACTIVE BEFORE INSERT POSITION 0 
+as
+DECLARE VARIABLE curval INTEGER;
+begin
+  if (new.id is null) then
+    new.id = gen_id(gen_accounts_id, 1);
+  else
+    curval = gen_id(gen_accounts_id, 0);
+    begin
+      if (new.id > curval) then
+        curval = gen_id(gen_accounts_id, new.id - curval);
+    end
+end!!
+
+CREATE TRIGGER AUTO_ID_TESTS_INSERT FOR AUTO_ID_TESTS 
+ACTIVE BEFORE INSERT POSITION 0 
+as
+DECLARE VARIABLE curval INTEGER;
+begin
+  if (new.auto_id is null) then
+    new.auto_id = gen_id(gen_auto_id_tests_auto_id, 1);
+  else
+    curval = gen_id(gen_auto_id_tests_auto_id, 0);
+    begin
+      if (new.auto_id > curval) then
+        curval = gen_id(gen_auto_id_tests_auto_id, new.auto_id - curval);
+    end
+end!!
+ 
+CREATE TRIGGER BINARIES_INSERT FOR BINARIES
+ACTIVE BEFORE INSERT POSITION 0 
+as
+DECLARE VARIABLE curval INTEGER;
+begin
+  if (new.id is null) then
+    new.id = gen_id(gen_binaries_id, 1);
+  else
+    curval = gen_id(gen_binaries_id, 0);
+    begin
+      if (new.id > curval) then
+        curval = gen_id(gen_binaries_id, new.id - curval);
+    end
+end!!
+ 
+CREATE TRIGGER BOOLEANTESTS_INSERT FOR BOOLEANTESTS 
+ACTIVE BEFORE INSERT POSITION 0 
+as
+DECLARE VARIABLE curval INTEGER;
+begin
+  if (new.id is null) then
+    new.id = gen_id(gen_booleantests_id, 1);
+  else
+    curval = gen_id(gen_booleantests_id, 0);
+    begin
+      if (new.id > curval) then
+        curval = gen_id(gen_booleantests_id, new.id - curval);
+    end
+end!!
+ 
+CREATE TRIGGER COLNAMETESTS_INSERT FOR COLNAMETESTS 
+ACTIVE BEFORE INSERT POSITION 0 
+as
+DECLARE VARIABLE curval INTEGER;
+begin
+  if (new.id is null) then
+    new.id = gen_id(gen_colnametests_id, 1);
+  else
+    curval = gen_id(gen_colnametests_id, 0);
+    begin
+      if (new.id > curval) then
+        curval = gen_id(gen_colnametests_id, new.id - curval);
+    end
+end!!
+ 
+CREATE TRIGGER COMMENTS_INSERT FOR COMMENTS 
+ACTIVE BEFORE INSERT POSITION 0 
+as
+DECLARE VARIABLE curval INTEGER;
+begin
+  if (new.id is null) then
+    new.id = gen_id(gen_comments_id, 1);
+  else
+    curval = gen_id(gen_comments_id, 0);
+    begin
+      if (new.id > curval) then
+        curval = gen_id(gen_comments_id, new.id - curval);
+    end
+end!!
+ 
+CREATE TRIGGER COMPANIES_INSERT FOR COMPANIES 
+ACTIVE BEFORE INSERT POSITION 0 
+as
+DECLARE VARIABLE curval INTEGER;
+begin
+  if (new.id is null) then
+    new.id = gen_id(gen_companies_id, 1);
+  else
+    curval = gen_id(gen_companies_id, 0);
+    begin
+      if (new.id > curval) then
+        curval = gen_id(gen_companies_id, new.id - curval);
+    end
+end!!
+ 
+CREATE TRIGGER COMPUTERS_INSERT FOR COMPUTERS 
+ACTIVE BEFORE INSERT POSITION 0 
+as
+DECLARE VARIABLE curval INTEGER;
+begin
+  if (new.id is null) then
+    new.id = gen_id(gen_computers_id, 1);
+  else
+    curval = gen_id(gen_computers_id, 0);
+    begin
+      if (new.id > curval) then
+        curval = gen_id(gen_computers_id, new.id - curval);
+    end
+end!!
+ 
+CREATE TRIGGER CUSTOMERS_INSERT FOR CUSTOMERS
+ACTIVE BEFORE INSERT POSITION 0 
+as
+DECLARE VARIABLE curval INTEGER;
+begin
+  if (new.id is null) then
+    new.id = gen_id(gen_customers_id, 1);
+  else
+    curval = gen_id(gen_customers_id, 0);
+    begin
+      if (new.id > curval) then
+        curval = gen_id(gen_customers_id, new.id - curval);
+    end
+end!!
+ 
+CREATE TRIGGER DEVELOPERS_INSERT FOR DEVELOPERS
+ACTIVE BEFORE INSERT POSITION 0 
+as
+DECLARE VARIABLE curval INTEGER;
+begin
+  if (new.id is null) then
+    new.id = gen_id(gen_developers_id, 1);
+  else
+      curval = gen_id(gen_developers_id, 0);
+    begin
+      if (new.id > curval) then
+        curval = gen_id(gen_developers_id, new.id - curval);
+    end
+end!!
+ 
+CREATE TRIGGER ENTRANTS_INSERT FOR ENTRANTS
+ACTIVE BEFORE INSERT POSITION 0 
+as
+DECLARE VARIABLE curval INTEGER;
+begin
+  if (new.id is null) then
+    new.id = gen_id(gen_entrants_id, 1);
+  else
+      curval = gen_id(gen_entrants_id, 0);
+    begin
+      if (new.id > curval) then
+        curval = gen_id(gen_entrants_id, new.id - curval);
+    end
+end!!
+ 
+CREATE TRIGGER FK_TEST_HAS_FK_INSERT FOR FK_TEST_HAS_FK
+ACTIVE BEFORE INSERT POSITION 0 
+as
+DECLARE VARIABLE curval INTEGER;
+begin
+  if (new.id is null) then
+    new.id = gen_id(gen_fk_test_has_fk_id, 1);
+  else
+      curval = gen_id(gen_fk_test_has_fk_id, 0);
+    begin
+      if (new.id > curval) then
+        curval = gen_id(gen_fk_test_has_fk_id, new.id - curval);
+    end
+end!!
+
+CREATE TRIGGER FK_TEST_HAS_PK_INSERT FOR FK_TEST_HAS_PK
+ACTIVE BEFORE INSERT POSITION 0 
+as
+DECLARE VARIABLE curval INTEGER;
+begin
+  if (new.id is null) then
+    new.id = gen_id(gen_fk_test_has_pk_id, 1);
+  else
+      curval = gen_id(gen_fk_test_has_pk_id, 0);
+    begin
+      if (new.id > curval) then
+        curval = gen_id(gen_fk_test_has_pk_id, new.id - curval);
+    end
+end!!
+ 
+CREATE TRIGGER MIXINS_INSERT FOR MIXINS
+ACTIVE BEFORE INSERT POSITION 0 
+as
+DECLARE VARIABLE curval INTEGER;
+begin
+  if (new.id is null) then
+    new.id = gen_id(gen_mixins_id, 1);
+  else
+      curval = gen_id(gen_mixins_id, 0);
+    begin
+      if (new.id > curval) then
+        curval = gen_id(gen_mixins_id, new.id - curval);
+    end
+end!!
+ 
+CREATE TRIGGER MOVIES_INSERT FOR MOVIES
+ACTIVE BEFORE INSERT POSITION 0 
+as
+DECLARE VARIABLE curval INTEGER;
+begin
+  if (new.id is null) then
+    new.id = gen_id(gen_movies_movieid, 1);
+  else
+      curval = gen_id(gen_movies_movieid, 0);
+    begin
+      if (new.id > curval) then
+        curval = gen_id(gen_movies_movieid, new.id - curval);
+    end
+end!!
+ 
+CREATE TRIGGER PEOPLE_INSERT FOR PEOPLE
+ACTIVE BEFORE INSERT POSITION 0 
+as
+DECLARE VARIABLE curval INTEGER;
+begin
+  if (new.id is null) then
+    new.id = gen_id(gen_people_id, 1);
+  else
+      curval = gen_id(gen_people_id, 0);
+    begin
+      if (new.id > curval) then
+        curval = gen_id(gen_people_id, new.id - curval);
+    end
+end!!
+ 
+CREATE TRIGGER POSTS_INSERT FOR POSTS
+ACTIVE BEFORE INSERT POSITION 0 
+as
+DECLARE VARIABLE curval INTEGER;
+begin
+  if (new.id is null) then
+    new.id = gen_id(gen_posts_id, 1);
+  else
+      curval = gen_id(gen_posts_id, 0);
+    begin
+      if (new.id > curval) then
+        curval = gen_id(gen_posts_id, new.id - curval);
+    end
+end!!
+ 
+CREATE TRIGGER PROJECTS_INSERT FOR PROJECTS 
+ACTIVE BEFORE INSERT POSITION 0 
+as
+DECLARE VARIABLE curval INTEGER;
+begin
+  if (new.id is null) then
+    new.id = gen_id(gen_projects_id, 1);
+  else
+    curval = gen_id(gen_projects_id, 0);
+    begin
+      if (new.id > curval) then
+        curval = gen_id(gen_projects_id, new.id - curval);
+    end
+end!!
+ 
+CREATE TRIGGER TASKS_INSERT FOR TASKS 
+ACTIVE BEFORE INSERT POSITION 0 
+as
+DECLARE VARIABLE curval INTEGER;
+begin
+  if (new.id is null) then
+    new.id = gen_id(gen_tasks_id, 1);
+  else
+    curval = gen_id(gen_tasks_id, 0);
+    begin
+      if (new.id > curval) then
+        curval = gen_id(gen_tasks_id, new.id - curval);
+    end
+end!!
+ 
+CREATE TRIGGER TOPICS_INSERT FOR TOPICS 
+ACTIVE BEFORE INSERT POSITION 0 
+as
+DECLARE VARIABLE curval INTEGER;
+begin
+  if (new.id is null) then
+    new.id = gen_id(gen_topics_id, 1);
+  else
+    curval = gen_id(gen_topics_id, 0);
+    begin
+      if (new.id > curval) then
+        curval = gen_id(gen_topics_id, new.id - curval);
+    end
+end!!
+ 
+COMMIT!!
+SET TERM ;!!

test/fixtures/db_definitions/firebird.drop.sql

@@ +1 @@
+DROP TABLE accounts;
+DROP TABLE auto_id_tests;
+DROP TABLE binaries;
+DROP TABLE booleantests;
+DROP TABLE colnametests;
+DROP TABLE comments;
+DROP TABLE companies;
+DROP TABLE computers;
+DROP TABLE customers;
+DROP TABLE developers;
+DROP TABLE developers_projects;
+DROP TABLE entrants;
+DROP TABLE fk_test_has_fk_id;
+DROP TABLE fk_test_has_pk_id;
+DROP TABLE mixins;
+DROP TABLE movies;
+DROP TABLE people;
+DROP TABLE posts;
+DROP TABLE projects;
+DROP TABLE subscribers;
+DROP TABLE tasks;
+DROP TABLE topics;
+
+DROP GENERATOR GEN_ACCOUNTS_ID;
+DROP GENERATOR GEN_AUTO_ID_TESTS_AUTO_ID;
+DROP GENERATOR GEN_BINARIES_ID;
+DROP GENERATOR GEN_BOOLEANTESTS_ID;
+DROP GENERATOR GEN_COLNAMETESTS_ID;
+DROP GENERATOR GEN_COMMENTS_ID;
+DROP GENERATOR GEN_COMPANIES_ID;
+DROP GENERATOR GEN_COMPUTERS_ID;
+DROP GENERATOR GEN_CUSTOMERS_ID;
+DROP GENERATOR GEN_DEVELOPERS_ID;
+DROP GENERATOR GEN_ENTRANTS_ID;
+DROP GENERATOR GEN_MIXINS_ID;
+DROP GENERATOR GEN_MOVIES_MOVIEID;
+DROP GENERATOR GEN_POSTS_ID;
+DROP GENERATOR GEN_PROJECTS_ID;
+DROP GENERATOR GEN_TOPICS_ID;
+

test/fixtures/db_definitions/firebird2.sql

@@ +1 @@
+CREATE DOMAIN BOOLEAN AS SMALLINT
+         default 0
+         check (value in (0,1));
+CREATE DOMAIN SERIAL AS INTEGER NOT NULL;
+CREATE DOMAIN TEXT AS BLOB SUB_TYPE TEXT SEGMENT SIZE 80;
+
+CREATE GENERATOR GEN_COURSES_ID;
+
+CREATE TABLE COURSES (ID SERIAL,
+                NAME VARCHAR(255),
+PRIMARY KEY (ID));
+
+SET TERM !!;
+CREATE TRIGGER COURSES_INSERT FOR COURSES
+ACTIVE BEFORE INSERT POSITION 0 
+as
+DECLARE VARIABLE curval INTEGER;
+begin
+  if (new.id is null) then
+    new.id = gen_id(gen_courses_id, 1);
+  else
+    curval = gen_id(gen_courses_id, 0);
+    begin
+      if (new.id > curval) then
+        curval = gen_id(gen_courses_id, new.id - curval);
+    end
+end!!
+
+COMMIT!!
+SET TERM ;!!

test/fixtures/db_definitions/firebird2.drop.sql

@@ +1 @@
+DROP TABLE courses;
+
+DROP GENERATOR GEN_COURSES_ID;
+

test/fixtures/company.rb

@@ -6 +6 @@
-
-
-class Firm < Company
-
+
+
+
+
+
+
-  has_many :clients_sorted_desc, :class_name => "Client", :order => "id DESC"
-  has_many :clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id"
-  has_many :clients_like_ms, :conditions => "name = 'Microsoft'", :class_name => "Client", :order => "id"

Rakefile

@@ -22 +22 @@
-
-
-desc "Default Task"
-
+, :test_firebird
-
-# Run the unit tests
-
@@ -38 +38 @@
-  t.verbose = true
-}
-
-
+firebird 
-  Rake::TestTask.new("test_#{adapter}") { |t|
-    t.libs << "test" << "test/connections/native_#{adapter}"
-    t.pattern = "test/*_test{,_#{adapter}}.rb"

lib/active_record/validations.rb

@@ -469 +469 @@
-
-        if scope = configuration[:scope]
-          validates_each(attr_names,configuration) do |record, attr_name, value|
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        else
-          validates_each(attr_names,configuration) do |record, attr_name, value|
-            record.errors.add(attr_name, configuration[:message]) if record.class.find_first(record.new_record? ? ["#{attr_name} = ?", record.send(attr_name)] : ["#{attr_name} = ? AND #{record.class.primary_key} <> ?", record.send(attr_name), record.send(:id) ] )

lib/active_record/connection_adapters/abstract_adapter.rb

@@ -349 +349 @@
-        'Abstract'
-      end
-
+      def parameterized_primary_key()
+        nil
+      end
+
-      # Returns a string of the CREATE TABLE SQL statements for recreating the entire structure of the database.
-      def structure_dump() end
-

lib/active_record/connection_adapters/firebird_adapter.rb

@@ +1 @@
+# firebird_adapter.rb
+# author: John W Higgins <develop@wishdev.com>
+# based on the interbase adapter work of Kazuhiro Yoshida <moriq@moriq.com>
+# some parts "borrowed" from Luke Holden's <lholden@cablelan.net> postgresql_adaptor.rb
+
+require 'active_record/connection_adapters/abstract_adapter'
+require 'parsedate'
+require 'active_record/vendor/firebird'
+require 'time'
+
+module ActiveRecord
+  class Base
+    def self.firebird_connection(config) # :nodoc:
+      require 'redbird'
+      symbolize_strings_in_hash(config)
+      if config.has_key?(:database)
+        database = config[:database]
+      else
+        raise ArgumentError, "No database specified. Missing argument: database."
+      end
+      username = config[:username] ? config[:username].to_s : 'SYSDBA'
+      password = config[:password] ? config[:password].to_s : 'masterkey'
+      charset  = config[:charset]
+      conn = Redbird::connect(database, username, password, charset)
+      ConnectionAdapters::FirebirdAdapter.new(
+        conn, logger
+      )
+    end
+  end
+
+  module ConnectionAdapters
+    class FirebirdAdapter < AbstractAdapter # :nodoc:
+      class FirebirdColumn < Column #:nodoc:
+
+        def initialize(name, default, sql_type, subtype, scale, precision, length)
+          @name, @scale, @precision, @limit = name, scale, precision, length
+          @sql_type = Firebird::blr_type(sql_type, subtype)
+          @type = Firebird::ruby_type(@sql_type)
+          @default = type_cast default
+          @parms = Array.new()
+        end
+
+        def type_cast(value)
+          return nil if value.nil? || value =~ /^\s*null\s*$/i
+          case @type
+          when :integer 
+            case value
+            when FalseClass
+              0
+            when TrueClass
+              1
+            else
+              value.to_i
+            end
+          when :float
+            value.to_f
+          when :timestamp
+            cast_to_time(value)
+          when :time
+            cast_to_time(value)
+          when :date
+            cast_to_date(value)
+          else
+            value
+          end
+        end
+
+        def cast_to_date(value)
+          return value if value.is_a? Date
+          return Date.new(value.year, value.month, value.day) if value.is_a? Time
+          return Date.parse(value) if value.is_a? String
+        end
+
+        def cast_to_time(value)
+          return value if value.is_a? Time
+          time_array = ParseDate.parsedate value
+          time_array[0] ||= 2000; time_array[1] ||= 1; time_array[2] ||= 1;
+          Time.send Base.default_timezone, *time_array
+        end
+      end
+    end
+
+    class FirebirdAdapter < AbstractAdapter # :nodoc:
+      attr_accessor :parms
+
+      @@keywords = ['type', 'starting', 'ending']
+      
+      def select_all(sql, name = nil)
+        select(sql, name)
+      end
+      
+      def select_one(sql, name = nil)
+        result = select(sql, name)
+        result.nil? ? nil : result.first
+      end
+
+      def columns(table_name, name = nil)
+        table_structure(table_name, name).inject([]) do |columns, (field_name, type, default, length, 
+                                                                   precision, scale, subtype)|
+          columns << FirebirdColumn.new(field_name, default, type, subtype, scale, precision, length)
+          columns
+        end
+      end
+
+      def execute(sql, name = nil, parms = nil)
+        log(sql, name, @connection) { |connection| connection.execute(sql, parms) }
+      end
+
+      def insert(sql, name = nil, pk = nil, id_value = nil)
+        if pk.nil? # Who called us? What does the sql look like? No idea!
+          execute sql, name
+        elsif id_value # Pre-assigned id
+          log(sql, name, @connection) { @connection.execute sql }
+        else # Assume the sql contains a bind-variable for the id
+          table = sql.split(" ", 4)[2]
+          id_value = insert_id(table, pk)
+          log(sql, name, @connection) { @connection.execute(sql, id_value) }
+          id_value
+        end
+      end
+
+      def update(sql, name = nil)
+        log(sql, name, @connection) { @connection.execute(sql, @parms) }
+        @connection.rows_affected
+      end
+
+      def delete(sql, name = nil)
+        execute(sql, name)
+        @connection.rows_affected
+      end
+
+      def begin_db_transaction()
+        # auto-start
+      end
+
+      def commit_db_transaction
+        @connection.commit
+      end
+
+      def rollback_db_transaction
+        @connection.rollback
+      end
+
+      def quote(value, column = nil)
+        case value
+        when String
+          if column
+            case column.type
+            when :date
+              value, timestr = value.split(/ /, 2)
+            when :time
+              datestr, value = value.split(/ /, 2)
+            when :binary
+              value = ''
+            end
+          end
+          "'#{quote_string(value)}'" # ' (for ruby-mode)
+        when NilClass
+          "NULL"
+        when TrueClass
+          (column && column.class == :boolean) ? "'t'" : "1"
+        when FalseClass
+          (column && column.class == :boolean) ? "'f'" : "0"
+        when Float, Fixnum, Bignum
+          "#{value.to_s}"
+        when Date
+          format = 
+            if column && column.type == :timestamp
+              "%Y-%m-%d %H:%M:%S"
+            else
+              "%Y-%m-%d"
+            end
+          "'#{value.strftime(format)}'"
+        when Time
+          format = 
+            if column && column.type == :time
+              "%H:%M:%S"
+            elsif column && column.type == :timestamp
+              "%Y-%m-%d %H:%M:%S"
+            else
+              "%Y-%m-%d %H:%M:%S"
+            end
+          "'#{value.strftime(format)}'"
+        when DateTime
+          format =
+            if column
+              case column.class
+              when :date
+                "%Y-%m-%d"
+              when :time
+                "%H:%M:%S"
+              else
+                "%Y-%m-%d %H:%M:%S"
+              end
+            else
+              "%Y-%m-%d %H:%M:%S"
+            end
+          "'#{value.strftime(format)}'"
+        else 
+          "'#{quote_string(value.to_yaml)}'"
+        end
+      end
+
+      def quote_string(s)
+        s.gsub(/'/, "''") # ' (for ruby-mode)
+      end
+
+      def quote_column_name(name)
+        %Q("#{name.upcase}")
+      end
+
+      def add_limit_with_offset!(sql, limit, offset)
+        if /\A\s*SELECT\s+/i=~sql 
+          sql[$~.end(0), 0] = "FIRST #{limit} SKIP #{offset} "
+        end 
+      end
+
+      def add_limit_without_offset!(sql, limit)
+        if /\A\s*SELECT\s+/i=~sql 
+          sql[$~.end(0), 0] = "FIRST #{limit} "
+        end 
+      end
+
+      def adapter_name()
+        "Firebird"
+      end
+
+      def parameterized_primary_key()
+        "?"
+      end
+
+      def quote_keywords(colname)
+        @@keywords.include?(colname.downcase) ? "\"" + colname.upcase + "\"" : colname.upcase
+      end
+
+      def unquote_keywords(colname)
+        colname.gsub(/\"/, '').downcase
+      end
+
+