From 5afed6d45def1e72df24679a746cbe96b52c1709 Mon Sep 17 00:00:00 2001
From: Ernie Miller <ernie@metautonomo.us>
Date: Sat, 24 Apr 2010 08:02:47 -0400
Subject: Inequality shouldn't descend from equality, due to Rails type checks,
 and resolve conflicts from rebase

---
 spec/engines/sql/unit/predicates/not_spec.rb   | 75 --------------------------
 spec/engines/sql/unit/predicates/noteq_spec.rb | 75 ++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 75 deletions(-)
 delete mode 100644 spec/engines/sql/unit/predicates/not_spec.rb
 create mode 100644 spec/engines/sql/unit/predicates/noteq_spec.rb

(limited to 'spec/engines/sql')

diff --git a/spec/engines/sql/unit/predicates/not_spec.rb b/spec/engines/sql/unit/predicates/not_spec.rb
deleted file mode 100644
index b124d4c80b..0000000000
--- a/spec/engines/sql/unit/predicates/not_spec.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-require 'spec_helper'
-
-module Arel
-  module Predicates
-    describe Equality do
-      before do
-        @relation1 = Arel::Table.new(:users)
-        @relation2 = Arel::Table.new(:photos)
-        @attribute1 = @relation1[:id]
-        @attribute2 = @relation2[:user_id]
-      end
-
-      describe '#to_sql' do
-        describe 'when relating to a non-nil value' do
-          it "manufactures a not predicate" do
-            sql = Not.new(@attribute1, @attribute2).to_sql
-
-            adapter_is :mysql do
-              sql.should be_like(%Q{`users`.`id` != `photos`.`user_id`})
-            end
-
-            adapter_is :oracle do
-              sql.should be_like(%Q{"USERS"."ID" != "PHOTOS"."USER_ID"})
-            end
-
-            adapter_is_not :mysql, :oracle do
-              sql.should be_like(%Q{"users"."id" != "photos"."user_id"})
-            end
-          end
-        end
-
-        describe 'when relation to a nil value' do
-          before do
-            @nil = nil
-          end
-
-          it "manufactures an is null predicate" do
-            sql = Not.new(@attribute1, @nil).to_sql
-
-            adapter_is :mysql do
-              sql.should be_like(%Q{`users`.`id` IS NOT NULL})
-            end
-
-            adapter_is :oracle do
-              sql.should be_like(%Q{"USERS"."ID" IS NOT NULL})
-            end
-
-            adapter_is_not :mysql, :oracle do
-              sql.should be_like(%Q{"users"."id" IS NOT NULL})
-            end
-          end
-        end
-
-        describe "when relating to a nil Value" do
-          it "manufactures an IS NULL predicate" do
-            value = nil.bind(@relation1)
-            sql = Not.new(@attribute1, value).to_sql
-
-            adapter_is :mysql do
-              sql.should be_like(%Q{`users`.`id` IS NOT NULL})
-            end
-
-            adapter_is :oracle do
-              sql.should be_like(%Q{"USERS"."ID" IS NOT NULL})
-            end
-
-            adapter_is_not :mysql, :oracle do
-              sql.should be_like(%Q{"users"."id" IS NOT NULL})
-            end
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/spec/engines/sql/unit/predicates/noteq_spec.rb b/spec/engines/sql/unit/predicates/noteq_spec.rb
new file mode 100644
index 0000000000..ed24627323
--- /dev/null
+++ b/spec/engines/sql/unit/predicates/noteq_spec.rb
@@ -0,0 +1,75 @@
+require 'spec_helper'
+
+module Arel
+  module Predicates
+    describe Equality do
+      before do
+        @relation1 = Arel::Table.new(:users)
+        @relation2 = Arel::Table.new(:photos)
+        @attribute1 = @relation1[:id]
+        @attribute2 = @relation2[:user_id]
+      end
+
+      describe '#to_sql' do
+        describe 'when relating to a non-nil value' do
+          it "manufactures a not predicate" do
+            sql = Inequality.new(@attribute1, @attribute2).to_sql
+
+            adapter_is :mysql do
+              sql.should be_like(%Q{`users`.`id` != `photos`.`user_id`})
+            end
+
+            adapter_is :oracle do
+              sql.should be_like(%Q{"USERS"."ID" != "PHOTOS"."USER_ID"})
+            end
+
+            adapter_is_not :mysql, :oracle do
+              sql.should be_like(%Q{"users"."id" != "photos"."user_id"})
+            end
+          end
+        end
+
+        describe 'when relation to a nil value' do
+          before do
+            @nil = nil
+          end
+
+          it "manufactures an is null predicate" do
+            sql = Inequality.new(@attribute1, @nil).to_sql
+
+            adapter_is :mysql do
+              sql.should be_like(%Q{`users`.`id` IS NOT NULL})
+            end
+
+            adapter_is :oracle do
+              sql.should be_like(%Q{"USERS"."ID" IS NOT NULL})
+            end
+
+            adapter_is_not :mysql, :oracle do
+              sql.should be_like(%Q{"users"."id" IS NOT NULL})
+            end
+          end
+        end
+
+        describe "when relating to a nil Value" do
+          it "manufactures an IS NULL predicate" do
+            value = nil.bind(@relation1)
+            sql = Inequality.new(@attribute1, value).to_sql
+
+            adapter_is :mysql do
+              sql.should be_like(%Q{`users`.`id` IS NOT NULL})
+            end
+
+            adapter_is :oracle do
+              sql.should be_like(%Q{"USERS"."ID" IS NOT NULL})
+            end
+
+            adapter_is_not :mysql, :oracle do
+              sql.should be_like(%Q{"users"."id" IS NOT NULL})
+            end
+          end
+        end
+      end
+    end
+  end
+end
-- 
cgit v1.2.3