SqlStatement 1.0.1 → 1.0.2

data/doc/ChangeLog

@@ -1,4 +1,10 @@
 =Change Log
+==1.0.2
+* Make the methods in SQLHelpers available as module functions too, so
+  not only can you call "include SQLHelpers; sql_func", you can call
+  "SQLHelpers.sql_func" as well.
+* Need to pass any block given when patching the dbi functions.
+* Fix a typo in the dbi functions
 ==1.0.1
 * +add_fields+ and +add_tables+ now support hashes too, so no more of 
   this silly <tt>stmt.fields.merge!</tt> stuff is requred anymore

data/lib/sql/dbi-support.rb

@@ -6,18 +6,18 @@ class DBI::DatabaseHandle
    alias_method :kenbloom_sqlstatement_old_do, :"do"
    alias_method :kenbloom_sqlstatement_old_execute, :execute
 
-   def do(stmt,*args)
-      if stmt.respond_to?(:placeheld)
-	 kenbloom_sqlstatement_old_do(stmt.to_s,*stmt.placeheld)
+   def do(stmt,*args,&block)
+      if stmt.is_a?(SQLStatement::Select) or stmt.is_a?(SQLStatement::Insert)
+	 kenbloom_sqlstatement_old_do(stmt.to_s,*stmt.placeheld,&block)
       else
-	 kenbloom_sqlstatement_old_do(stmt,*args)
+	 kenbloom_sqlstatement_old_do(stmt,*args,&block)
       end
    end
-   def execute(stmt,*args)
-      if stmt.respond_to?(:placeheld)
-	 kenbloom_sqlstatement_old_execute(stmt.to_s,*stmt.placeheld)
+   def execute(stmt,*args,&block)
+      if stmt.is_a?(SQLStatement::Select) or stmt.is_a?(SQLStatement::Insert)
+	 kenbloom_sqlstatement_old_execute(stmt.to_s,*stmt.placeheld,&block)
       else
-	 kenbloom_sqlstatement_old_execute(stmt,*args)
+	 kenbloom_sqlstatement_old_execute(stmt,*args,&block)
       end
    end
 

data/lib/sql/statement.rb

@@ -490,4 +490,5 @@ module SQLHelpers
    def string_func(str,placeheld=[])
       SQLStatement::Function.new(str,placeheld)
    end
+   extend self
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: SqlStatement
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
-date: 2006-11-20 00:00:00 -06:00
+  version: 1.0.2
+date: 2006-12-18 00:00:00 -06:00
 summary: A library for generating arbitrary SQL statements using convenient Ruby objects.
 require_paths: 
 - lib