motion-sqlite3 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 199d13b845e8cdabee64303b840f750d37b928f7
-  data.tar.gz: 4338619fbf94ed9cfb7632dd62a0bc600bee9ab2
+  metadata.gz: 69c11ae39a27fe5ca7b2bb6365e464a661fba96e
+  data.tar.gz: 4548214b6206147f2ddb069bd36b3eba6afa02b1
 SHA512:
-  metadata.gz: 8f0d2a9b7d65bf8d8b9340df35f5d2f264dd01b5b3c355c2e030dc64c991aa359fb3df3751cb31f62ff97452a449e13a4732186b552c50c232b205ea0fa12e24
-  data.tar.gz: 57afec7a3299a6d29fc5a17707e9f2e99f905d08b048174123784806ed03bbd0141ff19c827ef891b835a1bc17c6b404da5ecffc6fc049f84a8fa067a876a682
+  metadata.gz: 13e8288e59470b914ff988da4424f42c29e6a13bb8c13608f216296657122c8c0812e763f1f15044cf202c333a9938741bf866fc045b18215b2a42e4ba49d37b
+  data.tar.gz: 66c9f6e74c7c7955f5feb7ab6c8580f7cc12607aa7834b980f652624fc834fa1822e5021246e05ec5975d5bf1e5365237501876fbcb7a0506a0f832e653b1085

data/lib/motion-sqlite3/result_set.rb

@@ -16,19 +16,17 @@ module SQLite3
     private
 
     def columns
-      @result_columns ||= begin
-        columns = {}
+      columns = {}
 
-        count = sqlite3_column_count(@handle.value)
-        0.upto(count-1) do |i|
-          name = sqlite3_column_name(@handle.value, i).to_sym
-          type = sqlite3_column_type(@handle.value, i)
+      count = sqlite3_column_count(@handle.value)
+      0.upto(count-1) do |i|
+        name = sqlite3_column_name(@handle.value, i).to_sym
+        type = sqlite3_column_type(@handle.value, i)
 
-          columns[name] = ColumnMetadata.new(i, type)
-        end
-
-        columns
+        columns[name] = ColumnMetadata.new(i, type)
       end
+
+      columns
     end
 
     def current_row

data/lib/motion-sqlite3/version.rb

@@ -1,3 +1,3 @@
 module SQLite3
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/database_spec.rb

@@ -24,7 +24,7 @@ describe SQLite3::Database do
       @db.execute("INSERT INTO test VALUES(:name, :address)", { name: "matt", address: "123 main st" })
 
       @db.execute_scalar("SELECT changes()").should == 1
-    end    
+    end
 
     it "returns rows if no block is provided" do
       @db.execute("CREATE TABLE test (id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT, age INTEGER)")
@@ -52,6 +52,19 @@ describe SQLite3::Database do
         { id: 2, name: "sparky", age: 24 }
       ]
     end
+
+    it "handles results where the first row has a nil column correctly" do
+      @db.execute 'create virtual table fts_1 using fts4 (col_1, col_2)'
+      @db.execute "insert into fts_1 (col_1) values ('hello')"
+      @db.execute "insert into fts_1 (col_2) values ('hello')"
+
+      rows = @db.execute("select col_1, col_2 from fts_1 where fts_1 match 'hello' order by rowid")
+      rows.size.should == 2
+      one, two = rows
+
+      one.should == { col_1: 'hello', col_2: nil }
+      two.should == { col_1: nil, col_2: 'hello' }
+    end
   end
 
   describe "#execute_scalar" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-sqlite3
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Matt Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake