psql.rb in nitro-0.9.5

- old
+ new

@@ -10,11 +10,11 @@
 
 # Implements a PostgreSQL powered backend.
 # This backend is compatible with Michael Neumann's postgres-pr
 # pure ruby driver.
 
-class PsqlBackend < Og::Backend
+class PsqlBackend < Backend
 
 	# A mapping between Ruby and SQL types.
 	
 	TYPEMAP = {
 		Integer => 'integer',
@@ -99,19 +99,19 @@
 		if p.klass.ancestors.include?(Integer)
 			return "#\{@#{p.symbol} || 'NULL'\}"
 		elsif p.klass.ancestors.include?(Float)
 			return "#\{@#{p.symbol} || 'NULL'\}"		
 		elsif p.klass.ancestors.include?(String)
-			return "'#\{Og::PsqlBackend.escape(@#{p.symbol})\}'"
+			return "'#\{PsqlBackend.escape(@#{p.symbol})\}'"
 		elsif p.klass.ancestors.include?(Time)
-			return %|#\{@#{p.symbol} ? "'#\{Og::PsqlBackend.timestamp(@#{p.symbol})\}'" : 'NULL'\}|
+			return %|#\{@#{p.symbol} ? "'#\{PsqlBackend.timestamp(@#{p.symbol})\}'" : 'NULL'\}|
 		elsif p.klass.ancestors.include?(Date)
-			return %|#\{@#{p.symbol} ? "'#\{Og::PsqlBackend.date(@#{p.symbol})\}'" : 'NULL'\}|
+			return %|#\{@#{p.symbol} ? "'#\{PsqlBackend.date(@#{p.symbol})\}'" : 'NULL'\}|
 		elsif p.klass.ancestors.include?(TrueClass)
 			return "#\{@#{p.symbol} ? \"'t'\" : 'NULL' \}"
 		else 
-			return %|#\{@#{p.symbol} ? "'#\{Og::PsqlBackend.escape(@#{p.symbol}.to_yaml)\}'" : "''"\}|
+			return %|#\{@#{p.symbol} ? "'#\{PsqlBackend.escape(@#{p.symbol}.to_yaml)\}'" : "''"\}|
 		end
 	end		
 
 	# Return an evaluator for reading the property.
 	# No need to optimize this, used only to precalculate code.
@@ -122,12 +122,12 @@
 		elsif p.klass.ancestors.include?(Float)
 			return "res.getvalue(tuple, #{idx}).to_f()"
 		elsif p.klass.ancestors.include?(String)
 			return "res.getvalue(tuple, #{idx})"
 		elsif p.klass.ancestors.include?(Time)
-			return "Og::PsqlBackend.parse_timestamp(res.getvalue(tuple, #{idx}))"
+			return "PsqlBackend.parse_timestamp(res.getvalue(tuple, #{idx}))"
 		elsif p.klass.ancestors.include?(Date)
-			return "Og::PsqlBackend.parse_date(res.getvalue(tuple, #{idx}))"
+			return "PsqlBackend.parse_date(res.getvalue(tuple, #{idx}))"
 		elsif p.klass.ancestors.include?(TrueClass)
 			return %|('t' == res.getvalue(tuple, #{idx}))|
 		else 
 			return "YAML::load(res.getvalue(tuple, #{idx}))"
 		end		