flexirecord 0.0.2 → 0.0.3

data/flexirecord-oldpg.rb.patch

@@ -0,0 +1,75 @@
+--- 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 @@
+         primary_columns = []
+         db_query('SELECT ' <<
+             '"pg_attribute"."attname", ' <<
+-            '"pg_constraint"."conkey" @> ARRAY["pg_attribute"."attnum"] AS "primary" ' <<
++            '("pg_constraint"."conkey"[1] = "pg_attribute"."attnum" OR "pg_constraint"."conkey"[2] = "pg_attribute"."attnum" OR "pg_constraint"."conkey"[3] = "pg_attribute"."attnum" OR "pg_constraint"."conkey"[4] = "pg_attribute"."attnum" OR "pg_constraint"."conkey"[5] = "pg_attribute"."attnum" OR "pg_constraint"."conkey"[6] = "pg_attribute"."attnum" OR "pg_constraint"."conkey"[7] = "pg_attribute"."attnum" OR "pg_constraint"."conkey"[8] = "pg_attribute"."attnum") AS "primary" ' <<
+             '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 @@
+       def save
+         synchronize do
+           used_columns = self.used_columns
+-          primary_key = nil
+           if @saved
+             if self.class.primary_columns.empty?
+               raise "Can not re-save a record of a table without a primary key."
+             end
+-            primary_key = self.class.db_query1(
++            self.class.db_execute(
+               'UPDATE ' << self.class.table <<
+               ' SET ' << (used_columns.collect { |column| '"' << column << '" = $' }.join(', ')) <<
+-              ' WHERE ' << (self.class.primary_columns.collect { |column| '"' << column << '" = $' }.join(' AND ')) <<
+-              ' RETURNING ' << (self.class.primary_columns.collect { |column| '"' << column << '"' }.join(', ')),
++              ' WHERE ' << (self.class.primary_columns.collect { |column| '"' << column << '" = $' }.join(' AND ')),
+               *(
+                 used_columns.collect { |column| read(column) } +
+                 self.class.primary_columns.collect { |column| @old_primary_key[column] }
+@@ -1002,18 +1000,12 @@
+             )
+           else
+             if used_columns.empty?
+-              primary_key = self.class.db_query1('INSERT INTO ' << self.class.table << ' DEFAULT VALUES' <<
+-              (self.class.primary_columns.empty? ? '' : (
+-                ' RETURNING ' << (self.class.primary_columns.collect { |column| '"' << column << '"' }.join(', '))
+-              )))
++              self.class.db_execute('INSERT INTO ' << self.class.table << ' DEFAULT VALUES')
+             else
+-              primary_key = self.class.db_query1(
++              self.class.db_execute(
+                 'INSERT INTO ' << self.class.table <<
+                 ' (' << (used_columns.collect { |column| '"' << column << '"' }.join(', ')) << ')' <<
+-                ' VALUES (' << (used_columns.collect { |column| '$' }.join(', ')) << ')' <<
+-                (self.class.primary_columns.empty? ? '' : (
+-                  ' RETURNING ' << (self.class.primary_columns.collect { |column| '"' << column << '"' }.join(', '))
+-                )),
++                ' VALUES (' << (used_columns.collect { |column| '$' }.join(', ')) << ')',
+                 *(
+                   used_columns.collect { |column| read(column) }
+                 )
+@@ -1021,10 +1013,9 @@
+             end
+             @saved = true
+           end
+-          unless primary_key.nil?
+-            self.class.primary_columns.each do |column|
+-              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"')
++            self.id = primary_key.id
+           end
+           copy_primary_key
+           return self

data/lib/flexirecord-demo.rb

@@ -117,7 +117,8 @@ module FlexiRecordDemo
       MediumEntry.new(:medium => medium_b, :position => :last, :movie => koyaanisqatsi).save
       MediumEntry.new(:medium => medium_b, :position => :last, :movie => american_beauty).save
     end
-    Rating.new(:person => anja, :movie => naruto, :rating => Rational(7, 10)).save
+    Rating.new(:person => anja, :movie => american_beauty, :rating => Rational(7, 10)).save
+    Rating.new(:person => anja, :movie => koyaanisqatsi, :rating => Rational(9,10)).save
     Rating.new(:person => phillip, :movie => koyaanisqatsi, :rating => Rational(6,10)).save
     Rating.new(:person => phillip, :movie => koyaanisqatsi, :rating => Rational(8,10)).save
     Rating.new(:person => wilson, :movie => naruto, :comment => 'Rasengan!').save
@@ -138,6 +139,14 @@ module FlexiRecordDemo
       puts "  - Rating: #{rating.rating ? rating.rating.to_s : 'none'}"
       puts "  - Comment: #{rating.comment || 'none'}"
     end
+    anjas = Person.select('WHERE "name" = $', 'Anja')
+    if anjas.length == 1
+      anja = anjas.first
+      anjas_favourite = anja.rated_movies('WHERE "rel"."rating" NOTNULL ORDER BY "rel"."rating" DESC LIMIT 1').first
+      puts "The movie, which Anja likes most is: #{anjas_favourite ? anjas_favourite.name : 'N/A'}."
+    else
+      puts "There is more than one person named Anja."
+    end
     nil
   end
   module_function :demo

data/lib/flexirecord.rb

@@ -752,7 +752,7 @@ module FlexiRecord
         )
       end
 
-      # 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.
+      # 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.
       def add_many_to_one_reference(destination_class, *arguments)
         return FlexiRecord::ManyToOneReference.new(
           self, destination_class, *arguments

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: flexirecord
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2007-02-07 00:00:00 +00:00
+  version: 0.0.3
+date: 2007-02-08 00:00:00 +00:00
 summary: Object-Oriented Database Access Library
 require_paths: 
 - lib/
@@ -34,6 +34,7 @@ files:
 - lib/flexirecord.rb
 - lib/flexirecord-demo.rb
 - ./flexirecord-demo.sql
+- flexirecord-oldpg.rb.patch
 test_files: []
 
 rdoc_options: