dohmysql 0.2.33 → 0.2.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cec61c5a47a3b5fccd99953a0e8c931eb5008bc
-  data.tar.gz: da47d7e1916cb59462de5cf0a9048ef7fcc04dad
+  metadata.gz: 781550d6ef60c6d499005d5b89634c70a760a250
+  data.tar.gz: a59db4a488222896c14c6b1b27bd0363b947a285
 SHA512:
-  metadata.gz: d30a63c850e32db1ff7894cce5e11ba4282d55f8d5a9c3373134da0613799593ae80ed1741a827915d52bce6244d582b51a5a801719734574460deac213c7fa4
-  data.tar.gz: 98442287c0925d04f552e1b5ec5ed1111dafdef392aa1df8ecce0ab61b65cc9fbbfe78d7dd1afed3c6c228193bcf4e990dfe964dbc013ab1883b26f773a60ddb
+  metadata.gz: d4ff31f3263f689a4be21cf9c032e906280500ffc3814d459d02646665c062ed3958d82cd9dd82cac0c24f0b14ebab8ee6b8bcfd063da746db55cc5b6c23c91f
+  data.tar.gz: 0d5716c9067c15684993be13a4f5e4949300f9e0ceb72073f3a74e0ff572d5971525a318ea38c1edf528151a142656cdb37351320f79c44e0fb53df1178e04ce

data/lib/dohmysql/handle.rb

@@ -97,18 +97,18 @@ class Handle
 
   # The most generic form of select.
   # It calls to_s on the statement object to facilitate the use of sql builder objects.
-  def select(statement, row_builder = nil)
+  def select(statement, build_arg = nil)
     result_set = generic_query(statement)
     DohDb.logger.call('result', "selected #{result_set.size} rows")
-    rows = get_row_builder(row_builder).build_rows(result_set)
+    rows = get_row_builder(build_arg).build_rows(result_set)
     rows
   end
 
   # Simple convenience wrapper around the generic select call.
   # Throws an exception unless the result set is a single row.
   # Returns the row selected.
-  def select_row(statement, row_builder = nil)
-    rows = select(statement, row_builder)
+  def select_row(statement, build_arg = nil)
+    rows = select(statement, build_arg)
     raise UnexpectedQueryResult, "selected #{rows.size} rows; expected 1" unless rows.size == 1
     rows[0]
   end
@@ -116,22 +116,22 @@ class Handle
   # Simple convenience wrapper around the generic select call.
   # Throws an exception unless the result set is empty or a single row.
   # Returns nil if the result set is empty, or the row selected.
-  def select_optional_row(statement, row_builder = nil)
-    rows = select(statement, row_builder)
+  def select_optional_row(statement, build_arg = nil)
+    rows = select(statement, build_arg)
     raise UnexpectedQueryResult, "selected #{rows.size} rows; expected 0 or 1" if rows.size > 1
     if rows.empty? then nil else rows[0] end
   end
 
   # Simple convenience wrapper around select_row.
   # Returns the first (and typically, the only) field from the selected row.
-  def select_field(statement, row_builder = nil)
-    select_row(statement, row_builder).at(0)
+  def select_field(statement, build_arg = nil)
+    select_row(statement, build_arg).at(0)
   end
 
   # Simple convenience wrapper around select_optional_row.
   # Returns the first (and typically, the only) field from the selected row, if any, or nil.
-  def select_optional_field(statement, row_builder = nil)
-    row = select_optional_row(statement, row_builder)
+  def select_optional_field(statement, build_arg = nil)
+    row = select_optional_row(statement, build_arg)
     row && row.at(0)
   end
 
@@ -139,8 +139,8 @@ class Handle
   # If there are 2 fields, returns a hash where each key is the first field in the result set, and the value is the second field.
   # If there are more than 2 fields, returns a hash where each key is the first field in the result set,
   # and the value is the row itself, as a Hash, and without the field used as a key.
-  def select_transpose(statement, row_builder = nil)
-    rows = select(statement, row_builder)
+  def select_transpose(statement, build_arg = nil)
+    rows = select(statement, build_arg)
     return {} if rows.empty?
     field_count = rows.first.size
     if field_count < 2
@@ -158,13 +158,13 @@ class Handle
   end
 
   # Returns an array of arrays, where the individual arrays contain just the values from each database row -- they lack field names.
-  def select_values(statement, row_builder = nil)
-    select(statement, row_builder).collect { |row| row.values }
+  def select_values(statement, build_arg = nil)
+    select(statement, build_arg).collect { |row| row.values }
   end
 
   # Returns an array of the first (and typically, the only) field of every row in the result set.
-  def select_list(statement, row_builder = nil)
-    select(statement, row_builder).collect { |row| row.at(0) }
+  def select_list(statement, build_arg = nil)
+    select(statement, build_arg).collect { |row| row.at(0) }
   end
 
   def transaction
@@ -255,21 +255,21 @@ private
     insert("#{keyword} INTO #{table} #{keystr} VALUES #{valuestrs.join(",")}")
   end
 
-  def get_row_builder(row_builder = nil)
-    if row_builder.nil?
+  def get_row_builder(build_arg = nil)
+    if build_arg.nil?
       TypedRowBuilder.new
-    elsif row_builder == :read
+    elsif build_arg == :read
       TypedRowBuilder.new(ReadOnlyRow)
-    elsif row_builder == :hash
+    elsif build_arg == :hash
       TypedRowBuilder.new(HashRow)
-    elsif row_builder == :write
+    elsif build_arg == :write
       TypedRowBuilder.new(WritableRow)
-    elsif row_builder == :smart
+    elsif build_arg == :smart
       TypedRowBuilder.new(SmartRow)
-    elsif row_builder.respond_to?('build_rows')
-      row_builder
+    elsif build_arg.respond_to?('build_rows')
+      build_arg
     else
-      TypedRowBuilder.new(row_builder)
+      TypedRowBuilder.new(build_arg)
     end
   end
 

data/lib/dohmysql/smart_row.rb

@@ -1,4 +1,5 @@
 require 'dohmysql/abstract_row'
+require 'sqlstmt/update'
 
 module DohDb
 
@@ -66,6 +67,19 @@ class AbstractSmartRow < AbstractRow
   def guess_missing_set(key, value)
     set(key, value)
   end
+
+  def db_update
+    return if @changed_keys.empty?
+    sqlb = SqlStmt::Update.new.table(@table)
+    sqlb.where("#{primary_key} = #{get(primary_key).to_sql}")
+    @changed_keys.each {|key| sqlb.field(key, get(key).to_sql)}
+    Doh.db.query(sqlb)
+    @changed_keys.clear
+  end
+
+  def primary_key
+    @primary_key ||= "#{@table}_id"
+  end
 end
 
 class SmartRow < AbstractSmartRow

data/lib/dohmysql/typed_row_builder.rb

@@ -1,10 +1,17 @@
 require 'dohmysql/readonly_row'
+require 'dohmysql/smart_row'
 
 module DohDb
 
 class TypedRowBuilder
-  def initialize(row_klass = nil, guesser = nil)
-    @row_klass = row_klass || ReadOnlyRow
+  def initialize(arg = ReadOnlyRow)
+    if arg.is_a?(String)
+      @row_klass = SmartRow
+      @table = arg
+    else
+      @row_klass = arg
+      @table = nil
+    end
   end
 
   def build_rows(result_set)
@@ -22,7 +29,12 @@ class TypedRowBuilder
           values.push(value)
         end
       end
-      retval.push(@row_klass.new(keys, values))
+      if @table
+        row = @row_klass.new(keys, values, @table)
+      else
+        row = @row_klass.new(keys, values)
+      end
+      retval.push(row)
     end
     retval
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohmysql
 version: !ruby/object:Gem::Version
-  version: 0.2.33
+  version: 0.2.34
 platform: ruby
 authors:
 - Makani Mason
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohroot