lib/og/adapters/sqlite.rb in og-0.13.0 vs lib/og/adapters/sqlite.rb in og-0.14.0

@@ -1,10 +1,16 @@
 # * George Moschovitis  <[e-mail]>
 # (c) 2004-2005 Navel, all rights reserved.
-# $Id: sqlite.rb 281 2005-03-10 12:24:14Z gmosx $
+# $Id: sqlite.rb 326 2005-03-28 11:07:17Z gmosx $
 
-require 'sqlite3'
+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'
@@ -191,23 +197,20 @@
 	def query(sql)
 		Logger.debug sql if $DBG
 		begin
 			return @store.query(sql)
 		rescue => ex
-			Logger.error "DB error #{ex}, [#{sql}]"
-			Logger.error ex.backtrace.join("\n")
-			return nil
+			handle_db_exception(ex, sql)
 		end
 	end
 
 	def exec(sql)
 		Logger.debug sql if $DBG
 		begin
 			@store.query(sql).close 
 		rescue => ex
-			Logger.error "DB error #{ex}, [#{sql}]"
-			Logger.error ex.backtrace.join("\n")
+			handle_db_exception(ex, sql)
 		end
 	end
 
 	def start
 		@store.transaction
@@ -253,9 +256,13 @@
 
 	def read_int(res, idx = 0)
 		val = res.next[idx].to_i
 		res.close
 		return val
+	end
+
+	def get_row(res)
+		res.next
 	end
 
 end
 
 end