Changeset 225 for trunk/lib/camping/reloader.rb

Timestamp:

09/26/2007 03:52:10 (14 months ago)

Author:

zimbatm

Message:

Working on Sessions and database :

• FIX: Session table was always created
  
• FIX: Sessions weren't stored correctly because of the custom
  non-autoincrement id. Using SQL injection to bypass the forced "id" :-]
  (aka. where opinionated software is not always good)
  
• ENHANCEMENT: Added index for sessions's hashid for faster lookup
  
• FIX: 'sqlite3_api' was loaded after the connection.
  

Files:

• trunk/lib/camping/reloader.rb (modified) (2 diffs)

trunk/lib/camping/reloader.rb

@@ -137 +137 @@
             # If database models are present, `autoload?` will return nil.
             unless Camping::Models.autoload? :Base
-                require 'logger'
-                require 'camping/session'
-                Camping::Models::Base.establish_connection @database if @database
-
-                case @log
-                when Logger
-                    Camping::Models::Base.logger = @log
-                when String
-                    Camping::Models::Base.logger = Logger.new(@log == "-" ? STDOUT : @log)
-                end
-
-                Camping::Models::Session.create_schema
-
                 if @database and @database[:adapter] == 'sqlite3'
                     begin
@@ -158 +145 @@
                     end
                 end
+
+                case @log
+                when Logger
+                    Camping::Models::Base.logger = @log
+                when String
+                    require 'logger'
+                    Camping::Models::Base.logger = Logger.new(@log == "-" ? STDOUT : @log)
+                end
+
+                Camping::Models::Base.establish_connection @database if @database
+
+                if Camping::Models.const_defined?(:Session)
+                  Camping::Models::Session.create_schema
+                end
             end
         end