lib/og/store/mysql.rb in og-0.17.0 vs lib/og/store/mysql.rb in og-0.18.0

@@ -150,13 +150,13 @@
 	end
 
 private
 
 	def create_table(klass)
-		columns = columns_for_class(klass)
+		fields = fields_for_class(klass)
 
-		sql = "CREATE TABLE #{klass::OGTABLE} (#{columns.join(', ')}"
+		sql = "CREATE TABLE #{klass::OGTABLE} (#{fields.join(', ')}"
 		
 		# Create table constrains.
 		
 		if klass.__meta and constrains = klass.__meta[:sql_constrain]
 			sql << ", #{constrains.join(', ')}"
@@ -208,11 +208,11 @@
 				end
 			end
 		end
 	end
 
-	def create_column_map(klass)
+	def create_field_map(klass)
 		conn.query_with_result = true
 		res = @conn.query "SELECT * FROM #{klass::OGTABLE} LIMIT 1"
 		map = {}
 
 		res.num_fields.times do |i|
@@ -243,12 +243,12 @@
 		end
 	end		
 	
 	def read_prop(p, col)
 		if p.klass.ancestors.include?(Integer)
-			return "res[#{col} + offset].to_i"
+			return "#{self.class}.parse_int(res[#{col} + offset])"
 		elsif p.klass.ancestors.include?(Float)
-			return "res[#{col} + offset].to_f"
+			return "#{self.class}.parse_float(res[#{col} + offset])"
 		elsif p.klass.ancestors.include?(String)
 			return "res[#{col} + offset]"
 		elsif p.klass.ancestors.include?(Time)
 			return "#{self.class}.parse_timestamp(res[#{col} + offset])"
 		elsif p.klass.ancestors.include?(Date)