amalgalite 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38895c6c58bfbef6cbd3503034da1654e2454df9
-  data.tar.gz: d384369460831ddf2741ddef5ce7efff6df54ca3
+  metadata.gz: 69f5cacb917ac97cf9f0482a4e4df09e8a689007
+  data.tar.gz: 7816dc701780edf5caf2e9bfd9901622fed569ce
 SHA512:
-  metadata.gz: e9ee39fdf232e7958c6b5b0f63b18240879bf4e3cb9fa24eb5eb9c3745d32d8e386cd0c582a6358c4f37a71dfa6350553686c56dbcc1c6a0692383907eb417f1
-  data.tar.gz: fa42e111f172981bc2bc649a055cd5f3b23175d73fee2c73ff44456492d2fc1f14efb85adcf8721741c3d27ccd49c30e91737e6cb511f4655f41bba5cf19e31c
+  metadata.gz: fb0930af1fc9c2b8a43a7471883048ff6e4f03be3e5650282fe40431bd17e1f6e1d693126623bdc331b8aa60e839f1a084852045078a7d5b418f109f086996d8
+  data.tar.gz: 7da4a872b1aad6be00b342c8c099494515e6afdfc879813e429223866cb6d1983e3430828ea38bec063f93f7db60a7649c2e7ddf128404285ddaca8b3a0fa1a4

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: ruby
 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
@@ -225,6 +225,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
@@ -271,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Amalgalite embeds the SQLite database engine in a ruby extension.  There
@@ -291,6 +292,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