odbc-rails 1.3 → 1.4

data/test/connections/native_odbc/connection.rb

@@ -1,5 +1,5 @@
 #
-#  $Id: connection.rb,v 1.4 2006/10/09 07:25:07 source Exp $
+#  $Id: connection.rb,v 1.5 2007/02/27 11:00:49 source Exp $
 #
 #  OpenLink ODBC Adapter for Ruby on Rails
 #  Copyright (C) 2006 OpenLink Software
@@ -28,68 +28,87 @@ print "Using native ODBC\n"
 require_dependency 'fixtures/course'
 require 'logger'
 
-#ActiveRecord::Base.logger = Logger.new(STDOUT)
-#ActiveRecord::Base.logger = Logger.new("debug_odbc.log")
+RAILS_DEFAULT_LOGGER = Logger.new("debug_odbc.log")
 #Logger level default is the lowest available, Logger::DEBUG
-#ActiveRecord::Base.logger.level = Logger::WARN
-ActiveRecord::Base.colorize_logging = false
+#RAILS_DEFAULT_LOGGER.level = Logger::WARN
+RAILS_DEFAULT_LOGGER.colorize_logging = false
+ActiveRecord::Base.logger = RAILS_DEFAULT_LOGGER
 
-ActiveRecord::Base.establish_connection(
-  :adapter  => "odbc",
-  :dsn	    => "a604-ora10-alice-testdb1",
-  :username => "oracle",
-  :password => "oracle",
-  :trace => true
-)
+ActiveRecord::Base.configurations = {
+  'arunit' => {
+    :adapter  => "odbc",
+    :dsn      => "a609_ora10_alice_test1",
+    :username => "scott",
+    :password => "tiger",
+    :emulate_booleans => true,
+    :trace    => false
+  },
+ 'arunit2' => {
+    :adapter  => "odbc",
+    :dsn      => "a609_ora10_alice_test1",
+    :username => "scott",
+    :password => "tiger",
+    :emulate_booleans => true,
+    :trace    => false
+  }
+}
 
-Course.establish_connection(
-  :adapter  => "odbc",
-  :dsn	    => "a604-ora10-alice-testdb2",
-  :username => "oracle",
-  :password => "oracle",
-  :trace => true
-)
+ActiveRecord::Base.establish_connection 'arunit'
+Course.establish_connection 'arunit2'
 
 ###########################################
-# Using Sybase
+# Using DB2
 
 =begin
-ActiveRecord::Base.establish_connection(
+ActiveRecord::Base.configurations = {
+  'arunit' => {
   :adapter  => "odbc",
-  :dsn	    => "a609_syb15_trilby_testdb3",
-  :username => "sa",
-  :trace => true,
+  :dsn	    => "a610_db2_alice_rails1",
+  :username => "db2admin",
+  :password => "db2admin",
+  :trace    => true,
   :convert_numeric_literals => true
-)
+  },
+ 'arunit2' => {
+    :adapter  => "odbc",
+    :dsn      => "a610_db2_alice_rails2",
+    :username => "db2admin",
+    :password => "db2admin",
+    :trace    => true,
+    :convert_numeric_literals => true
+  }
+}
 
-Course.establish_connection(
-  :adapter  => "odbc",
-  :dsn	    => "a609_syb15_trilby_testdb4",
-  :username => "sa",
-  :trace => true,
-  :convert_numeric_literals => true
-)
+ActiveRecord::Base.establish_connection 'arunit'
+Course.establish_connection 'arunit2'
 =end
 
 ###########################################
-# Using DB2
+# Using Sybase 15
 
 =begin
-ActiveRecord::Base.establish_connection(
+ActiveRecord::Base.configurations = {
+  'arunit' => {
   :adapter  => "odbc",
-  :dsn	    => "a609_db2_alice_rails1",
-  :username => "db2admin",
-  :password => "db2admin",
+  :dsn	    => "a609_syb15_trilby_testdb3",
+  :username => "sa",
+#  :password => "",
   :trace => true,
   :convert_numeric_literals => true
-)
-
-Course.establish_connection(
+  },
+ 'arunit2' => {
   :adapter  => "odbc",
-  :dsn	    => "a609_db2_alice_rails2",
-  :username => "db2admin",
-  :password => "db2admin",
+  :dsn	    => "a609_syb15_trilby_testdb4",
+  :username => "sa",
+#  :password => "",
   :trace => true,
   :convert_numeric_literals => true
-)
+  }
+}
+
+ActiveRecord::Base.establish_connection 'arunit'
+Course.establish_connection 'arunit2'
 =end
+
+###########################################
+puts "Using DSN: #{ActiveRecord::Base.configurations["arunit"][:dsn]}"

data/test/fixtures/db_definitions/db2.drop.sql

@@ -28,3 +28,4 @@ DROP TABLE fk_test_has_pk;
 DROP TABLE fk_test_has_fk;
 DROP TABLE keyboards;
 DROP TABLE legacy_things;
+DROP TABLE numeric_data;

data/test/fixtures/db_definitions/db2.sql

@@ -215,3 +215,12 @@ CREATE TABLE legacy_things (
   version INT DEFAULT 0,
   PRIMARY KEY (id)
 );
+
+CREATE TABLE numeric_data (
+  id INT GENERATED BY DEFAULT AS IDENTITY (START WITH 10000),
+  bank_balance DECIMAL(10,2),
+  big_bank_balance DECIMAL(15,2),
+  world_population DECIMAL(10),
+  my_house_population DECIMAL(2),
+  decimal_number_with_default DECIMAL(3,2) DEFAULT 2.78
+);

data/test/fixtures/db_definitions/informix.drop.sql

@@ -28,3 +28,4 @@ DROP TABLE fk_test_has_fk;
 DROP TABLE fk_test_has_pk;
 DROP TABLE keyboards;
 DROP TABLE legacy_things;
+DROP TABLE numeric_data;

data/test/fixtures/db_definitions/informix.sql

@@ -203,3 +203,13 @@ create table legacy_things (
   version int default 0,
   primary key (id)
 );
+
+create table numeric_data (
+  id serial primary key,
+  bank_balance decimal(10,2),
+  big_bank_balance decimal(15,2),
+  world_population decimal(10,0),
+  my_house_population decimal(2,0),
+  decimal_number_with_default decimal(3,2) DEFAULT 2.78
+);
+

data/test/fixtures/db_definitions/ingres.drop.sql

@@ -28,6 +28,7 @@ DROP TABLE fk_test_has_fk;
 DROP TABLE fk_test_has_pk;
 DROP TABLE keyboards;
 DROP TABLE legacy_things;
+DROP TABLE numeric_data;
 
 drop sequence accounts_seq;
 drop sequence funny_jokes_seq;
@@ -59,4 +60,5 @@ drop sequence fk_test_has_pk_seq;
 drop sequence fk_test_has_fk_seq;
 drop sequence keyboards_seq;
 drop sequence legacy_things_seq;
+drop sequence numeric_data_seq;
 

data/test/fixtures/db_definitions/ingres.sql

@@ -230,3 +230,12 @@ CREATE TABLE legacy_things (
 ) WITH PAGE_SIZE=8192;
 CREATE SEQUENCE legacy_things_seq MINVALUE 10000;
 
+CREATE TABLE numeric_data (
+  id INTEGER PRIMARY KEY NOT NULL,
+  bank_balance decimal(10,2),
+  big_bank_balance decimal(15,2),
+  world_population decimal(10,0),
+  my_house_population decimal(2,0),
+  decimal_number_with_default decimal(3,2) DEFAULT 2.78
+) WITH PAGE_SIZE=8192;
+CREATE SEQUENCE numeric_data_seq MINVALUE 10000;

data/test/fixtures/db_definitions/mysql.drop.sql

@@ -28,3 +28,4 @@ DROP TABLE fk_test_has_fk;
 DROP TABLE fk_test_has_pk;
 DROP TABLE keyboards;
 DROP TABLE legacy_things;
+DROP TABLE numeric_data;

data/test/fixtures/db_definitions/mysql.sql

@@ -37,7 +37,7 @@ CREATE TABLE `topics` (
   `parent_id` int(11) default NULL,
   `type` varchar(50) default NULL,
   PRIMARY KEY  (`id`)
-) TYPE=InnoDB;
+) TYPE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `developers` (
   `id` int(11) NOT NULL auto_increment,
@@ -106,7 +106,7 @@ CREATE TABLE `auto_id_tests` (
 ) TYPE=InnoDB;
 
 CREATE TABLE `entrants` (
-  `id` INTEGER NOT NULL PRIMARY KEY,
+  `id` INTEGER NOT NULL auto_increment PRIMARY KEY,
   `name` VARCHAR(255) NOT NULL,
   `course_id` INTEGER NOT NULL
 );
@@ -137,7 +137,7 @@ CREATE TABLE `people` (
 ) TYPE=InnoDB;
 
 CREATE TABLE `readers` (
-    `id` int(11) NOT NULL PRIMARY KEY,
+    `id` int(11) NOT NULL auto_increment PRIMARY KEY,
     `post_id` INTEGER NOT NULL,
     `person_id` INTEGER NOT NULL
 ) TYPE=InnoDB;
@@ -149,28 +149,28 @@ CREATE TABLE `binaries` (
 ) TYPE=InnoDB;
 
 CREATE TABLE `computers` (
-  `id` INTEGER NOT NULL PRIMARY KEY,
+  `id` INTEGER NOT NULL auto_increment PRIMARY KEY,
   `developer` INTEGER NOT NULL,
   `extendedWarranty` INTEGER NOT NULL
 ) TYPE=InnoDB;
 
 CREATE TABLE `posts` (
-  `id` INTEGER NOT NULL PRIMARY KEY,
+  `id` INTEGER NOT NULL auto_increment PRIMARY KEY,
   `author_id` INTEGER,
   `title` VARCHAR(255) NOT NULL,
   `body` TEXT NOT NULL,
-  `type` VARCHAR(255) NOT NULL
+  `type` VARCHAR(255) default NULL
 ) TYPE=InnoDB;
 
 CREATE TABLE `comments` (
-  `id` INTEGER NOT NULL PRIMARY KEY,
+  `id` INTEGER NOT NULL auto_increment PRIMARY KEY,
   `post_id` INTEGER NOT NULL,
   `body` TEXT NOT NULL,
-  `type` VARCHAR(255) NOT NULL
+  `type` VARCHAR(255) default NULL
 ) TYPE=InnoDB;
 
 CREATE TABLE `authors` (
-  `id` INTEGER NOT NULL PRIMARY KEY,
+  `id` INTEGER NOT NULL auto_increment PRIMARY KEY,
   `name` VARCHAR(255) NOT NULL
 ) TYPE=InnoDB;
 
@@ -184,7 +184,7 @@ CREATE TABLE `tasks` (
 CREATE TABLE `categories` (
   `id` int(11) NOT NULL auto_increment,
   `name` VARCHAR(255) NOT NULL,
-  `type` VARCHAR(255) NOT NULL,
+  `type` VARCHAR(255) default NULL,
   PRIMARY KEY  (`id`)
 ) TYPE=InnoDB;
 
@@ -194,11 +194,11 @@ CREATE TABLE `categories_posts` (
 ) TYPE=InnoDB;
 
 CREATE TABLE `fk_test_has_pk` (
-  `id` INTEGER NOT NULL PRIMARY KEY
+  `id` INTEGER NOT NULL auto_increment PRIMARY KEY
 ) TYPE=InnoDB;
 
 CREATE TABLE `fk_test_has_fk` (
-  `id`    INTEGER NOT NULL PRIMARY KEY,
+  `id`    INTEGER NOT NULL auto_increment PRIMARY KEY,
   `fk_id` INTEGER NOT NULL,
 
   FOREIGN KEY (`fk_id`) REFERENCES `fk_test_has_pk`(`id`)
@@ -217,3 +217,12 @@ CREATE TABLE `legacy_things` (
   `version` int(11) NOT NULL default 0,
   PRIMARY KEY  (`id`)
 ) TYPE=InnoDB;
+
+CREATE TABLE `numeric_data` (
+  `id` INTEGER NOT NULL auto_increment PRIMARY KEY,
+  `bank_balance` decimal(10,2),
+  `big_bank_balance` decimal(15,2),
+  `world_population` decimal(10),
+  `my_house_population` decimal(2),
+  `decimal_number_with_default` decimal(3,2) DEFAULT 2.78
+) TYPE=InnoDB;

data/test/fixtures/db_definitions/oracle_odbc.drop.sql

@@ -12,6 +12,7 @@ drop table orders;
 drop table movies;
 drop table subscribers;
 drop table booleantests;
+drop table defaults;
 drop table auto_id_tests;
 drop table entrants;
 drop table colnametests;
@@ -29,6 +30,7 @@ drop table fk_test_has_pk;
 drop table fk_test_has_fk;
 drop table keyboards;
 drop table legacy_things;
+drop table numeric_data;
 drop table test_oracle_defaults;
 
 drop sequence accounts_seq;
@@ -43,6 +45,7 @@ drop sequence orders_seq;
 drop sequence movies_seq;
 drop sequence subscribers_seq;
 drop sequence booleantests_seq;
+drop sequence defaults_seq;
 drop sequence auto_id_tests_seq;
 drop sequence entrants_seq;
 drop sequence colnametests_seq;
@@ -61,4 +64,5 @@ drop sequence fk_test_has_pk_seq;
 drop sequence fk_test_has_fk_seq;
 drop sequence keyboards_seq;
 drop sequence legacy_things_seq;
+drop sequence numeric_data_seq;
 drop sequence test_oracle_defaults_seq;

data/test/fixtures/db_definitions/oracle_odbc.sql

@@ -37,7 +37,7 @@ create table topics (
     bonus_time timestamp default null,
     last_read timestamp default null,
     content varchar(4000),
-    approved number(10) default 1,
+    approved number(1) default 1,
     replies_count number(10) default 0,
     parent_id number(10) references topics initially deferred disable,
     type varchar(50) default null,
@@ -115,6 +115,23 @@ create table booleantests (
 );
 create sequence booleantests_seq minvalue 10000;
 
+create table defaults (
+    id number(10) not null,
+    modified_date date default sysdate,
+    modified_date_function date default sysdate,
+    fixed_date date default to_date('2004-01-01', 'YYYY-MM-DD'),
+    modified_time date default sysdate,
+    modified_time_function date default sysdate,
+    fixed_time date default TO_DATE('2004-01-01 00:00:00', 'YYYY-MM-DD HH24:MI:SS'),
+    char1 varchar2(1) default 'Y',
+    char2 varchar2(50) default 'a varchar field',
+    char3 clob default 'a text field',
+    positive_integer number(10) default 1,
+    negative_integer number(10) default -1,
+    decimal_number number(3,2) default 2.78
+);
+create sequence defaults_seq minvalue 10000;
+
 create table auto_id_tests (
     auto_id number(10) not null,
     value number(10) default null,
@@ -255,3 +272,14 @@ create table legacy_things (
     version number(10) default 0
 );
 create sequence legacy_things_seq minvalue 10000;
+
+create table numeric_data (
+  id number(10) not null primary key,
+  bank_balance decimal(10,2),
+  big_bank_balance decimal(15,2),
+  world_population decimal(10),
+  my_house_population decimal(2),
+  decimal_number_with_default decimal(3,2) default 2.78
+);
+create sequence numeric_data_seq minvalue 10000;
+

data/test/fixtures/db_definitions/postgresql.drop.sql

@@ -1,5 +1,5 @@
-DROP SEQUENCE accounts_id_seq;
 DROP TABLE accounts;
+DROP SEQUENCE accounts_id_seq;
 DROP TABLE funny_jokes;
 DROP TABLE companies;
 DROP SEQUENCE companies_nonstd_seq;
@@ -32,3 +32,5 @@ DROP TABLE fk_test_has_pk;
 DROP TABLE geometrics;
 DROP TABLE keyboards;
 DROP TABLE legacy_things;
+DROP TABLE numeric_data;
+DROP TABLE column_data;

data/test/fixtures/db_definitions/postgresql.sql

@@ -118,7 +118,8 @@ CREATE TABLE defaults (
     char2 character varying(50) default 'a varchar field',
     char3 text default 'a text field',
     positive_integer integer default 1,
-    negative_integer integer default -1
+    negative_integer integer default -1,
+    decimal_number decimal(3,2) default 2.78
 );
 
 CREATE TABLE auto_id_tests (
@@ -129,8 +130,8 @@ CREATE TABLE auto_id_tests (
 
 CREATE TABLE entrants (
   id serial,
-  name text,
-  course_id integer
+  name text not null,
+  course_id integer not null
 );
 
 CREATE TABLE colnametests (
@@ -246,3 +247,12 @@ CREATE TABLE legacy_things (
   tps_report_number integer,
   version integer default 0
 );
+
+CREATE TABLE numeric_data (
+  id serial primary key,
+  bank_balance decimal(10,2),
+  big_bank_balance decimal(15,2),
+  world_population decimal(10),
+  my_house_population decimal(2),
+  decimal_number_with_default decimal(3,2) default 2.78
+);

data/test/fixtures/db_definitions/progress.drop.sql

@@ -28,6 +28,7 @@ drop table readers;
 drop table subscribers;
 drop table tasks;
 drop table topics;
+drop table numeric_data;
 
 drop sequence accounts_seq;
 drop sequence authors_seq;
@@ -59,3 +60,4 @@ drop sequence readers_seq;
 drop sequence subscribers_seq;
 drop sequence tasks_seq;
 drop sequence topics_seq;
+drop sequence numeric_data_seq;