arel 0.2.1 → 0.3.0

data/spec/arel/engines/sql/unit/relations/lock_spec.rb

@@ -30,6 +30,24 @@ module Arel
             FROM "users"
           })
         end
+
+        adapter_is :oracle do
+          sql.should be_like(%Q{
+            SELECT "USERS"."ID", "USERS"."NAME"
+            FROM "USERS" FOR UPDATE
+          })
+
+          sql_with_order_by = @relation.order(@relation[:id]).take(1).lock.to_sql
+          sql_with_order_by.should be_like(%Q{
+            SELECT "USERS"."ID", "USERS"."NAME"
+            FROM "USERS"
+            WHERE "ID" IN (select * from
+                          (SELECT "ID" FROM "USERS" ORDER BY "USERS"."ID" ASC)
+                          where rownum <= 1)
+            FOR UPDATE
+          })
+
+        end
       end
 
       it "manufactures a select query locking with a given lock" do
@@ -55,6 +73,13 @@ module Arel
             FROM "users"
           })
         end
+
+        adapter_is :oracle do
+          sql.should be_like(%Q{
+            SELECT "USERS"."ID", "USERS"."NAME"
+            FROM "USERS" LOCK IN SHARE MODE
+          })
+        end
       end
     end
   end

data/spec/arel/engines/sql/unit/relations/order_spec.rb

@@ -20,7 +20,31 @@ module Arel
             })
           end
 
-          adapter_is_not :mysql do
+          adapter_is :oracle do
+            sql.should be_like(%Q{
+              SELECT "USERS"."ID", "USERS"."NAME"
+              FROM "USERS"
+              ORDER BY "USERS"."ID" ASC
+            })
+
+            distinct_attributes = ActiveRecord::Base.connection.distinct('"USERS"."NAME"', '"USERS"."ID"')
+            @relation.project(distinct_attributes).order(@relation[:id]).to_sql.should be_like(%Q{
+              SELECT DISTINCT "USERS"."NAME",
+              FIRST_VALUE("USERS"."ID") OVER (PARTITION BY "USERS"."NAME" ORDER BY "USERS"."ID") AS alias_0__
+              FROM "USERS"
+              ORDER BY alias_0__
+            })
+
+            distinct_attributes = ActiveRecord::Base.connection.distinct('"USERS"."NAME"', '"USERS"."ID" DESC')
+            @relation.project(distinct_attributes).order('"USERS"."ID" DESC').to_sql.should be_like(%Q{
+              SELECT DISTINCT "USERS"."NAME",
+              FIRST_VALUE("USERS"."ID") OVER (PARTITION BY "USERS"."NAME" ORDER BY "USERS"."ID" DESC) AS alias_0__
+              FROM "USERS"
+              ORDER BY alias_0__ DESC
+            })
+          end
+
+          adapter_is_not :mysql, :oracle do
             sql.should be_like(%Q{
               SELECT "users"."id", "users"."name"
               FROM "users"
@@ -46,7 +70,15 @@ module Arel
             })
           end
 
-          adapter_is_not :mysql do
+          adapter_is :oracle do
+            sql.should be_like(%Q{
+              SELECT "USERS"."ID", "USERS"."NAME"
+              FROM "USERS"
+              ORDER BY "USERS"."ID" ASC, "USERS"."NAME" ASC
+            })
+          end
+
+          adapter_is_not :mysql, :oracle do
             sql.should be_like(%Q{
               SELECT "users"."id", "users"."name"
               FROM "users"
@@ -72,7 +104,15 @@ module Arel
             })
           end
 
-          adapter_is_not :mysql do
+          adapter_is :oracle do
+            sql.should be_like(%Q{
+              SELECT "USERS"."ID", "USERS"."NAME"
+              FROM "USERS"
+              ORDER BY asdf
+            })
+          end
+
+          adapter_is_not :mysql, :oracle do
             sql.should be_like(%Q{
               SELECT "users"."id", "users"."name"
               FROM "users"
@@ -99,7 +139,15 @@ module Arel
             })
           end
 
-          adapter_is_not :mysql do
+          adapter_is :oracle do
+            sql.should be_like(%Q{
+              SELECT "USERS"."ID", "USERS"."NAME"
+              FROM "USERS"
+              ORDER BY "USERS"."NAME" ASC, "USERS"."ID" ASC
+            })
+          end
+
+          adapter_is_not :mysql, :oracle do
             sql.should be_like(%Q{
               SELECT "users"."id", "users"."name"
               FROM "users"

data/spec/arel/engines/sql/unit/relations/project_spec.rb

@@ -19,7 +19,14 @@ module Arel
             })
           end
 
-          adapter_is_not :mysql do
+          adapter_is :oracle do
+            sql.should be_like(%Q{
+              SELECT "USERS"."ID"
+              FROM "USERS"
+            })
+          end
+
+          adapter_is_not :mysql, :oracle do
             sql.should be_like(%Q{
               SELECT "users"."id"
               FROM "users"
@@ -42,7 +49,13 @@ module Arel
             })
           end
 
-          adapter_is_not :mysql do
+          adapter_is :oracle do
+            sql.should be_like(%Q{
+              SELECT (SELECT "USERS"."NAME" FROM "USERS") AS "USERS" FROM "USERS"
+            })
+          end
+
+          adapter_is_not :mysql, :oracle do
             sql.should be_like(%Q{
               SELECT (SELECT "users"."name" FROM "users") AS "users" FROM "users"
             })
@@ -60,7 +73,13 @@ module Arel
             })
           end
 
-          adapter_is_not :mysql do
+          adapter_is :oracle do
+            sql.should be_like(%Q{
+              SELECT asdf FROM "USERS"
+            })
+          end
+
+          adapter_is_not :mysql, :oracle do
             sql.should be_like(%Q{
               SELECT asdf FROM "users"
             })
@@ -79,7 +98,14 @@ module Arel
             })
           end
 
-          adapter_is_not :mysql do
+          adapter_is :oracle do
+            sql.should be_like(%Q{
+              SELECT COUNT("USERS"."ID") AS count_id
+              FROM "USERS"
+            })
+          end
+
+          adapter_is_not :mysql, :oracle do
             sql.should be_like(%Q{
               SELECT COUNT("users"."id") AS count_id
               FROM "users"
@@ -97,7 +123,14 @@ module Arel
             })
           end
 
-          adapter_is_not :mysql do
+          adapter_is :oracle do
+            sql.should be_like(%Q{
+              SELECT COUNT(DISTINCT "USERS"."ID") AS count_id
+              FROM "USERS"
+            })
+          end
+
+          adapter_is_not :mysql, :oracle do
             sql.should be_like(%Q{
               SELECT COUNT(DISTINCT "users"."id") AS count_id
               FROM "users"

data/spec/arel/engines/sql/unit/relations/skip_spec.rb

@@ -19,7 +19,16 @@ module Arel
           })
         end
 
-        adapter_is_not :mysql do
+        adapter_is :oracle do
+          sql.should be_like(%Q{
+            select * from (select raw_sql_.*, rownum raw_rnum_ from
+            (SELECT "USERS"."ID", "USERS"."NAME"
+            FROM "USERS") raw_sql_)
+            where raw_rnum_ > 4
+          })
+        end
+
+        adapter_is_not :mysql, :oracle do
           sql.should be_like(%Q{
             SELECT "users"."id", "users"."name"
             FROM "users"

data/spec/arel/engines/sql/unit/relations/table_spec.rb

@@ -17,7 +17,14 @@ module Arel
           })
         end
 
-        adapter_is_not :mysql do
+        adapter_is :oracle do
+          sql.should be_like(%Q{
+            SELECT "USERS"."ID", "USERS"."NAME"
+            FROM "USERS"
+          })
+        end
+
+        adapter_is_not :mysql, :oracle do
           sql.should be_like(%Q{
             SELECT "users"."id", "users"."name"
             FROM "users"
@@ -33,14 +40,21 @@ module Arel
         adapter_is :mysql do
           sql.should be_like(%Q{
             SELECT `super_users`.`id`, `super_users`.`name`
-            FROM `users` AS `super_users`
+            FROM `users` `super_users`
+          })
+        end
+
+        adapter_is :oracle do
+          sql.should be_like(%Q{
+            SELECT "SUPER_USERS"."ID", "SUPER_USERS"."NAME"
+            FROM "USERS" "SUPER_USERS"
           })
         end
 
-        adapter_is_not :mysql do
+        adapter_is_not :mysql, :oracle do
           sql.should be_like(%Q{
             SELECT "super_users"."id", "super_users"."name"
-            FROM "users" AS "super_users"
+            FROM "users" "super_users"
           })
         end
       end
@@ -55,7 +69,14 @@ module Arel
           })
         end
 
-        adapter_is_not :mysql do
+        adapter_is :oracle do
+          sql.should be_like(%Q{
+            SELECT "USERS"."ID", "USERS"."NAME"
+            FROM "USERS"
+          })
+        end
+
+        adapter_is_not :mysql, :oracle do
           sql.should be_like(%Q{
             SELECT "users"."id", "users"."name"
             FROM "users"

data/spec/arel/engines/sql/unit/relations/take_spec.rb

@@ -19,7 +19,24 @@ module Arel
           })
         end
 
-        adapter_is_not :mysql do
+        adapter_is :oracle do
+          sql.should be_like(%Q{
+            SELECT "USERS"."ID", "USERS"."NAME"
+            FROM "USERS"
+            WHERE ROWNUM <= 4
+          })
+
+          sql_with_order_by = Take.new(@relation.order(@relation[:id]), @taken).to_sql
+          sql_with_order_by.should be_like(%Q{
+            select * from
+            (SELECT "USERS"."ID", "USERS"."NAME"
+            FROM "USERS"
+            ORDER BY "USERS"."ID" ASC)
+            where rownum <= 4
+          })
+        end
+
+        adapter_is_not :mysql, :oracle do
           sql.should be_like(%Q{
             SELECT "users"."id", "users"."name"
             FROM "users"

data/spec/arel/engines/sql/unit/relations/update_spec.rb

@@ -36,6 +36,13 @@ module Arel
             SET "id" = 1, "name" = E'nick'
           })
         end
+
+        adapter_is :oracle do
+          sql.should be_like(%Q{
+            UPDATE "USERS"
+            SET "ID" = 1, "NAME" = 'nick'
+          })
+        end
       end
 
       it "manufactures sql updating attributes when given a ranged relation" do
@@ -64,6 +71,23 @@ module Arel
             WHERE "id" IN (SELECT "id" FROM "users"  LIMIT 1)
           })
         end
+
+        adapter_is :oracle do
+          sql.should be_like(%Q{
+            UPDATE "USERS" SET
+            "NAME" = 'nick'
+            WHERE "ID" IN (SELECT "ID" FROM "USERS" WHERE ROWNUM <= 1)
+          })
+
+          sql_with_order_by = Update.new(@relation.order(@relation[:id]).take(1), @relation[:name] => "nick").to_sql
+          sql_with_order_by.should be_like(%Q{
+            UPDATE "USERS" SET
+            "NAME" = 'nick'
+            WHERE "ID" IN (select * from
+                          (SELECT "ID" FROM "USERS" ORDER BY "USERS"."ID" ASC)
+                          where rownum <= 1)
+          })
+        end
       end
 
       describe 'when given values whose types correspond to the types of the attributes' do
@@ -92,6 +116,13 @@ module Arel
               SET "name" = E'nick'
             })
           end
+
+          adapter_is :oracle do
+            @update.to_sql.should be_like(%Q{
+              UPDATE "USERS"
+              SET "NAME" = 'nick'
+            })
+          end
         end
       end
 
@@ -108,7 +139,14 @@ module Arel
             })
           end
 
-          adapter_is_not :mysql do
+          adapter_is :oracle do
+            @update.to_sql.should be_like(%Q{
+              UPDATE "USERS"
+              SET "ID" = 1
+            })
+          end
+
+          adapter_is_not :mysql, :oracle do
             @update.to_sql.should be_like(%Q{
               UPDATE "users"
               SET "id" = 1
@@ -149,6 +187,14 @@ module Arel
               WHERE "users"."id" = 1
             })
           end
+
+          adapter_is :oracle do
+            @update.to_sql.should be_like(%Q{
+              UPDATE "USERS"
+              SET "NAME" = 'nick'
+              WHERE "USERS"."ID" = 1
+            })
+          end
         end
       end
     end

data/spec/arel/engines/sql/unit/relations/where_spec.rb

@@ -20,7 +20,15 @@ module Arel
             })
           end
 
-          adapter_is_not :mysql do
+          adapter_is :oracle do
+            sql.should be_like(%Q{
+              SELECT "USERS"."ID", "USERS"."NAME"
+              FROM "USERS"
+              WHERE "USERS"."ID" = 1
+            })
+          end
+
+          adapter_is_not :mysql, :oracle do
             sql.should be_like(%Q{
               SELECT "users"."id", "users"."name"
               FROM "users"
@@ -42,7 +50,15 @@ module Arel
             })
           end
 
-          adapter_is_not :mysql do
+          adapter_is :oracle do
+            sql.should be_like(%Q{
+              SELECT "USERS"."ID", "USERS"."NAME"
+              FROM "USERS"
+              WHERE asdf
+            })
+          end
+
+          adapter_is_not :mysql, :oracle do
             sql.should be_like(%Q{
               SELECT "users"."id", "users"."name"
               FROM "users"

data/spec/connections/oracle_connection.rb

@@ -0,0 +1,19 @@
+puts "Using native Oracle"
+require "active_record"
+require 'logger'
+
+# Prepend oracle_enhanced local development directory in front of load path
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../../oracle-enhanced/lib"
+
+ActiveRecord::Base.logger = Logger.new("debug.log")
+
+ActiveRecord::Base.configurations = {
+  'unit' => {
+    :adapter  => 'oracle_enhanced',
+    :username => 'arel_unit',
+    :password => 'arel_unit',
+    :database => 'orcl',
+  }
+}
+
+ActiveRecord::Base.establish_connection 'unit'

data/spec/schemas/mysql_schema.rb

@@ -16,7 +16,8 @@ sql = <<-SQL
     id INTEGER NOT NULL AUTO_INCREMENT PRIMARY KEY,
     name VARCHAR(255) NOT NULL,
     salary INTEGER NOT NULL,
-    department VARCHAR(255) NOT NULL
+    department VARCHAR(255) NOT NULL,
+    created_at TIMESTAMP NOT NULL
   );
 SQL