flexirecord 1.0.2 → 1.0.3

data/CHANGELOG

@@ -61,7 +61,16 @@
 
 - 2007-03-08:
   - >
-    Fixed a bug, which caused a runtime error, when reading negative numeric data from the database. (TODO: support floats)
+    Fixed a bug, which caused a runtime error, when reading negative numeric data from the database.
 
 - Release of version 1.0.2
 
+- 2007-03-09:
+  - >
+    Bug in PostgreSQL 8.1 compatiblity patch, which occured when being used with triggers, was fixed.
+  - >
+    Added support for floats in addition to rationals/numerics.
+
+
+
+

data/flexirecord-oldpg.rb.patch

@@ -1,6 +1,6 @@
---- flexirecord.rb	2007-02-07 18:54:13.000000000 +0000
-+++ flexirecord-oldpg.rb	2007-02-08 12:05:49.000000000 +0000
-@@ -568,7 +568,7 @@
+--- flexirecord.rb	2007-03-08 21:01:55.000000000 +0000
++++ flexirecord-oldpg.rb	2007-03-09 15:25:31.000000000 +0000
+@@ -652,7 +652,7 @@
          primary_columns = []
          db_query('SELECT ' <<
              '"pg_attribute"."attname", ' <<
@@ -9,16 +9,7 @@
              'FROM "pg_attribute" ' <<
              'JOIN "pg_class" ON "pg_attribute"."attrelid" = "pg_class"."oid" ' <<
              'JOIN "pg_namespace" ON "pg_class"."relnamespace" = "pg_namespace"."oid" ' <<
-@@ -752,7 +752,7 @@
-         )
-       end
- 
--      # Adds a ManyToOneReference to the class (by simply creating it). The first argument is the destination class, followed by arguments being passed to Reference.new.
-+      # Adds a ManyToManyReference to the class (by simply creating it). The first argument is the destination class, followed by arguments being passed to Reference.new.
-       def add_many_to_one_reference(destination_class, *arguments)
-         return FlexiRecord::ManyToOneReference.new(
-           self, destination_class, *arguments
-@@ -985,16 +985,14 @@
+@@ -1074,16 +1074,14 @@
        def save
          synchronize do
            used_columns = self.used_columns
@@ -37,7 +28,7 @@
                *(
                  used_columns.collect { |column| read(column) } +
                  self.class.primary_columns.collect { |column| @old_primary_key[column] }
-@@ -1002,18 +1000,12 @@
+@@ -1091,18 +1089,12 @@
              )
            else
              if used_columns.empty?
@@ -59,7 +50,7 @@
                  *(
                    used_columns.collect { |column| read(column) }
                  )
-@@ -1021,10 +1013,9 @@
+@@ -1110,10 +1102,9 @@
              end
              @saved = true
            end
@@ -68,7 +59,7 @@
 -              self.set(column, primary_key.read(column))
 -            end
 +          if self.class.primary_columns == ['id'] and self.id.nil?
-+            primary_key = self.class.db_query1('SELECT lastval() AS "id"')
++            primary_key = self.class.db_query1(%Q{SELECT currval('#{self.class.schema_name ? "#{self.class.schema_name}.#{self.class.table_name}" : self.class.table_name}_id_seq') AS "id"})
 +            self.id = primary_key.id
            end
            copy_primary_key

data/lib/flexirecord.rb

@@ -1265,20 +1265,33 @@ module FlexiRecord
     # Executes an SQL query and returns an Array of objects of 'record_class' (which should be a sub-class of BaseRecord). The 'command_template' is an SQL statement with '$' placeholders to be replaced by the following 'command_arguments'.
     def record_query(record_class, command_template, *command_arguments)
       command = command_template.to_s.gsub(/\$([^0-9]|$)/) {
+        rest = $1
         if command_arguments.empty?
           raise ArgumentError, "Too few arguments supplied for SQL command."
         end
         command_argument = command_arguments.shift
-        if command_argument.kind_of? Rational
-          command_argument = command_argument.to_f
-        elsif command_argument.kind_of? Time
-          time_offset_hours = command_argument.utc_offset / 3600
-          unless 3600 * time_offset_hours == command_argument.utc_offset
-            raise "Time zone offset is not an integer amount of hours."
+        if command_argument.kind_of? Float
+          if command_argument.finite?
+            PGconn.quote(command_argument)
+          elsif command_argument.nan?
+            "'NaN'"
+          elsif command_argument < 0
+            "'-Infinity'"
+          else
+            "'Infinity'"
           end
-          command_argument = "%s.%06i%+03i" % [command_argument.strftime("%Y-%m-%d %H:%M:%S"), command_argument.usec, time_offset_hours]
-        end
-        PGconn.quote(command_argument) << $1
+        else
+          if command_argument.kind_of? Rational
+            command_argument = command_argument.to_f
+          elsif command_argument.kind_of? Time
+            time_offset_hours = command_argument.utc_offset / 3600
+            unless 3600 * time_offset_hours == command_argument.utc_offset
+              raise "Time zone offset is not an integer amount of hours."
+            end
+            command_argument = "%s.%06i%+03i" % [command_argument.strftime("%Y-%m-%d %H:%M:%S"), command_argument.usec, time_offset_hours]
+          end
+          PGconn.quote(command_argument)
+        end << rest
         # argument = command_arguments.shift
         # if argument.kind_of? FlexiRecord::SqlSnippet
         #   argument.to_s + $1
@@ -1319,6 +1332,16 @@ module FlexiRecord
                       else
                         $1.to_i
                       end
+                    elsif ["float4", "float8"].include? data_type
+                      if value_string =~ /^NaN$/i
+                        0.0 / 0.0
+                      elsif value_string =~ /^Infinity$/i
+                        1.0 / 0.0
+                      elsif value_string =~ /^-Infinity$/i
+                        -1.0 / 0.0
+                      else
+                        value_string.to_f
+                      end
                     elsif data_type == "date"
                       unless value_string =~ /^([0-9]{4})-([0-9]{2})-([0-9]{2})$/
                         raise "Unexpected format for date from database."

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: flexirecord
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
-date: 2007-03-08 00:00:00 +00:00
+  version: 1.0.3
+date: 2007-03-10 00:00:00 +00:00
 summary: Object-Oriented Database Access Library (ORM layer)
 require_paths: 
 - lib/