passing tests for DB=oracle_enhanced

Author: Steve Halasz

lib/rails_sql_views/connection_adapters/abstract/schema_statements.rb

@@ -69,7 +69,7 @@ def drop_table_with_cascade(table_name, options = {})
       #   database documentation to determine what drop behaviors are available.
       def drop_view(name, options={})
         if supports_views?
-          drop_sql = "DROP VIEW #{name}"
+          drop_sql = "DROP VIEW #{quote_table_name(name)}"
           drop_sql << " #{options[:drop_behavior]}" if options[:drop_behavior]
           execute drop_sql
         end

lib/rails_sql_views/connection_adapters/oracleenhanced_adapter.rb

@@ -1,16 +1,31 @@
 module RailsSqlViews
   module ConnectionAdapters
     module OracleEnhancedAdapter
+      def self.included(base)
+        base.alias_method_chain :tables, :views_included
+      end
       # Returns true as this adapter supports views.
       def supports_views?
         true
       end
 
+      def tables_with_views_included(name = nil)
+        tables = []
+        sql = " SELECT TABLE_NAME FROM USER_TABLES
+                UNION
+                SELECT VIEW_NAME AS TABLE_NAME FROM USER_VIEWS"
+        cursor = execute(sql, name)
+        while row = cursor.fetch
+          tables << row[0].downcase
+        end
+        tables
+      end
+      
       def base_tables(name = nil) #:nodoc:
         tables = []
         cursor = execute("SELECT TABLE_NAME FROM USER_TABLES", name)
         while row = cursor.fetch
-          tables << row[0]
+          tables << row[0].downcase
         end
         tables
       end
@@ -20,13 +35,14 @@ def views(name = nil) #:nodoc:
         views = []
         cursor = execute("SELECT VIEW_NAME FROM USER_VIEWS", name)
         while row = cursor.fetch
-          views << row[0]
+          views << row[0].downcase
         end
         views
       end
 
       # Get the view select statement for the specified table.
       def view_select_statement(view, name=nil)
+        view.upcase!
         cursor = execute("SELECT TEXT FROM USER_VIEWS WHERE VIEW_NAME = '#{view}'", name)
         if row = cursor.fetch
           return row[0]

lib/rails_sql_views/connection_adapters/postgresql_adapter.rb

@@ -2,7 +2,7 @@ module RailsSqlViews
   module ConnectionAdapters
     module PostgreSQLAdapter
       def self.included(base)
-        base.alias_method_chain :tables, :views_included unless method_defined?(:tables_with_views_included)
+        base.alias_method_chain :tables, :views_included
       end
       # Returns true as this adapter supports views.
       def supports_views?

test/connection/oracle_enhanced/connection.rb

@@ -0,0 +1,29 @@
+print "Using Oracle Enhanced\n"
+
+#require 'logger'
+#ActiveRecord::Base.logger = Logger.new("debug.log")
+
+ActiveRecord::Base.configurations = {
+  'rails_sql_views_unittest' => {
+    :adapter  => :oracle_enhanced,
+    :username => 'rails_sql_views_unittest',
+    :password => 'rails',
+    :host     => 'localhost',
+    :database => 'mydev',
+    :encoding => 'utf8',
+    :procedures_file  => 'procedures.sql',
+    :schema_file      => 'schema.sql',
+  }
+}
+
+ActiveRecord::Base.establish_connection 'rails_sql_views_unittest'
+
+puts "Resetting database"
+conn = ActiveRecord::Base.connection
+#conn.recreate_database(conn.current_database)
+conn.reconnect!
+[:procedures_file, :schema_file].each do |file|
+  lines = open(File.join(File.dirname(__FILE__), ActiveRecord::Base.configurations['rails_sql_views_unittest'][file])).readlines
+  conn.execute(lines.to_s)
+end
+conn.reconnect!

test/connection/oracle_enhanced/procedures.sql

@@ -0,0 +1,15 @@
+create or replace
+procedure dropTable (tab_name varchar2) as
+  this_tab_name user_tables.table_name%type;
+    cursor table_cur is
+      select table_name
+      from user_tables
+      where table_name = tab_name;
+begin
+  open table_cur;
+  loop
+    fetch table_cur into this_tab_name;
+    exit when table_cur%notfound;
+    execute immediate 'drop table "' || this_tab_name || '"';
+  end loop;
+end;

test/connection/oracle_enhanced/schema.sql

@@ -0,0 +1,39 @@
+BEGIN
+  dropTable('PEOPLE');
+  EXECUTE IMMEDIATE 'create table people (
+    id integer primary key,
+    first_name varchar2(255),
+    last_name varchar2(255),
+    ssn varchar2(64),
+    address_id integer
+  )';
+  
+  dropTable('PEOPLE2');
+  EXECUTE IMMEDIATE 'create table people2 (
+    id integer primary key,
+    first_name varchar2(255),
+    last_name varchar2(255),
+    ssn varchar2(64)
+  )';
+  
+  dropTable('PLACES');
+  EXECUTE IMMEDIATE 'create table places (
+    id integer primary key,
+    address varchar2(2000),
+    city varchar2(255),
+    cstate varchar2(255),
+    country char(2)
+  )';
+  
+  dropTable('ITEMS');
+  EXECUTE IMMEDIATE 'create table items (
+    id integer primary key,
+    person_id integer
+  )';
+  
+  dropTable('ITEMS_PEOPLE');
+  EXECUTE IMMEDIATE 'create table items_people (
+    person_id integer,
+    item_id integer
+  )';
+END;

test/schema.oracle_enhanced.expected.rb

@@ -0,0 +1,51 @@
+# This file is auto-generated from the current state of the database. Instead of editing this file, 
+# please use the migrations feature of Active Record to incrementally modify your database, and
+# then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your database schema. If you need
+# to create the application database on another system, you should be using db:schema:load, not running
+# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 0) do
+
+  create_table "items", :force => true do |t|
+    t.integer "person_id", :precision => 38, :scale => 0
+  end
+
+  create_table "items_people", :id => false, :force => true do |t|
+    t.integer "person_id", :precision => 38, :scale => 0
+    t.integer "item_id",   :precision => 38, :scale => 0
+  end
+
+  create_table "people", :force => true do |t|
+    t.string  "first_name"
+    t.string  "last_name"
+    t.string  "ssn",        :limit => 64
+    t.integer "address_id",               :precision => 38, :scale => 0
+  end
+
+  create_table "people2", :force => true do |t|
+    t.string "first_name"
+    t.string "last_name"
+    t.string "ssn",        :limit => 64
+  end
+
+  create_table "places", :force => true do |t|
+    t.string "address", :limit => 2000
+    t.string "city"
+    t.string "cstate"
+    t.string "country", :limit => 2
+  end
+
+  create_view "v_people", "select id, first_name, last_name, ssn, address_id from people", :force => true do |v|
+    v.column :id
+    v.column :f_name
+    v.column :l_name
+    v.column :social_security
+    v.column :address_id
+  end
+
+end

test/schema_dumper_test.rb

@@ -3,12 +3,24 @@
 
 class SchemaDumperTest < Test::Unit::TestCase
   def setup
-    ActiveRecord::Base.connection.execute('drop view if exists v_people')
-    ActiveRecord::Base.connection.execute('drop view if exists v_profile')
+    teardown
   end
   def teardown
-    ActiveRecord::Base.connection.execute('drop view if exists v_people')
-    ActiveRecord::Base.connection.execute('drop view if exists v_profile')
+    ['V_PEOPLE', 'V_PROFILE'].each do |view|
+      if ActiveRecord::Base.connection.adapter_name == 'OracleEnhanced'
+        ActiveRecord::Base.connection.execute("
+          DECLARE
+            CURSOR C1 is SELECT view_name FROM user_views where view_name = '#{view}';
+          BEGIN
+            FOR I IN C1 LOOP
+              EXECUTE IMMEDIATE 'DROP VIEW '||I.view_name||'';
+            END LOOP;
+          END;
+        ");
+      else
+        ActiveRecord::Base.connection.execute("drop view if exists #{view}")
+      end
+    end
   end
   def test_view
     create_people_view