omf_oml 0.9.4 → 0.9.5

data/lib/omf_oml/schema.rb

@@ -50,7 +50,10 @@ module OMF::OML
     # Return the col name at a specific index
     #
     def name_at(index)
-      @schema[index][:name]
+      unless d = @schema[index]
+        raise "Index '#{index}' out of bounds"
+      end
+      d[:name]
     end
     
     # Return the col index for column named +name+
@@ -143,23 +146,27 @@ module OMF::OML
     end
     
     # Translate a record described in a hash of 'col_name => value'
-    # to a row array
+    # to a row array. Note: Will suppress column '__id__'
     #
     # hrow - Hash describing a row
     # set_nil_when_missing - If true, set any columns not described in hrow to nil
     #
     def hash_to_row(hrow, set_nil_when_missing = false, call_type_conversion = true)
       #puts "HASH2A => #{hrow.inspect}"
+      remove_first_col = false
       r = @schema.collect do |cdescr|
         cname = cdescr[:name]
-        next nil if cname == :__id__
+        if cname == :__id__
+          remove_first_col = true
+          next nil
+        end
         unless (v = hrow[cname]) ||  (v = hrow[cname.to_sym])
           next nil if set_nil_when_missing
           raise "Missing record element '#{cname}' in record '#{hrow}'"
         end
         call_type_conversion ? cdescr[:type_conversion].call(v) : v
       end
-      r.shift # remove __id__ columns
+      r.shift if remove_first_col # remove __id__ columns
       #puts "#{r.inspect} -- #{@schema.map {|c| c[:name]}.inspect}"
       r
     end
@@ -187,6 +194,12 @@ module OMF::OML
       describe.to_json(*opt)
     end
     
+    def clone()
+      c = self.dup
+      c.instance_variable_set('@schema', @schema.clone)
+      c
+    end
+    
     protected
     
     # schema_description - Array containing [name, type*] for every column in table

data/lib/omf_oml/sql_row.rb

@@ -50,7 +50,14 @@ module OMF::OML
     # by it's name, or its col index
     #
     def [](name_or_index)
-      @vprocs[name_or_index].call(@raw)
+      if name_or_index.is_a? Integer
+        @row[@schema.name_at_index(name_or_index)]
+      else
+        unless @row.key? name_or_index
+          raise "Unknown column name '#{name_or_index}'"
+        end 
+        @row[name_or_index]
+      end
     end
     
     # Return the elements of the vector as an array
@@ -180,7 +187,7 @@ module OMF::OML
         {:name => name, :type => opts[:db_type]}
       end
       # Query we are using is adding the 'oml_sender_name' to the front of the table
-      sd.insert(0, :name => 'oml_sender', :type => :string)
+      sd.insert(0, :name => :oml_sender, :type => :string)
       OmlSchema.new(sd)
     end
     
@@ -191,6 +198,7 @@ module OMF::OML
       schema.each_column do |col|
         name = col[:name]
         j = i + 0
+        puts "SCHEMA: '#{name.inspect}'-#{j}"
         l = @vprocs[name] = lambda do |r| r[j] end
         @vprocs[i - 4] = l if i > 4
         i += 1

data/lib/omf_oml/version.rb

@@ -1,6 +1,6 @@
 
 module OMF
   module OML
-    VERSION = '0.9.4'
+    VERSION = '0.9.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_oml
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease: 
 platform: ruby
 authors: