odbc-rails 1.2 → 1.3

data/ChangeLog

@@ -1,3 +1,11 @@
+2007-01-09 10:18  source
+
+	* Updated version number to 1.3
+
+2007-01-09 10:11  source
+
+	* Added support for PostgreSQL
+
 2006-12-11 12:01  source
 
 	* Updated for final release 1.2

data/NEWS

@@ -1,3 +1,6 @@
+January 9, 2007, V1.3:
+  * Added support for PostgreSQL
+
 December 11, 2006, V1.2:
   * Added option to install adapter as a gem
   * Added option to install adapter as a plugin

data/README

@@ -2,7 +2,7 @@
 
 (C) 2006 OpenLink Software
 
-11-December-2006
+09-Jan-2007
 
 
 == Status
@@ -18,7 +18,7 @@ its own adapter.
 It currently supports Ingres r3, Informix 9.3 or later, Oracle 10g,
 MySQL 5 and OpenLink's Virtuoso
 (Open Source Edition[http://virtuoso.openlinksw.com]), 
-SQL Server 2000, Sybase ASE 15, DB2 v9 and Progress v8/9/10
+SQL Server 2000, Sybase ASE 15, DB2 v9, Progress v8/9/10 and PostgreSQL 8.2.
 
 Testing to date has been limited to the ROR 'Expenses' sample
 application described at http://developer.apple.com/tools/rubyonrails.html
@@ -100,12 +100,11 @@ Install the odbc-rails gem by running:
 Enable loading of the adapter by editing your Rails project's
 config/environment.rb script: 
 
-   * Add a <tt>require</tt> to your config/environment.rb immediately after
-     the line
+* Add a +require+ to your config/environment.rb immediately after the line
 
        require File.join(File.dirname(__FILE__), 'boot')
 
-     i.e.
+  i.e.
 
        require File.join(File.dirname(__FILE__), 'boot')
        require 'odbc_adapter'

data/lib/active_record/connection_adapters/odbc_adapter.rb

@@ -1,5 +1,5 @@
 #
-#  $Id: odbc_adapter.rb,v 1.2 2006/12/11 12:00:10 source Exp $
+#  $Id: odbc_adapter.rb,v 1.3 2007/01/09 10:11:40 source Exp $
 #
 #  OpenLink ODBC Adapter for Ruby on Rails
 #  Copyright (C) 2006 OpenLink Software
@@ -57,12 +57,12 @@ begin
       # The ODBC adapter requires the Ruby ODBC module (version 0.9991 or 
       # later), available from http://raa.ruby-lang.org/project/ruby-odbc
       #
-      # == Status at 11-Dec-2006
+      # == Status at 09-Jan-2007
       #
       # The current adapter supports Ingres r3, Informix 9.3 or later, 
       # Virtuoso (Open-Source Edition) 4.5, Oracle 10g, MySQL 5, 
-      # SQL Server 2000, Sybase ASE 15, DB2 v9, Progress 9/10 (SQL-92 engine)
-      # and Progress 8 (SQL-89 engine).
+      # SQL Server 2000, Sybase ASE 15, DB2 v9, Progress 9/10 (SQL-92 engine),
+      # Progress 8 (SQL-89 engine) and PostgreSQL 8.2
       #
       # == Testing Environments
       #
@@ -71,7 +71,8 @@ begin
       # The iODBC Driver Manager was used on Linux and Mac OS X.
       #
       # Databases supported using OpenLink ODBC drivers:
-      # * Informix, Ingres, Oracle, MySQL, SQL Server, Sybase, DB2, Progress
+      # * Informix, Ingres, Oracle, MySQL, SQL Server, Sybase, DB2, Progress,
+      #   PostgreSQL
       # Databases supported using the database's own native ODBC driver:
       # * Virtuoso, MySQL, Informix
       #
@@ -85,7 +86,6 @@ begin
       # More information can be found at:
       # * http://rubyforge.org/projects/odbc-rails/
       # * http://odbc-rails.openlinksw.com 
-      # * http://virtuoso.openlinksw.com/wiki/main/OdbcRails/RailsAdapterWeb
       # * http://sourceforge.net/projects/virtuoso/
       #
       # Maintainer: Carl Blakeley (mailto:cblakeley@openlinksw.co.uk)
@@ -253,6 +253,15 @@ begin
                 :supports_count_distinct => true
               }
             },
+            :postgresql => {
+              :any_version => {
+                :primary_key => "serial primary key",
+                :has_autoincrement_col => true,
+                :supports_migrations => true,
+                :supports_schema_names => false,
+                :supports_count_distinct => true
+              }
+            },
             :progress => {
               :any_version => {
                 :primary_key => "integer not null primary key",
@@ -497,8 +506,8 @@ begin
           @logger.unknown("args=[#{value}]") if @@trace
           case value
           when String
-            if column && column.type == :binary && column.class.respond_to?(:string_to_binary)
-              "'#{quote_string(column.class.string_to_binary(value))}'"
+            if column && column.type == :binary && self.respond_to?(:string_to_binary)
+              "'#{string_to_binary(value)}'"
             elsif (column && [:integer, :float].include?(column.type)) ||
              (column.nil? && @convert_numeric_literals && 
              (value =~ /^[-+]?[0-9]+[.]?[0-9]*([eE][-+]?[0-9]+)?$/))
@@ -864,9 +873,9 @@ begin
         # Returns the default sequence name for a table.
         # Used for databases which don't support an autoincrementing column 
         # type, but do support sequences.
-        def default_sequence_name(table, primary_key=nil)
+        def default_sequence_name(table, column)
           @logger.unknown("ODBCAdapter#default_sequence_name>") if @@trace
-          @logger.unknown("args=[#{table}|#{primary_key}]") if @@trace
+          @logger.unknown("args=[#{table}|#{column}]") if @@trace
         "#{table}_seq"
         end
         
@@ -915,11 +924,15 @@ begin
           currentUser = @dsInfo.info[ODBC::SQL_USER_NAME]
           stmt = @connection.tables
           resultSet = stmt.fetch_all || []
-          resultSet.each do |row| 
+          resultSet.each do |row|
+            schemaName = row[1]
+            tblName = row[2]
+            tblType = row[3]
+            next if respond_to?("table_filter") && table_filter(schemaName, tblName, tblType)
             if @@dbmsLookups.get_info(@dbmsName, @dbmsMajorVer, :supports_schema_names)
-              tblNames << activeRecIdentCase(row[2]) if row[1].casecmp(currentUser) == 0
+              tblNames << activeRecIdentCase(tblName) if schemaName.casecmp(currentUser) == 0
             else
-              tblNames << activeRecIdentCase(row[2])
+              tblNames << activeRecIdentCase(tblName)
             end
           end
           stmt.drop
@@ -966,8 +979,9 @@ begin
             elsif colDefault =~ /^\((.*)\)$/ # SQL Server numeric default
               colDefault = $1
               # ODBC drivers should return string column defaults in quotes
-              # Oracle also includes a trailing space.
-            elsif colDefault =~ /^'(.*)' *$/
+              # - Oracle includes a trailing space.
+              # - PostgreSQL may return '<default>::character varying'
+            elsif colDefault =~ /^'(.*)'[ :].*$/
               colDefault = $1
 	        #TODO: HACKS for Progress
             elsif @dbmsName == :progress || @dbmsName == :progress89

data/lib/active_record/vendor/odbcext_postgresql.rb

@@ -1,5 +1,5 @@
 #
-#  $Id: odbcext_postgresql.rb,v 1.1 2006/12/06 14:42:11 source Exp $
+#  $Id: odbcext_postgresql.rb,v 1.2 2007/01/09 10:11:40 source Exp $
 #
 #  OpenLink ODBC Adapter for Ruby on Rails
 #  Copyright (C) 2006 OpenLink Software
@@ -32,15 +32,22 @@ module ODBCExt
   
   # #last_insert_id must be implemented for any database which returns
   # false from #prefetch_primary_key?
-  
-  #def last_insert_id(table, sequence_name, stmt = nil)
-  #end
+
+  def last_insert_id(table, sequence_name, stmt = nil)
+    select_value("select currval('#{sequence_name}')", 'last_insert_id')
+  end
   
   # ------------------------------------------------------------------------
   # Optional methods
   #
   # These are supplied for a DBMS only if necessary.
   # ODBCAdapter tests for optional methods using Object#respond_to?
+
+  # Filter for ODBCAdapter#tables
+  # Omits table from #tables if table_filter returns true
+  def table_filter(schemaName, tblName, tblType)
+    ["information_schema", "pg_catalog"].include?(schemaName) || tblType !~ /TABLE/i
+  end
   
   # Pre action for ODBCAdapter#insert
   # def pre_insert(sql, name, pk, id_value, sequence_name)
@@ -50,22 +57,45 @@ module ODBCExt
   # def post_insert(sql, name, pk, id_value, sequence_name)
   # end
   
+  def string_to_binary(value)
+    # Escape data prior to insert into a bytea column
+    if value
+      res = ''
+      value.each_byte { |b| res << sprintf('\\\\%03o', b) }
+      res
+    end
+  end
+  
   # ------------------------------------------------------------------------
   # Method redefinitions
   #
   # DBMS specific methods which override the default implementation 
   # provided by the ODBCAdapter core.  
   
-  def default_sequence_name(table, primary_key=nil)
-    @logger.unknown("ODBCAdapter#default_sequence_name>") if @trace
-    #@logger.unknown("args=[#{table}|#{primary_key}]") if @trace
-    default_pk, default_seq = pk_and_sequence_for(table)
-    default_seq || "#{table}_#{primary_key || default_pk || 'id'}_seq"        
-  rescue Exception => e
-    @logger.unknown("exception=#{e}") if @trace
-    raise      
+  def quoted_true
+    "'t'"
+  end
+      
+  def quoted_false
+    "'f'"
+  end
+      
+  def quote_string(string)
+    @logger.unknown("ODBCAdapter#quote_string>") if @trace    
+    string.gsub(/\\/, '\&\&').gsub(/'/, "''")
   end
   
+  def default_sequence_name(table, column)
+    @logger.unknown("ODBCAdapter#default_sequence_name>") if @trace
+    @logger.unknown("args=[#{table}|#{column}]") if @trace
+    "#{table}_#{column}_seq"      
+  end
+
+  def indexes(table_name, name = nil)
+    # Exclude primary key indexes
+    super(table_name, name).delete_if { |i| i.unique && i.name =~ /_pkey$/i }
+  end
+
   def rename_table(name, new_name)
     @logger.unknown("ODBCAdapter#rename_table>") if @trace
     execute "ALTER TABLE #{name} RENAME TO #{new_name}"          
@@ -91,7 +121,7 @@ module ODBCExt
   
   def change_column(table_name, column_name, type, options = {})
     @logger.unknown("ODBCAdapter#change_column>") if @trace
-    execute "ALTER TABLE #{table_name} ALTER  #{column_name} TYPE #{type}"
+    execute "ALTER TABLE #{table_name} ALTER  #{column_name} TYPE #{type_to_sql(type, options[:limit])}"
     change_column_default(table_name, column_name, options[:default]) unless options[:default].nil?
   rescue Exception => e
     @logger.unknown("exception=#{e}") if @trace
@@ -108,7 +138,7 @@ module ODBCExt
   
   def rename_column(table_name, column_name, new_column_name)
     @logger.unknown("ODBCAdapter#rename_column>") if @trace
-    execute "ALTER TABLE #{table_name} RENAME COLUMN #{column_name} TO #{new_column_name}"                
+    execute "ALTER TABLE #{table_name} RENAME #{column_name} TO #{new_column_name}"                
   rescue Exception => e
     @logger.unknown("exception=#{e}") if @trace
     raise
@@ -116,64 +146,10 @@ module ODBCExt
   
   def remove_index(table_name, options = {})
     @logger.unknown("ODBCAdapter#remove_index>") if @trace
-    if Hash === options
-      index_name = options[:name]
-    else
-      index_name = "#{table_name}_#{options}_index"
-    end
-    execute "DROP INDEX #{index_name}"        
+    execute "DROP INDEX #{index_name(table_name, options)}"
   rescue Exception => e
     @logger.unknown("exception=#{e}") if @trace
     raise
   end
   
-  # ------------------------------------------------------------------------
-  # Private methods to support methods above
-  #
-  private
-  
-  # Find a table's primary key and sequence.
-  def pk_and_sequence_for(table)
-    # First try looking for a sequence with a dependency on the
-    # given table's primary key.
-    result = select_all(<<-end_sql, 'PK and serial sequence')[0]
-          SELECT attr.attname, name.nspname, seq.relname
-          FROM pg_class      seq,
-               pg_attribute  attr,
-               pg_depend     dep,
-               pg_namespace  name,
-               pg_constraint cons
-          WHERE seq.oid           = dep.objid
-            AND seq.relnamespace  = name.oid
-            AND seq.relkind       = 'S'
-            AND attr.attrelid     = dep.refobjid
-            AND attr.attnum       = dep.refobjsubid
-            AND attr.attrelid     = cons.conrelid
-            AND attr.attnum       = cons.conkey[1]
-            AND cons.contype      = 'p'
-            AND dep.refobjid      = '#{table}'::regclass
-        end_sql
-    
-    if result.nil? or result.empty?
-      # If that fails, try parsing the primary key's default value.
-      # Support the 7.x and 8.0 nextval('foo'::text) as well as
-      # the 8.1+ nextval('foo'::regclass).
-      result = select_all(<<-end_sql, 'PK and custom sequence')[0]
-            SELECT attr.attname, name.nspname, split_part(def.adsrc, '\\\'', 2)
-            FROM pg_class       t
-            JOIN pg_namespace   name ON (t.relnamespace = name.oid)
-            JOIN pg_attribute   attr ON (t.oid = attrelid)
-            JOIN pg_attrdef     def  ON (adrelid = attrelid AND adnum = attnum)
-            JOIN pg_constraint  cons ON (conrelid = adrelid AND adnum = conkey[1])
-            WHERE t.oid = '#{table}'::regclass
-              AND cons.contype = 'p'
-              AND def.adsrc ~* 'nextval'
-          end_sql
-    end
-    # check for existence of . in sequence name as in public.foo_sequence.  if it does not exist, join the current namespace
-    result.last['.'] ? [result.first, result.last] : [result.first, "#{result[1]}.#{result[2]}"]
-  rescue
-    nil
-  end
-  
 end # module

data/support/test/base_test.rb

@@ -985,7 +985,7 @@ class BasicsTest < Test::Unit::TestCase
 
   def test_quote
     if current_adapter?(:ODBCAdapter) && [:informix, :sybase].include?(ActiveRecord::Base.connection.dbmsName)
-      #Informix and Sybase only allow printable characters in VARCHAR columns.
+      #Some databases only allow printable characters in VARCHAR columns.
       author_name = "\\ \041 ' \n \\n \""
     else
       author_name = "\\ \001 ' \n \\n \""

data/support/test/migration_test.rb

@@ -247,7 +247,7 @@ if ActiveRecord::Base.connection.supports_migrations?
         
         begin
           # Some DBs complain girlfriend column already exists on two consecutive add_column calls
-          unless current_adapter?(:ODBCAdapter) && [:informix, :oracle, :mysql, :microsoftsqlserver, :sybase].include?(ActiveRecord::Base.connection.dbmsName)        
+          unless current_adapter?(:ODBCAdapter) && [:informix, :oracle, :mysql, :microsoftsqlserver, :sybase, :postgresql].include?(ActiveRecord::Base.connection.dbmsName)        
             Person.connection.add_column "people", "girlfriend", :string
           end
           Person.connection.add_column "people", "girlfriend", :string, :limit => 40

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

@@ -0,0 +1,34 @@
+DROP SEQUENCE accounts_id_seq;
+DROP TABLE accounts;
+DROP TABLE funny_jokes;
+DROP TABLE companies;
+DROP SEQUENCE companies_nonstd_seq;
+DROP TABLE topics;
+DROP TABLE developers;
+DROP TABLE projects;
+DROP TABLE developers_projects;
+DROP TABLE customers;
+DROP TABLE orders;
+DROP TABLE movies;
+DROP TABLE subscribers;
+DROP TABLE booleantests;
+DROP TABLE auto_id_tests;
+DROP TABLE entrants;
+DROP TABLE colnametests;
+DROP TABLE mixins;
+DROP TABLE people;
+DROP TABLE readers;
+DROP TABLE binaries;
+DROP TABLE computers;
+DROP TABLE posts;
+DROP TABLE comments;
+DROP TABLE authors;
+DROP TABLE tasks;
+DROP TABLE categories;
+DROP TABLE categories_posts;
+DROP TABLE defaults;
+DROP TABLE fk_test_has_fk;
+DROP TABLE fk_test_has_pk;
+DROP TABLE geometrics;
+DROP TABLE keyboards;
+DROP TABLE legacy_things;

data/test/fixtures/db_definitions/postgresql.sql

@@ -0,0 +1,248 @@
+CREATE SEQUENCE public.accounts_id_seq START 100;
+
+CREATE TABLE accounts (
+    id integer DEFAULT nextval('public.accounts_id_seq'),
+    firm_id integer,
+    credit_limit integer,
+    PRIMARY KEY (id)
+);
+
+CREATE TABLE funny_jokes (
+  id serial,
+  name character varying(50)
+);
+
+CREATE SEQUENCE companies_nonstd_seq START 101;
+
+CREATE TABLE companies (
+    id integer DEFAULT nextval('companies_nonstd_seq'),
+    "type" character varying(50),
+    "ruby_type" character varying(50),
+    firm_id integer,
+    name character varying(50),
+    client_of integer,
+    rating integer default 1,
+    PRIMARY KEY (id)
+);
+
+CREATE TABLE developers_projects (
+    developer_id integer NOT NULL,
+    project_id integer NOT NULL,
+    joined_on date,
+    access_level integer default 1
+);
+
+CREATE TABLE developers (
+    id serial,
+    name character varying(100),
+    salary integer DEFAULT 70000,
+    created_at timestamp,
+    updated_at timestamp,
+    PRIMARY KEY (id)
+);
+SELECT setval('developers_id_seq', 100);
+
+CREATE TABLE projects (
+    id serial,
+    name character varying(100),
+    type varchar(255),
+    PRIMARY KEY (id)
+);
+SELECT setval('projects_id_seq', 100);
+
+CREATE TABLE topics (
+    id serial,
+    title character varying(255),
+    author_name character varying(255),
+    author_email_address character varying(255),
+    written_on timestamp without time zone,
+    bonus_time time,
+    last_read date,
+    content text,
+    approved boolean default true,
+    replies_count integer default 0,
+    parent_id integer,
+    "type" character varying(50),
+    PRIMARY KEY (id)
+);
+SELECT setval('topics_id_seq', 100);
+
+CREATE TABLE customers (
+    id serial,
+    name character varying,
+    balance integer default 0,
+    address_street character varying,
+    address_city character varying,
+    address_country character varying,
+    gps_location character varying,
+    PRIMARY KEY (id)
+);
+SELECT setval('customers_id_seq', 100);
+
+CREATE TABLE orders (
+    id serial,
+    name character varying,
+    billing_customer_id integer,
+    shipping_customer_id integer,
+    PRIMARY KEY (id)
+);
+SELECT setval('orders_id_seq', 100);
+
+CREATE TABLE movies (
+    movieid serial,
+    name text,
+    PRIMARY KEY (movieid)
+);
+
+CREATE TABLE subscribers (
+    nick text NOT NULL,
+    name text,
+    PRIMARY KEY (nick)
+);
+
+CREATE TABLE booleantests (
+    id serial,
+    value boolean,
+    PRIMARY KEY (id)
+);
+
+CREATE TABLE defaults (
+    id serial,
+    modified_date date default CURRENT_DATE,
+    modified_date_function date default now(),
+    fixed_date date default '2004-01-01',
+    modified_time timestamp default CURRENT_TIMESTAMP,
+    modified_time_function timestamp default now(),
+    fixed_time timestamp default '2004-01-01 00:00:00.000000-00',
+    char1 char(1) default 'Y',
+    char2 character varying(50) default 'a varchar field',
+    char3 text default 'a text field',
+    positive_integer integer default 1,
+    negative_integer integer default -1
+);
+
+CREATE TABLE auto_id_tests (
+    auto_id serial,
+    value integer,
+    PRIMARY KEY (auto_id)
+);
+
+CREATE TABLE entrants (
+  id serial,
+  name text,
+  course_id integer
+);
+
+CREATE TABLE colnametests (
+  id serial,
+  "references" integer NOT NULL
+);
+
+CREATE TABLE mixins (
+  id serial,
+  parent_id integer,
+  type character varying,  
+  pos integer,
+  lft integer,
+  rgt integer,
+  root_id integer,  
+  created_at timestamp,
+  updated_at timestamp,
+  PRIMARY KEY  (id)
+);
+
+CREATE TABLE people (
+  id serial,
+  first_name text,
+  lock_version integer default 0,
+  PRIMARY KEY  (id)
+);
+
+CREATE TABLE readers (
+    id serial,
+    post_id integer NOT NULL,
+    person_id integer NOT NULL,
+    primary key (id)
+);
+
+CREATE TABLE binaries ( 
+  id serial , 
+  data bytea,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE computers (
+  id serial,
+  developer integer NOT NULL,
+  "extendedWarranty" integer NOT NULL
+);
+
+CREATE TABLE posts (
+  id serial,
+  author_id integer,
+  title varchar(255),
+  type varchar(255),
+  body text
+);
+
+CREATE TABLE comments (
+  id serial,
+  post_id integer,
+  type varchar(255),
+  body text
+);
+
+CREATE TABLE authors (
+  id serial,
+  name varchar(255) default NULL
+);
+
+CREATE TABLE tasks (
+  id serial,
+  starting timestamp,
+  ending timestamp,
+  PRIMARY KEY (id)
+);
+
+CREATE TABLE categories (
+  id serial,
+  name varchar(255),
+  type varchar(255)
+);
+
+CREATE TABLE categories_posts (
+  category_id integer NOT NULL,
+  post_id integer NOT NULL
+);
+
+CREATE TABLE fk_test_has_pk (
+  id INTEGER NOT NULL PRIMARY KEY
+);
+
+CREATE TABLE fk_test_has_fk (
+  id    INTEGER NOT NULL PRIMARY KEY,
+  fk_id INTEGER NOT NULL REFERENCES fk_test_has_fk(id)
+);
+
+CREATE TABLE geometrics (
+  id serial primary key,
+  a_point point,
+  -- a_line line, (the line type is currently not implemented in postgresql)
+  a_line_segment lseg,
+  a_box box,
+  a_path path,
+  a_polygon polygon,
+  a_circle circle
+);
+
+CREATE TABLE keyboards (
+  key_number serial primary key,
+  "name" character varying(50)
+);
+
+--Altered lock_version column name.
+CREATE TABLE legacy_things (
+  id serial primary key,
+  tps_report_number integer,
+  version integer default 0
+);

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

@@ -0,0 +1,2 @@
+DROP TABLE courses;
+

data/test/fixtures/db_definitions/postgresql2.sql

@@ -0,0 +1,5 @@
+CREATE TABLE courses (
+  id serial,
+  name text
+);
+

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: odbc-rails
 version: !ruby/object:Gem::Version 
-  version: "1.2"
-date: 2006-12-11 00:00:00 +01:00
+  version: "1.3"
+date: 2007-01-09 00:00:00 +01:00
 summary: ODBC Data Adapter for ActiveRecord.
 require_paths: 
 - lib
@@ -73,6 +73,10 @@ files:
 - test/fixtures/db_definitions/oracle_odbc.sql
 - test/fixtures/db_definitions/oracle_odbc2.drop.sql
 - test/fixtures/db_definitions/oracle_odbc2.sql
+- test/fixtures/db_definitions/postgresql.drop.sql
+- test/fixtures/db_definitions/postgresql.sql
+- test/fixtures/db_definitions/postgresql2.drop.sql
+- test/fixtures/db_definitions/postgresql2.sql
 - test/fixtures/db_definitions/progress.drop.sql
 - test/fixtures/db_definitions/progress.sql
 - test/fixtures/db_definitions/progress2.drop.sql