amalgalite 1.6.0-x64-mingw32 → 1.6.1-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7a0210ab2535ac286a631657b464dbb44b27ee2
-  data.tar.gz: d22531bbb1a391e5de2992bd805c4feb8f93e455
+  metadata.gz: 1c85c1701fabb68443a5d15b0b76063ea02abf5c
+  data.tar.gz: 06c745c15693bb48c30747a494794ba8cf167058
 SHA512:
-  metadata.gz: 1edcc6be7b5ee62f1768c683b62424632f819b904ccf7e3d8195abe0a58ae66d4905f65c26c0c85baca9dd569da43ff7a96b5846d9e1d0ac1d5e8a6971832a19
-  data.tar.gz: 318501523734d281dea00333d4d896e336293a05dd9bad85cf3bc8feab9e38b5f05d28dc7728ca661b3ff4ceb796ba3244ff16d179e76a7f46fbe2316ad2e7f7
+  metadata.gz: 8ed97b8bfcc10f3e7f1fe73d27a8ccc382cf3608c6451e02ccb1d14ce5b3c828df69b15ef32234841a544b9d38de72f1c217695a14db75f235028106511e4cd2
+  data.tar.gz: 41b6c450bd2834c805e311ac39e4c849f0d921338df1f3c6aa9c40c07accf8675d0a3595f37952456702ecf11cd04bc48603126cfed9c846a56680ac46d3d87c

data/HISTORY.md

@@ -1,4 +1,7 @@
 # Amalgalite Changelog
+## Version 1.6.1 - 2018-01-02
+
+* Fix bug when using the `json` extension
 
 ## Version 1.6.0 - 2017-12-13
 

data/Manifest.txt

@@ -80,6 +80,7 @@ spec/default_map_spec.rb
 spec/function_spec.rb
 spec/integeration_spec.rb
 spec/iso_3166_database.rb
+spec/json_spec.rb
 spec/packer_spec.rb
 spec/paths_spec.rb
 spec/progress_handler_spec.rb

data/lib/amalgalite/statement.rb

@@ -347,7 +347,7 @@ module Amalgalite
           # only check for rowid if we have a table name and it is not one of the
           # sqlite_master tables.  We could get recursion in those cases.
           if not using_rowid_column? and tbl_name and
-             not %w[ sqlite_master sqlite_temp_master].include?( tbl_name ) and is_column_rowid?( tbl_name, col_name ) then
+             not %w[ sqlite_master sqlite_temp_master ].include?( tbl_name ) and is_column_rowid?( tbl_name, col_name ) then
             @rowid_index = idx
           end
 
@@ -363,7 +363,10 @@ module Amalgalite
     # is the column indicated by the Column a 'rowid' column
     #
     def is_column_rowid?( table_name, column_name )
-      column_schema  = @db.schema.tables[table_name].columns[column_name]
+      table_schema = @db.schema.tables[table_name]
+      return false unless table_schema
+
+      column_schema  = table_schema.columns[column_name]
       if column_schema then
         if column_schema.primary_key? and column_schema.declared_data_type and column_schema.declared_data_type.upcase == "INTEGER" then
           return true

data/lib/amalgalite/type_maps/default_map.rb

@@ -23,7 +23,7 @@ module Amalgalite::TypeMaps
           'time'      => %w[ timestamp time ],
           'float'     => %w[ double float real numeric decimal ],
           'integer'   => %w[ integer tinyint smallint int int2 int4 int8 bigint serial bigserial ],
-          'string'    => %w[ text char string varchar character ],
+          'string'    => %w[ text char string varchar character json ],
           'boolean'   => %w[ bool boolean ],
           'blob'      => %w[ binary blob ],
         }

data/lib/amalgalite/version.rb

@@ -4,5 +4,5 @@
 #++
 
 module Amalgalite
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

data/spec/json_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'amalgalite/sqlite3'
+require 'rbconfig'
+
+describe "Amalgalite handles the JSON extension" do
+  it "can parse a `json_each` call" do
+    db = Amalgalite::Database.new( ":memory:" )
+    values = %w[ a b c d e f g ]
+    db.execute("CREATE TABLE jtest(id, json)")
+    db.execute("INSERT INTO jtest(id, json) values (1, json($json))", { "$json" => values })
+    rows = db.execute("SELECT jtest.id as i, value as v FROM jtest, json_each(jtest.json)")
+
+    rows.size.should eq(values.size)
+  end
+
+  it "can return a proper json column" do
+    db = Amalgalite::Database.new( ":memory:" )
+    values = %w[ a b c d e f g ]
+    db.execute("CREATE TABLE jtest(id INTEGER, json JSON)")
+    db.execute("INSERT INTO jtest(id, json) values (1, json($json))", { "$json" => values })
+
+    db.execute("select * from jtest")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amalgalite
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: x64-mingw32
 authors:
 - Jeremy Hinegardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2018-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arrayfields
@@ -229,6 +229,7 @@ files:
 - spec/function_spec.rb
 - spec/integeration_spec.rb
 - spec/iso_3166_database.rb
+- spec/json_spec.rb
 - spec/packer_spec.rb
 - spec/paths_spec.rb
 - spec/progress_handler_spec.rb
@@ -298,6 +299,7 @@ test_files:
 - spec/function_spec.rb
 - spec/integeration_spec.rb
 - spec/iso_3166_database.rb
+- spec/json_spec.rb
 - spec/packer_spec.rb
 - spec/paths_spec.rb
 - spec/progress_handler_spec.rb