sqlite3-ruby 1.2.0 → 1.2.1

data/doc/faq/faq.html

@@ -62,25 +62,25 @@
 <ul>
 <li>How do I do a database query?
 <ul>
-<li><a href='#3228052'>I just want an array of the rows&#8230;</a></li>
-<li><a href='#3227912'>I&#8217;d like to use a block to iterate through the rows&#8230;</a></li>
-<li><a href='#3227772'>I need to get the column names as well as the rows&#8230;</a></li>
-<li><a href='#3227652'>I just want the first row of the result set&#8230;</a></li>
-<li><a href='#3227532'>I just want the first value of the first row of the result set&#8230;</a></li>
+<li><a href='#37380'>I just want an array of the rows&#8230;</a></li>
+<li><a href='#36440'>I&#8217;d like to use a block to iterate through the rows&#8230;</a></li>
+<li><a href='#32250'>I need to get the column names as well as the rows&#8230;</a></li>
+<li><a href='#31680'>I just want the first row of the result set&#8230;</a></li>
+<li><a href='#31240'>I just want the first value of the first row of the result set&#8230;</a></li>
 </ul>
 </li>
-<li><a href='#3227292'>How do I prepare a statement for repeated execution?</a></li>
-<li><a href='#3227192'>How do I use placeholders in an <span class="caps">SQL</span> statement?</a></li>
-<li><a href='#3227072'>How do I discover metadata about a query?</a></li>
-<li><a href='#3226852'>I&#8217;d like the rows to be indexible by column name.</a></li>
-<li><a href='#3226702'>I&#8217;d like the values from a query to be the correct types, instead of String.</a></li>
-<li><a href='#3226552'>How do insert binary data into the database?</a></li>
-<li><a href='#3226372'>How do I do a <span class="caps">DDL</span> (insert, update, delete) statement?</a></li>
-<li><a href='#3226232'>How do I execute multiple statements in a single string?</a></li>
-<li><a href='#3226102'>How do I begin/end a transaction?</a></li>
+<li><a href='#30080'>How do I prepare a statement for repeated execution?</a></li>
+<li><a href='#27350'>How do I use placeholders in an <span class="caps">SQL</span> statement?</a></li>
+<li><a href='#26510'>How do I discover metadata about a query?</a></li>
+<li><a href='#26320'>I&#8217;d like the rows to be indexible by column name.</a></li>
+<li><a href='#26050'>I&#8217;d like the values from a query to be the correct types, instead of String.</a></li>
+<li><a href='#25850'>How do insert binary data into the database?</a></li>
+<li><a href='#25740'>How do I do a <span class="caps">DDL</span> (insert, update, delete) statement?</a></li>
+<li><a href='#23610'>How do I execute multiple statements in a single string?</a></li>
+<li><a href='#22110'>How do I begin/end a transaction?</a></li>
 </ul>
 </div>
-<a name='3228052'></a>
+<a name='37380'></a>
 <div class='faq-title'>How do I do a database query? I just want an array of the rows&#8230;</div>
 <div class='faq-answer'><p>Use the <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html'>Database#execute</a> method. If you don&#8217;t give it a block, it will return an array of all the rows:</p>
 
@@ -91,7 +91,7 @@
   db = SQLite3::<a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html'>Database</a>.new( "test.db" )
   rows = db.execute( "select * from test" )
 </pre></div>
-<a name='3227912'></a>
+<a name='36440'></a>
 <div class='faq-title'>How do I do a database query? I&#8217;d like to use a block to iterate through the rows&#8230;</div>
 <div class='faq-answer'><p>Use the <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html'>Database#execute</a> method. If you give it a block, each row of the result will be yielded to the block:</p>
 
@@ -104,7 +104,7 @@
     ...
   end
 </pre></div>
-<a name='3227772'></a>
+<a name='32250'></a>
 <div class='faq-title'>How do I do a database query? I need to get the column names as well as the rows&#8230;</div>
 <div class='faq-answer'><p>Use the <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html'>Database#execute2</a> method. This works just like <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html'>Database#execute</a>; if you don&#8217;t give it a block, it returns an array of rows; otherwise, it will yield each row to the block. <em>However</em>, the first row returned is always an array of the column names from the query:</p>
 
@@ -126,7 +126,7 @@
     end
   end
 </pre></div>
-<a name='3227652'></a>
+<a name='31680'></a>
 <div class='faq-title'>How do I do a database query? I just want the first row of the result set&#8230;</div>
 <div class='faq-answer'><p>Easy. Just call <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html'>Database#get_first_row</a>:</p>
 
@@ -136,7 +136,7 @@
 </pre>
 
 	<p>This also supports bind variables, just like <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html'>Database#execute</a> and friends.</p></div>
-<a name='3227532'></a>
+<a name='31240'></a>
 <div class='faq-title'>How do I do a database query? I just want the first value of the first row of the result set&#8230;</div>
 <div class='faq-answer'><p>Also easy. Just call <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html'>Database#get_first_value</a>:</p>
 
@@ -146,7 +146,7 @@
 </pre>
 
 	<p>This also supports bind variables, just like <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html'>Database#execute</a> and friends.</p></div>
-<a name='3227292'></a>
+<a name='30080'></a>
 <div class='faq-title'>How do I prepare a statement for repeated execution?</div>
 <div class='faq-answer'><p>If the same statement is going to be executed repeatedly, you can speed things up a bit by <em>preparing</em> the statement. You do this via the <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html'>Database#prepare</a> method. It returns a <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Statement.html'>Statement</a> object, and you can then invoke #execute on that to get the <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/ResultSet.html'>ResultSet</a>:</p>
 
@@ -174,7 +174,7 @@
 </pre>
 
 	<p>This is made more useful by the ability to bind variables to placeholders via the <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Statement.html'>Statement#bind_param</a> and <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Statement.html'>Statement#bind_params</a> methods. (See the next <span class="caps">FAQ</span> for details.)</p></div>
-<a name='3227192'></a>
+<a name='27350'></a>
 <div class='faq-title'>How do I use placeholders in an <span class="caps">SQL</span> statement?</div>
 <div class='faq-answer'><p>Placeholders in an <span class="caps">SQL</span> statement take any of the following formats:</p>
 
@@ -249,7 +249,7 @@
 
   stmt.bind_params( "value", "name" =&gt; "bob" )
 </pre></div>
-<a name='3227072'></a>
+<a name='26510'></a>
 <div class='faq-title'>How do I discover metadata about a query?</div>
 <div class='faq-answer'><p>If you ever want to know the names or types of the columns in a result set, you can do it in several ways.</p>
 
@@ -282,7 +282,7 @@
   p stmt.columns
   p stmt.types
 </pre></div>
-<a name='3226852'></a>
+<a name='26320'></a>
 <div class='faq-title'>I&#8217;d like the rows to be indexible by column name.</div>
 <div class='faq-answer'><p>By default, each row from a query is returned as an Array of values. This means that you can only obtain values by their index. Sometimes, however, you would like to obtain values by their column name.</p>
 
@@ -310,7 +310,7 @@
     p row[1] == row['column2']
   end
 </pre></div>
-<a name='3226702'></a>
+<a name='26050'></a>
 <div class='faq-title'>I&#8217;d like the values from a query to be the correct types, instead of String.</div>
 <div class='faq-answer'><p>You can turn on &#8220;type translation&#8221; by setting <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html'>Database#type_translation</a> to true:</p>
 
@@ -348,7 +348,7 @@
   obj = db.get_first_value( "select thing from objects where name='bob'" )
   p obj == h
 </pre></div>
-<a name='3226552'></a>
+<a name='25850'></a>
 <div class='faq-title'>How do insert binary data into the database?</div>
 <div class='faq-answer'><p>Use blobs. Blobs are new features of SQLite3. You have to use bind variables to make it work:</p>
 
@@ -360,7 +360,7 @@
 </pre>
 
 	<p>The blob values must be indicated explicitly by binding each parameter to a value of type SQLite3::Blob.</p></div>
-<a name='3226372'></a>
+<a name='25740'></a>
 <div class='faq-title'>How do I do a <span class="caps">DDL</span> (insert, update, delete) statement?</div>
 <div class='faq-answer'><p>You can actually do inserts, updates, and deletes in exactly the same way as selects, but in general the <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html'>Database#execute</a> method will be most convenient:</p>
 
@@ -368,7 +368,7 @@
 <pre>
   db.execute( "insert into table values ( ?, ? )", *bind_vars )
 </pre></div>
-<a name='3226232'></a>
+<a name='23610'></a>
 <div class='faq-title'>How do I execute multiple statements in a single string?</div>
 <div class='faq-answer'><p>The standard query methods (<a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html'>Database#execute</a>, <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html'>Database#execute2</a>, <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html'>Database#query</a>, and <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Statement.html'>Statement#execute</a>) will only execute the first statement in the string that is given to them. Thus, if you have a string with multiple <span class="caps">SQL</span> statements, each separated by a string, you can&#8217;t use those methods to execute them all at once.</p>
 
@@ -392,7 +392,7 @@
 </pre>
 
 	<p>Unlike the other query methods, <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html'>Database#execute_batch</a> accepts no block. It will also only ever return <ins>nil</ins>. Thus, it is really only suitable for batch processing of <span class="caps">DDL</span> statements.</p></div>
-<a name='3226102'></a>
+<a name='22110'></a>
 <div class='faq-title'>How do I begin/end a transaction?</div>
 <div class='faq-answer'><p>Use <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html'>Database#transaction</a> to start a transaction. If you give it a block, the block will be automatically committed at the end of the block, unless an exception was raised, in which case the transaction will be rolled back. (Never explicitly call <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html'>Database#commit</a> or <a href='http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html'>Database#rollback</a> inside of a transaction block&#8212;you&#8217;ll get errors when the block terminates!)</p>
 

data/lib/sqlite3/pragmas.rb

@@ -246,9 +246,56 @@ module SQLite3
     end
 
     def table_info( table, &block ) # :yields: row
-      get_query_pragma "table_info", table, &block
+      columns, *rows = execute2("PRAGMA table_info(#{table})")
+
+      needs_tweak_default = version_compare(driver.libversion, "3.3.7") > 0
+
+      result = [] unless block_given?
+      rows.each do |row|
+        new_row = {}
+        columns.each_with_index do |name, index|
+          new_row[name] = row[index]
+        end
+
+        tweak_default(new_row) if needs_tweak_default
+
+        if block_given?
+          yield new_row
+        else
+          result << new_row
+        end
+      end
+
+      result
     end
-  
+
+    private
+
+      # Compares two version strings
+      def version_compare(v1, v2)
+        v1 = v1.split(".").map { |i| i.to_i }
+        v2 = v2.split(".").map { |i| i.to_i }
+        parts = [v1.length, v2.length].max
+        v1.push 0 while v1.length < parts
+        v2.push 0 while v2.length < parts
+        v1.zip(v2).each do |a,b|
+          return -1 if a < b
+          return  1 if a > b
+        end
+        return 0
+      end
+
+      # Since SQLite 3.3.8, the table_info pragma has returned the default
+      # value of the row as a quoted SQL value. This method essentially
+      # unquotes those values.
+      def tweak_default(hash)
+        case hash["dflt_value"]
+        when /^null$/i then
+          hash["dflt_value"] = nil
+        when /^'(.*)'$/
+          hash["dflt_value"] = $1.gsub(/''/, "'")
+        end
+      end
   end
 
 end

data/lib/sqlite3/version.rb

@@ -36,9 +36,10 @@ module SQLite3
 
     MAJOR = 1
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
 
     STRING = [ MAJOR, MINOR, TINY ].join( "." )
+    #:beta-tag:
 
   end
 

data/test/tc_integration.rb

@@ -82,6 +82,17 @@ module Integration
         assert_nothing_raised { @db.table_info("foo") }
       end
 
+      define_method( "test_table_info_with_defaults_for_version_3_3_8_and_higher" ) do
+        @db.transaction do
+          @db.execute "create table defaults_test ( a string default NULL, b string default 'Hello' )"
+          data = @db.table_info( "defaults_test" )
+          assert_equal({"name" => "a", "type" => "string", "dflt_value" => nil, "notnull" => "0", "cid" => "0", "pk" => "0"},
+            data[0])
+          assert_equal({"name" => "b", "type" => "string", "dflt_value" => "Hello", "notnull" => "0", "cid" => "1", "pk" => "0"},
+            data[1])
+        end
+      end
+
       define_method( "test_complete_fail" ) do
         assert !@db.complete?( "select * from foo" )
       end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: sqlite3-ruby
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
-date: 2007-01-13 00:00:00 -07:00
+  version: 1.2.1
+date: 2007-02-03 00:00:00 -07:00
 summary: SQLite3/Ruby is a module to allow Ruby scripts to interface with a SQLite3 database.
 require_paths: 
 - lib