From 547ae17e06fd57b060277e520a0a1c5efa41a0f6 Mon Sep 17 00:00:00 2001
From: PikachuEXE <pikachuexe@gmail.com>
Date: Thu, 9 Jan 2014 17:06:07 +0800
Subject: [PATCH] Fix relation generation for new record

---
 lib/friendly_id/scoped.rb  | 6 +++---
 lib/friendly_id/slugged.rb | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/friendly_id/scoped.rb b/lib/friendly_id/scoped.rb
index 92b3dd7e2..4bb072168 100644
--- a/lib/friendly_id/scoped.rb
+++ b/lib/friendly_id/scoped.rb
@@ -127,13 +127,13 @@ def scope_for_slug_generator
         relation = relation.where(column => send(column))
       end
       if changed.include?(friendly_id_config.slug_column)
-        column = self.class.quoted_table_name + '.' + self.class.quoted_primary_key
-        relation = relation.where("#{column} <> ?", send(self.class.primary_key))
+        primary_key_name = self.class.primary_key
+        relation = relation.where.not(primary_key_name => send(primary_key_name))
       end
       relation
     end
     private :scope_for_slug_generator
-    
+
     def slug_generator
       friendly_id_config.slug_generator_class.new(scope_for_slug_generator)
     end
diff --git a/lib/friendly_id/slugged.rb b/lib/friendly_id/slugged.rb
index e8b7186dc..63d3017a1 100644
--- a/lib/friendly_id/slugged.rb
+++ b/lib/friendly_id/slugged.rb
@@ -302,8 +302,8 @@ def scope_for_slug_generator
       scope = scope.friendly unless friendly_id_config.uses? :finders
 
       if changed.include?(friendly_id_config.slug_column)
-        column = self.class.quoted_table_name + '.' + self.class.quoted_primary_key
-        scope = scope.where("#{column} <> ?", send(self.class.primary_key))
+        primary_key_name = self.class.primary_key
+        scope = scope.where.not(primary_key_name => send(primary_key_name))
       end
       scope
     end