sql.rb in vines-0.3.0

- old
+ new

@@ -38,11 +38,11 @@
       end
 
       def find_user(jid)
         ActiveRecord::Base.clear_reloadable_connections!
 
-        jid = JID.new(jid || '').bare.to_s
+        jid = JID.new(jid).bare.to_s
         return if jid.empty?
         xuser = user_by_jid(jid)
         return Vines::User.new(:jid => jid).tap do |user|
           user.name, user.password = xuser.name, xuser.password
           xuser.contacts.each do |contact|
@@ -97,11 +97,11 @@
       defer :save_user
 
       def find_vcard(jid)
         ActiveRecord::Base.clear_reloadable_connections!
 
-        jid = JID.new(jid || '').bare.to_s
+        jid = JID.new(jid).bare.to_s
         return if jid.empty?
         if xuser = user_by_jid(jid)
           Nokogiri::XML(xuser.vcard).root rescue nil
         end
       end
@@ -119,11 +119,11 @@
       defer :save_vcard
 
       def find_fragment(jid, node)
         ActiveRecord::Base.clear_reloadable_connections!
 
-        jid = JID.new(jid || '').bare.to_s
+        jid = JID.new(jid).bare.to_s
         return if jid.empty?
         if fragment = fragment_by_jid(jid, node)
           Nokogiri::XML(fragment.xml).root rescue nil
         end
       end
@@ -149,19 +149,19 @@
 
         args[:force] ||= false
 
         ActiveRecord::Schema.define do
           create_table :users, :force => args[:force] do |t|
-            t.string :jid,      :limit => 1000, :null => false
+            t.string :jid,      :limit => 2048, :null => false
             t.string :name,     :limit => 1000, :null => true
             t.string :password, :limit => 1000, :null => true
             t.text   :vcard,    :null => true
           end
           add_index :users, :jid, :unique => true
 
           create_table :contacts, :force => args[:force] do |t|
             t.integer :user_id,      :null => false
-            t.string  :jid,          :limit => 1000, :null => false
+            t.string  :jid,          :limit => 2048, :null => false
             t.string  :name,         :limit => 1000, :null => true
             t.string  :ask,          :limit => 1000, :null => true
             t.string  :subscription, :limit => 1000, :null => false
           end
           add_index :contacts, [:user_id, :jid], :unique => true