arel 0.2.1 → 0.3.0

data/spec/arel/engines/sql/unit/predicates/in_spec.rb

@@ -22,7 +22,11 @@ module Arel
                 sql.should be_like(%Q{`users`.`id` IN (1, 2, 3)})
               end
 
-              adapter_is_not :mysql do
+              adapter_is :oracle do
+                sql.should be_like(%Q{"USERS"."ID" IN (1, 2, 3)})
+              end
+
+              adapter_is_not :mysql, :oracle do
                 sql.should be_like(%Q{"users"."id" IN (1, 2, 3)})
               end
             end
@@ -40,7 +44,11 @@ module Arel
                 sql.should be_like(%Q{`users`.`id` IN (1, 2, 3)})
               end
 
-              adapter_is_not :mysql do
+              adapter_is :oracle do
+                sql.should be_like(%Q{"USERS"."ID" IN (1, 2, 3)})
+              end
+
+              adapter_is_not :mysql, :oracle do
                 sql.should be_like(%Q{"users"."id" IN (1, 2, 3)})
               end
             end
@@ -58,7 +66,11 @@ module Arel
                 sql.should be_like(%Q{`users`.`id` IN (NULL)})
               end
 
-              adapter_is_not :mysql do
+              adapter_is :oracle do
+                sql.should be_like(%Q{"USERS"."ID" IN (NULL)})
+              end
+
+              adapter_is_not :mysql, :oracle do
                 sql.should be_like(%Q{"users"."id" IN (NULL)})
               end
             end
@@ -78,12 +90,48 @@ module Arel
               sql.should be_like(%Q{`users`.`id` BETWEEN 1 AND 2})
             end
 
-            adapter_is_not :mysql do
+            adapter_is :oracle do
+              sql.should be_like(%Q{"USERS"."ID" BETWEEN 1 AND 2})
+            end
+
+            adapter_is_not :mysql, :oracle do
               sql.should be_like(%Q{"users"."id" BETWEEN 1 AND 2})
             end
           end
         end
 
+        describe 'when relating to a time range' do
+          before do
+            @relation = Arel::Table.new(:developers)
+            @attribute = @relation[:created_at]
+            @range = Time.mktime(2010, 01, 01)..Time.mktime(2010, 02, 01)
+          end
+
+          it 'manufactures sql with a between' do
+            sql = In.new(@attribute, @range).to_sql
+
+            adapter_is :mysql do
+              sql.should be_like(%Q{`developers`.`created_at` BETWEEN '2010-01-01 00:00:00' AND '2010-02-01 00:00:00'})
+            end
+
+            adapter_is :sqlite3 do
+              if RUBY_VERSION < '1.9'
+                sql.should be_like(%Q{"developers"."created_at" BETWEEN '2010-01-01 00:00:00.000000' AND '2010-02-01 00:00:00.000000'})
+              else
+                sql.should be_like(%Q{"developers"."created_at" BETWEEN '2010-01-01 00:00:00' AND '2010-02-01 00:00:00'})
+              end
+            end
+
+            adapter_is :postgresql do
+              sql.should be_like(%Q{"developers"."created_at" BETWEEN '2010-01-01 00:00:00.000000' AND '2010-02-01 00:00:00.000000'})
+            end
+
+            adapter_is :oracle do
+              sql.should be_like(%Q{"DEVELOPERS"."CREATED_AT" BETWEEN TO_TIMESTAMP('2010-01-01 00:00:00:000000','YYYY-MM-DD HH24:MI:SS:FF6') AND TO_TIMESTAMP('2010-02-01 00:00:00:000000','YYYY-MM-DD HH24:MI:SS:FF6')})
+            end
+          end
+        end
+
         describe 'when relating to a relation' do
           it 'manufactures sql with a subselect' do
             sql = In.new(@attribute, @relation).to_sql
@@ -94,7 +142,13 @@ module Arel
               })
             end
 
-            adapter_is_not :mysql do
+            adapter_is :oracle do
+              sql.should be_like(%Q{
+                "USERS"."ID" IN (SELECT "USERS"."ID", "USERS"."NAME" FROM "USERS")
+              })
+            end
+
+            adapter_is_not :mysql, :oracle do
               sql.should be_like(%Q{
                 "users"."id" IN (SELECT "users"."id", "users"."name" FROM "users")
               })

data/spec/arel/engines/sql/unit/predicates/predicates_spec.rb

@@ -33,6 +33,12 @@ module Arel
                 ("users"."id" = 1 AND "users"."name" = E'name')
               })
             end
+
+            adapter_is :oracle do
+              sql.should be_like(%Q{
+                ("USERS"."ID" = 1 AND "USERS"."NAME" = 'name')
+              })
+            end
           end
         end
       end
@@ -59,6 +65,12 @@ module Arel
                 ("users"."id" = 1 OR "users"."name" = E'name')
               })
             end
+
+            adapter_is :oracle do
+              sql.should be_like(%Q{
+                ("USERS"."ID" = 1 OR "USERS"."NAME" = 'name')
+              })
+            end
           end
         end
       end

data/spec/arel/engines/sql/unit/primitives/attribute_spec.rb

@@ -22,11 +22,34 @@ module Arel
             sql.should be_like(%Q{`users`.`id`})
           end
 
-          adapter_is_not :mysql do
+          adapter_is :oracle do
+            sql.should be_like(%Q{"USERS"."ID"})
+          end
+
+          adapter_is_not :mysql, :oracle do
             sql.should be_like(%Q{"users"."id"})
           end
         end
       end
+
+      describe 'for an inexistent attribute' do
+        it "manufactures sql" do
+          sql = @relation[:does_not_exist].to_sql
+
+          adapter_is :mysql do
+            sql.should be_like(%Q{`users`.`does_not_exist`})
+          end
+
+          adapter_is :oracle do
+            sql.should be_like(%Q{"USERS"."DOEST_NOT_EXIST"})
+          end
+
+          adapter_is_not :mysql, :oracle do
+            sql.should be_like(%Q{"users"."does_not_exist"})
+          end
+        end
+      end
+
     end
   end
 end

data/spec/arel/engines/sql/unit/primitives/expression_spec.rb

@@ -15,7 +15,11 @@ module Arel
           sql.should be_like(%Q{COUNT(`users`.`id`) AS `alias`})
         end
 
-        adapter_is_not :mysql do
+        adapter_is :oracle do
+          sql.should be_like(%Q{COUNT("USERS"."ID") AS "ALIAS"})
+        end
+
+        adapter_is_not :mysql, :oracle do
           sql.should be_like(%Q{COUNT("users"."id") AS "alias"})
         end
       end

data/spec/arel/engines/sql/unit/primitives/literal_spec.rb

@@ -14,7 +14,11 @@ module Arel
           sql.should be_like(%Q{SELECT COUNT(*) AS count_id FROM `users`})
         end
 
-        adapter_is_not :mysql do
+        adapter_is :oracle do
+          sql.should be_like(%Q{SELECT COUNT(*) AS count_id FROM "USERS"})
+        end
+
+        adapter_is_not :mysql, :oracle do
           sql.should be_like(%Q{SELECT COUNT(*) AS count_id FROM "users"})
         end
       end
@@ -26,7 +30,11 @@ module Arel
           sql.should be_like(%Q{SELECT SUM(2 * credit_limit) AS sum_id FROM `users`})
         end
 
-        adapter_is_not :mysql do
+        adapter_is :oracle do
+          sql.should be_like(%Q{SELECT SUM(2 * credit_limit) AS sum_id FROM "USERS"})
+        end
+
+        adapter_is_not :mysql, :oracle do
           sql.should be_like(%Q{SELECT SUM(2 * credit_limit) AS sum_id FROM "users"})
         end
       end

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

@@ -27,7 +27,17 @@ module Arel
             })
           end
 
-          adapter_is_not :mysql do
+          adapter_is :oracle do
+            sql.should be_like(%Q{
+              SELECT "USERS"."ID"
+              FROM "USERS"
+              WHERE "USERS"."ID" = 1
+              GROUP BY "USERS"."ID"
+              ORDER BY "USERS"."ID" ASC
+            })
+          end
+
+          adapter_is_not :mysql, :oracle do
             sql.should be_like(%Q{
               SELECT "users"."id"
               FROM "users"

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

@@ -14,7 +14,11 @@ module Arel
           sql.should be_like(%Q{DELETE FROM `users`})
         end
 
-        adapter_is_not :mysql do
+        adapter_is :oracle do
+          sql.should be_like(%Q{DELETE FROM "USERS"})
+        end
+
+        adapter_is_not :mysql, :oracle do
           sql.should be_like(%Q{DELETE FROM "users"})
         end
       end
@@ -30,7 +34,15 @@ module Arel
           })
         end
 
-        adapter_is_not :mysql do
+        adapter_is :oracle do
+          sql.should be_like(%Q{
+            DELETE
+            FROM "USERS"
+            WHERE "USERS"."ID" = 1
+          })
+        end
+
+        adapter_is_not :mysql, :oracle do
           sql.should be_like(%Q{
             DELETE
             FROM "users"
@@ -50,7 +62,15 @@ module Arel
           })
         end
 
-        adapter_is_not :mysql do
+        adapter_is :oracle do
+          sql.should be_like(%Q{
+            DELETE
+            FROM "USERS"
+            WHERE ROWNUM <= 1
+          })
+        end
+
+        adapter_is_not :mysql, :oracle do
           sql.should be_like(%Q{
             DELETE
             FROM "users"

data/spec/arel/engines/sql/unit/relations/from_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 workers
+          })
+        end
+
+        adapter_is_not :mysql, :oracle do
           sql.should be_like(%Q{
             SELECT "users"."id", "users"."name"
             FROM workers
@@ -37,7 +44,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/group_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"
+              GROUP BY "USERS"."ID"
+            })
+          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"
+              GROUP BY asdf
+            })
+          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/having_spec.rb

@@ -13,16 +13,25 @@ module Arel
 
           adapter_is :mysql do
             sql.should be_like(%Q{
-              SELECT `developers`.`id`, `developers`.`name`, `developers`.`salary`, `developers`.`department`
+              SELECT `developers`.`id`, `developers`.`name`, `developers`.`salary`, `developers`.`department`, `developers`.`created_at`
               FROM `developers`
               GROUP BY `developers`.`department`
               HAVING MIN(salary) > 1000
             })
           end
 
-          adapter_is_not :mysql do
+          adapter_is :oracle do
             sql.should be_like(%Q{
-              SELECT "developers"."id", "developers"."name", "developers"."salary", "developers"."department"
+              SELECT "DEVELOPERS"."ID", "DEVELOPERS"."NAME", "DEVELOPERS"."SALARY", "DEVELOPERS"."DEPARTMENT", "DEVELOPERS"."CREATED_AT"
+              FROM "DEVELOPERS"
+              GROUP BY "DEVELOPERS"."DEPARTMENT"
+              HAVING MIN(salary) > 1000
+            })
+          end
+
+          adapter_is_not :mysql, :oracle do
+            sql.should be_like(%Q{
+              SELECT "developers"."id", "developers"."name", "developers"."salary", "developers"."department", "developers"."created_at"
               FROM "developers"
               GROUP BY "developers"."department"
               HAVING MIN(salary) > 1000

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

@@ -43,6 +43,15 @@ module Arel
             INSERT
             INTO "users"
             ("id", "name") VALUES (1, E'nick')
+            RETURNING "id"
+          })
+        end
+
+        adapter_is :oracle do
+          @insertion.to_sql.should be_like(%Q{
+            INSERT
+            INTO "USERS"
+            ("ID", "NAME") VALUES (1, 'nick')
           })
         end
       end
@@ -74,6 +83,15 @@ module Arel
               INSERT
               INTO "users"
               ("name") VALUES (E'nick')
+              RETURNING "id"
+            })
+          end
+
+          adapter_is :oracle do
+            @insertion.to_sql.should be_like(%Q{
+              INSERT
+              INTO "USERS"
+              ("NAME") VALUES ('nick')
             })
           end
         end
@@ -93,13 +111,31 @@ module Arel
             })
           end
 
-          adapter_is_not :mysql do
+          adapter_is :sqlite3 do
             @insertion.to_sql.should be_like(%Q{
               INSERT
               INTO "users"
               ("id") VALUES (1)
             })
           end
+
+          adapter_is :postgresql do
+            @insertion.to_sql.should be_like(%Q{
+              INSERT
+              INTO "users"
+              ("id") VALUES (1)
+              RETURNING "id"
+            })
+          end
+
+          adapter_is :oracle do
+            @insertion.to_sql.should be_like(%Q{
+              INSERT
+              INTO "USERS"
+              ("ID") VALUES (1)
+            })
+          end
+
         end
       end
     end

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

@@ -28,7 +28,15 @@ module Arel
             })
           end
 
-          adapter_is_not :mysql do
+          adapter_is :oracle do
+            sql.should be_like(%Q{
+              SELECT "USERS"."ID", "USERS"."NAME", "PHOTOS"."ID", "PHOTOS"."USER_ID", "PHOTOS"."CAMERA_ID"
+              FROM "USERS"
+                INNER JOIN "PHOTOS" ON "USERS"."ID" = "PHOTOS"."USER_ID"
+            })
+          end
+
+          adapter_is_not :mysql, :oracle do
             sql.should be_like(%Q{
               SELECT "users"."id", "users"."name", "photos"."id", "photos"."user_id", "photos"."camera_id"
               FROM "users"
@@ -44,15 +52,23 @@ module Arel
             adapter_is :mysql do
               sql.should be_like(%Q{
                 SELECT `super_users`.`id`, `super_users`.`name`, `photos`.`id`, `photos`.`user_id`, `photos`.`camera_id`
-                FROM `users` AS `super_users`
+                FROM `users` `super_users`
                   INNER JOIN `photos` ON `super_users`.`id` = `photos`.`user_id`
               })
             end
 
-            adapter_is_not :mysql do
+            adapter_is :oracle do
+              sql.should be_like(%Q{
+                SELECT "SUPER_USERS"."ID", "SUPER_USERS"."NAME", "PHOTOS"."ID", "PHOTOS"."USER_ID", "PHOTOS"."CAMERA_ID"
+                FROM "USERS" "SUPER_USERS"
+                  INNER JOIN "PHOTOS" ON "SUPER_USERS"."ID" = "PHOTOS"."USER_ID"
+              })
+            end
+
+            adapter_is_not :mysql, :oracle do
               sql.should be_like(%Q{
                 SELECT "super_users"."id", "super_users"."name", "photos"."id", "photos"."user_id", "photos"."camera_id"
-                FROM "users" AS "super_users"
+                FROM "users" "super_users"
                   INNER JOIN "photos" ON "super_users"."id" = "photos"."user_id"
               })
             end
@@ -66,16 +82,24 @@ module Arel
             adapter_is :mysql do
               sql.should be_like(%Q{
                 SELECT `super_users`.`id`, `super_users`.`name`, `super_photos`.`id`, `super_photos`.`user_id`, `super_photos`.`camera_id`
-                FROM `users` AS `super_users`
-                  INNER JOIN `photos` AS `super_photos` ON `super_users`.`id` = `super_photos`.`user_id`
+                FROM `users` `super_users`
+                  INNER JOIN `photos` `super_photos` ON `super_users`.`id` = `super_photos`.`user_id`
+              })
+            end
+
+            adapter_is :oracle do
+              sql.should be_like(%Q{
+                SELECT "SUPER_USERS"."ID", "SUPER_USERS"."NAME", "SUPER_PHOTOS"."ID", "SUPER_PHOTOS"."USER_ID", "SUPER_PHOTOS"."CAMERA_ID"
+                FROM "USERS" "SUPER_USERS"
+                  INNER JOIN "PHOTOS" "SUPER_PHOTOS" ON "SUPER_USERS"."ID" = "SUPER_PHOTOS"."USER_ID"
               })
             end
 
-            adapter_is_not :mysql do
+            adapter_is_not :mysql, :oracle do
               sql.should be_like(%Q{
                 SELECT "super_users"."id", "super_users"."name", "super_photos"."id", "super_photos"."user_id", "super_photos"."camera_id"
-                FROM "users" AS "super_users"
-                  INNER JOIN "photos" AS "super_photos" ON "super_users"."id" = "super_photos"."user_id"
+                FROM "users" "super_users"
+                  INNER JOIN "photos" "super_photos" ON "super_users"."id" = "super_photos"."user_id"
               })
             end
           end
@@ -95,7 +119,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"
+                INNER JOIN asdf ON fdsa
+            })
+          end
+
+          adapter_is_not :mysql, :oracle do
             sql.should be_like(%Q{
               SELECT "users"."id", "users"."name"
               FROM "users"
@@ -119,7 +151,17 @@ module Arel
             })
           end
 
-          adapter_is_not :mysql do
+          adapter_is :oracle do
+            sql.should be_like(%Q{
+              SELECT "USERS"."ID", "USERS"."NAME"
+              FROM "USERS"
+                INNER JOIN asdf ON fdsa
+                INNER JOIN lifo ON fifo
+                INNER JOIN hatful ON hallow
+            })
+          end
+
+          adapter_is_not :mysql, :oracle do
             sql.should be_like(%Q{
               SELECT "users"."id", "users"."name"
               FROM "users"