amalgalite 1.4.1-x86-mingw32 → 1.5.0-x86-mingw32

data/ext/amalgalite/c/sqlite3ext.h

@@ -272,6 +272,9 @@ struct sqlite3_api_routines {
   void (*value_free)(sqlite3_value*);
   int (*result_zeroblob64)(sqlite3_context*,sqlite3_uint64);
   int (*bind_zeroblob64)(sqlite3_stmt*, int, sqlite3_uint64);
+  /* Version 3.9.0 and later */
+  unsigned int (*value_subtype)(sqlite3_value*);
+  void (*result_subtype)(sqlite3_context*,unsigned int);
 };
 
 /*
@@ -285,7 +288,7 @@ struct sqlite3_api_routines {
 ** the API.  So the redefinition macros are only valid if the
 ** SQLITE_CORE macros is undefined.
 */
-#ifndef SQLITE_CORE
+#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
 #define sqlite3_aggregate_context      sqlite3_api->aggregate_context
 #ifndef SQLITE_OMIT_DEPRECATED
 #define sqlite3_aggregate_count        sqlite3_api->aggregate_count
@@ -412,6 +415,7 @@ struct sqlite3_api_routines {
 #define sqlite3_value_text16le         sqlite3_api->value_text16le
 #define sqlite3_value_type             sqlite3_api->value_type
 #define sqlite3_vmprintf               sqlite3_api->vmprintf
+#define sqlite3_vsnprintf              sqlite3_api->vsnprintf
 #define sqlite3_overload_function      sqlite3_api->overload_function
 #define sqlite3_prepare_v2             sqlite3_api->prepare_v2
 #define sqlite3_prepare16_v2           sqlite3_api->prepare16_v2
@@ -507,9 +511,12 @@ struct sqlite3_api_routines {
 #define sqlite3_value_free             sqlite3_api->value_free
 #define sqlite3_result_zeroblob64      sqlite3_api->result_zeroblob64
 #define sqlite3_bind_zeroblob64        sqlite3_api->bind_zeroblob64
-#endif /* SQLITE_CORE */
+/* Version 3.9.0 and later */
+#define sqlite3_value_subtype          sqlite3_api->value_subtype
+#define sqlite3_result_subtype         sqlite3_api->result_subtype
+#endif /* !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION) */
 
-#ifndef SQLITE_CORE
+#if !defined(SQLITE_CORE) && !defined(SQLITE_OMIT_LOAD_EXTENSION)
   /* This case when the file really is being compiled as a loadable 
   ** extension */
 # define SQLITE_EXTENSION_INIT1     const sqlite3_api_routines *sqlite3_api=0;

data/lib/amalgalite/version.rb

@@ -4,5 +4,5 @@
 #++
 
 module Amalgalite
-  VERSION = "1.4.1"
+  VERSION = "1.5.0"
 end

data/spec/sqlite3/version_spec.rb

@@ -7,16 +7,16 @@ describe "Amalgalite::SQLite3::Version" do
     expect(Amalgalite::SQLite3::Version.to_s).to match( /\d\.\d\.\d/ )
     expect(Amalgalite::SQLite3::Version.runtime_version).to match( /\d\.\d\.\d/ )
 
-    Amalgalite::SQLite3::Version.to_i.should eql(3008011)
-    Amalgalite::SQLite3::Version.runtime_version_number.should eql(3008011)
+    Amalgalite::SQLite3::Version.to_i.should eql(3009002)
+    Amalgalite::SQLite3::Version.runtime_version_number.should eql(3009002)
 
     Amalgalite::SQLite3::Version::MAJOR.should eql(3)
-    Amalgalite::SQLite3::Version::MINOR.should eql(8)
-    Amalgalite::SQLite3::Version::RELEASE.should eql(11)
+    Amalgalite::SQLite3::Version::MINOR.should eql(9)
+    Amalgalite::SQLite3::Version::RELEASE.should eql(2)
     expect(Amalgalite::SQLite3::Version.to_a.size).to eql(3)
 
-    Amalgalite::SQLite3::Version.compiled_version.should be == "3.8.11.1"
-    Amalgalite::SQLite3::Version.compiled_version_number.should be == 3008011
+    Amalgalite::SQLite3::Version.compiled_version.should be == "3.9.2"
+    Amalgalite::SQLite3::Version.compiled_version_number.should be == 3009002
     Amalgalite::SQLite3::Version.compiled_matches_runtime?.should be == true
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amalgalite
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: x86-mingw32
 authors:
 - Jeremy Hinegardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arrayfields
@@ -155,7 +155,7 @@ files:
 - examples/bootstrap.rb
 - examples/define_aggregate.rb
 - examples/define_function.rb
-- examples/fts3.rb
+- examples/fts5.rb
 - examples/gem-db.rb
 - examples/require_me.rb
 - examples/requires.rb

data/examples/fts3.rb

@@ -1,144 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'amalgalite'
-require 'benchmark'
-
-begin
-  require 'json'
-rescue LoadError 
-  abort "'gem install json' to run this example"
-end
-
-
-README = <<_
- This example programs assumes that you have downloaded the 'Tweets During the
- State of the Union address' dataset from infochimps.com
-
-   http://www.infochimps.com/datasets/tweets-during-state-of-the-union-address
-
- Please:
-   1) download this dataset
-   2) bunzip + untar this file
-   3) record the location of the 'twitter_stream.txt' file that is in the
-      tarball.  
-   4) Pass this file as the first parameter to this script.
-_
-
-twitter_stream = ARGV.shift
-abort README unless twitter_stream and File.readable?( twitter_stream )
-
-#
-# Lets create a database that utilizes FTS3 http://www.sqlite.org/fts3.html
-#
-#
-
-#
-# Create a database, this will create the DB if it doesn't exist
-#
-puts "Opening database (version #{Amalgalite::Version})"
-db = Amalgalite::Database.new("fts3.db")
-
-#
-# Create the schema unless it already exists in the table.  The meta information
-# about the database schema is available as the result of the db.schema method
-#
-schema = db.schema
-unless schema.tables['search'] 
-  puts "Create schema"
-  db.execute_batch <<-SQL
-  CREATE VIRTUAL TABLE search USING fts3(
-    filename VARCHAR(128),
-    content  TEXT 
-  );
-
-  CREATE TABLE plain (
-    filename VARCHAR(128),
-    content  TEXT 
-  );
-  SQL
-  db.reload_schema!
-end
-
-#
-# Only load the data if the db is empty
-#
-if db.first_value_from( "SELECT count(*) from search" ) == 0 then
-  before = Time.now
-  # 
-  # Load the tweets from the file passed on the commandline into the database
-  # We just want the text and the tweet id and insert that into the database.
-  #
-
-  lines = IO.readlines( twitter_stream )
-  idx = 0
-
-  # Inserting bulk rows as a transaction is good practice with SQLite, it is
-  # MUCH faster.  
-  db.transaction do |db_in_transaction|
-    lines.each do |line|
-
-      # quick little parse of the tweet
-      json = JSON.parse( line )
-      insert_data = {}
-      insert_data[':fname']   = json['id']
-      insert_data[':content'] = json['text']
-
-      # insert into the FTS3 table
-      db_in_transaction.prepare("INSERT INTO search( filename, content ) VALUES( :fname, :content );") do |stmt|
-        stmt.execute( insert_data )
-      end
-
-      # insert into the normal table for comparison
-      db_in_transaction.prepare("INSERT INTO plain( filename, content ) VALUES( :fname, :content );") do |stmt|
-        stmt.execute( insert_data )
-      end
-
-      idx += 1
-      print "Processed #{idx} of #{lines.size}\r"
-      $stdout.flush
-    end
-    puts "Finalizing..."
-  end
-  puts "Took #{Time.now - before} seconds to insert #{idx} lines of #{lines.size}"
-  puts "Done Inserting"
-end
-
-doc_count = db.first_value_from( "SELECT count(*) from search" ) 
-
-#
-# Now lets do some searching for some various words
-#
-
-%w[ president salmon thanks ].each do |word|
-
-  count = 100
-  puts
-  puts "Searching for '#{word}' across #{doc_count} tweets"
-  puts "=" * 60
-
-  Benchmark.bm( 15 ) do |x|
-
-    #
-    # search using the fts search to get the cont of tweets with the given word
-    #
-    x.report('fts3: ') do 
-      db.prepare( "SELECT count(filename) FROM search WHERE content MATCH '#{word}'" ) do |stmt|
-        count.times do
-          stmt.execute
-        end
-      end
-    end
-
-    #
-    # search using basic string matching in sqlite.  
-    #
-    x.report('plain: ') do 
-      db.prepare( "SELECT count(filename) FROM plain WHERE content LIKE '% #{word} %'" ) do |stmt|
-        count.times do
-          stmt.execute
-        end
-      end
-    end
-  end
-end
-