lib/og/adapters/sqlite.rb in og-0.15.0 vs lib/og/adapters/sqlite.rb in og-0.16.0

@@ -1,21 +1,19 @@
 # * George Moschovitis  <[e-mail]>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: sqlite.rb 326 2005-03-28 11:07:17Z gmosx $
+# $Id: sqlite.rb 17 2005-04-14 16:03:40Z gmosx $
 
 begin
 	require 'sqlite3'
 rescue Object => ex
 	Logger.error 'Ruby-Sqlite3 bindings are not installed!'
 	Logger.error ex
 end
 
 require 'fileutils'
 
-require 'og/adapter'
-require 'og/connection'
-require 'glue/attribute'
+require 'og/adapters/base'
 
 module Og
 
 # The SQLite adapter. This adapter communicates with 
 # an SQLite3 rdbms. For extra documentation see 
@@ -48,21 +46,19 @@
 		else 
 			return %|#\{@#{p.symbol} ? "'#\{#{self.class}.escape(@#{p.symbol}.to_yaml)\}'" : "''"\}|
 		end
 	end		
 =end
-	def insert_code(klass, db, pre_cb, post_cb)
+	def insert_code(klass, db)
 		props = props_for_insert(klass)
 		values = props.collect { |p| write_prop(p) }.join(',') 
 		
 		sql = "INSERT INTO #{klass::DBTABLE} (#{props.collect {|p| p.name}.join(',')}) VALUES (#{values})"
 
 		%{
-			#{pre_cb}
 			conn.store.query("#{sql}").close
 			@oid = conn.store.last_insert_row_id
-			#{post_cb}
 		}
 =begin		
 		props = props_for_insert(klass)
 		
 		placeholders = Array.new(props.size, '?').join(',')
@@ -231,11 +227,11 @@
 	def read_one(res, klass)
 		return nil unless valid_res?(res)
 		row = res.next
 		return nil unless row
 
-		obj = klass.new
+		obj = klass.allocate
 		obj.og_read(row)
 	
 		res.close
 		return obj
 	end
@@ -243,10 +239,10 @@
 	def read_all(res, klass)
 		return [] unless valid_res?(res)
 		objects = []
 
 		res.each do |row|
-			obj = klass.new
+			obj = klass.allocate
 			obj.og_read(row)
 			objects << obj
 		end
 		
 		res.close