* declaring 'id' as primary key. this makes factory_girl behave on jdbc
This commit is contained in:
parent
0f847580e6
commit
e8ebdeb5ef
|
|
@ -33,7 +33,7 @@ module JamRuby
|
|||
# create a jam session login message
|
||||
def login_jam_session(jam_session)
|
||||
login_jam_session = Jampb::LoginJamSession.new(:jam_session => jam_session)
|
||||
return Jampb::ClientMessage.new(:type => ClientMessage::Type::LOGIN_JAM_SESSION, :target => SESSION_TARGET_PREFIX + jam_session_id, :login_jam_session => login_jam_session)
|
||||
return Jampb::ClientMessage.new(:type => ClientMessage::Type::LOGIN_JAM_SESSION, :target => SESSION_TARGET_PREFIX + jam_session, :login_jam_session => login_jam_session)
|
||||
end
|
||||
|
||||
# create a jam session login message ack (success or on failure)
|
||||
|
|
@ -78,16 +78,16 @@ module JamRuby
|
|||
|
||||
# is this message directed to a (jam) session?
|
||||
def session_directed? msg
|
||||
return msg.start_with? MessageFactory::SESSION_PREFIX_TARGET
|
||||
return msg.target.start_with? MessageFactory::SESSION_TARGET_PREFIX
|
||||
end
|
||||
|
||||
# is this message directed to a user?
|
||||
def user_directed? msg
|
||||
return msg.start_with? MessageFactory::USER_PREFIX_TARGET
|
||||
return msg.target.start_with? MessageFactory::USER_PREFIX_TARGET
|
||||
end
|
||||
|
||||
def extract_session(msg)
|
||||
return
|
||||
return msg.target[MessageFactory::SESSION_TARGET_PREFIX..-1]
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
module JamRuby
|
||||
class JamSession < ActiveRecord::Base
|
||||
|
||||
set_primary_key :id
|
||||
belongs_to :user, :inverse_of => :jam_sessions
|
||||
|
||||
has_many :jam_session_members
|
||||
|
|
@ -12,4 +13,4 @@ module JamRuby
|
|||
end
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
module JamRuby
|
||||
class JamSessionMember < ActiveRecord::Base
|
||||
|
||||
set_primary_key :id
|
||||
belongs_to :user
|
||||
belongs_to :jam_session
|
||||
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ module JamRuby
|
|||
|
||||
attr_accessible :name, :email, :password, :password_confirmation
|
||||
|
||||
set_primary_key :id
|
||||
has_many :jam_session_members
|
||||
has_many :created_jam_sessions, :foreign_key => "user_id", :inverse_of => :user # sessions *created* by the user
|
||||
has_many :jam_sessions, :through => :jam_session_members
|
||||
|
|
@ -24,4 +25,4 @@ module JamRuby
|
|||
self.remember_token = SecureRandom.urlsafe_base64
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue