motion-sqlite3 0.5.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 199d13b845e8cdabee64303b840f750d37b928f7
-  data.tar.gz: 4338619fbf94ed9cfb7632dd62a0bc600bee9ab2
+SHA256:
+  metadata.gz: b019eb6013a8396a0d422ffd1f5eafeb13a580c4f3d30f0e3dc118188b9f6c97
+  data.tar.gz: cb3fcf49b7145ef755eec8756afd78b6cc6c967e735dfacecbbba6d0eadcc590
 SHA512:
-  metadata.gz: 8f0d2a9b7d65bf8d8b9340df35f5d2f264dd01b5b3c355c2e030dc64c991aa359fb3df3751cb31f62ff97452a449e13a4732186b552c50c232b205ea0fa12e24
-  data.tar.gz: 57afec7a3299a6d29fc5a17707e9f2e99f905d08b048174123784806ed03bbd0141ff19c827ef891b835a1bc17c6b404da5ecffc6fc049f84a8fa067a876a682
+  metadata.gz: a031759f1f4b2724454dd435c29c4eb4cc1b9b6ca009121b7f5891552dbcade4a2f043e3a49bf112ab8310d17885555b983e0e59628144a9a7e1a6c6843b203a
+  data.tar.gz: 3d9f5eeefa0b0e4e7578bf55be7e75ccaf290140a730c6a8117e7cf11844d27118034c63b45ef907b23df2a91406c0365880dd92d349a42aaea2601c31092b3a

data/.gitignore

@@ -15,3 +15,4 @@ nbproject
 .sass-cache
 .idea
 Gemfile.lock
+pkg

data/.travis.yml

@@ -1,2 +1,23 @@
-install: bundle install
 language: objective-c
+osx_image: xcode12.4
+env:
+  global:
+    - RUBYMOTION_LICENSE=1dcac45cc434293009f74b33037bdf7361a3a1ff # Official license key for open-source projects
+    - TMP_DIR=./tmp # For motion repo, so it doesn't attempt to use /tmp, to which it has no access
+    - OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
+before_install:
+  - brew update
+  - brew outdated xctool || brew upgrade xctool
+  - (xcrun simctl list)
+  - wget http://travisci.rubymotion.com/ -O RubyMotion-TravisCI.pkg
+  - sudo installer -pkg RubyMotion-TravisCI.pkg -target /
+  - cp -r /usr/lib/swift/*.dylib /Applications/Xcode.app/Contents/Frameworks/
+  - touch /Applications/Xcode.app/Contents/Frameworks/.swift-5-staged
+  - sudo mkdir -p ~/Library/RubyMotion/build
+  - sudo chown -R travis ~/Library/RubyMotion
+  - eval "sudo motion activate $RUBYMOTION_LICENSE"
+  - sudo motion update
+  - (motion --version)
+  - (ruby --version)
+  - motion repo
+script: bundle exec rake spec

data/LICENSE

@@ -0,0 +1,7 @@
+Copyright (c) 2013-2014 Matt Green
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -4,7 +4,7 @@ This is a tiny wrapper around the SQLite C API that's written in RubyMotion. It
 
 Whenever possible, it uses Ruby idioms like blocks and exceptions.
 
-[![Code Climate](https://codeclimate.com/github/mattgreen/motion-sqlite3.png)](https://codeclimate.com/github/mattgreen/motion-sqlite3) [![Build Status](https://travis-ci.org/mattgreen/motion-sqlite3.png?branch=master)](https://travis-ci.org/mattgreen/motion-sqlite3) [![Gem Version](https://badge.fury.io/rb/motion-sqlite3.png)](http://badge.fury.io/rb/motion-sqlite3)
+[![Code Climate](https://codeclimate.com/github/rubymotion-community/motion-sqlite3.png)](https://codeclimate.com/github/rubymotion-community/motion-sqlite3) [![Build Status](https://travis-ci.org/rubymotion-community/motion-sqlite3.png?branch=master)](https://travis-ci.org/rubymotion-community/motion-sqlite3) [![Gem Version](https://badge.fury.io/rb/motion-sqlite3.png)](http://badge.fury.io/rb/motion-sqlite3)
 
 Is it any good?
 ---------------
@@ -52,7 +52,3 @@ Usage
 * Use `execute` to run SQL statements. All SQL statements are first prepared, and parameters can be passed as an Array or a Hash. If a Hash is passed, then the SQLite named parameter syntax is assumed to be in use.
 * Use `execute_debug` to see the SQL statement and paramaters passed in the REPL. You should not use this method in production.
 * Use `execute_scalar` to run SQL statements and return the first column of the first row. This is useful for queries like `SELECT COUNT(*) FROM posts`.
-
-Status
-----------
-Still in early stages. I'm hacking on it.

data/Rakefile

@@ -1,21 +1,16 @@
 # -*- coding: utf-8 -*-
 $:.unshift("/Library/RubyMotion/lib")
-require 'motion/project/template/ios'
+$:.unshift("~/.rubymotion/rubymotion-templates")
 
-require "bundler/gem_tasks"
+require "motion/project/template/ios"
+require "motion/project/template/gem/gem_tasks"
 require "bundler/setup"
-Bundler.require :default
+Bundler.require
 
 Motion::Project::App.setup do |app|
   app.name = 'motion-sqlite3'
 
-  base_dir = File.dirname(__FILE__)
-  app.files += Dir.glob(File.join(base_dir, "lib/motion-sqlite3/**/*.rb"))
-
   if ENV["DEFAULT_PROVISIONING_PROFILE"]
     app.provisioning_profile = ENV["DEFAULT_PROVISIONING_PROFILE"]
   end
-
-  app.libs << "/usr/lib/libsqlite3.dylib"
-  app.include 'sqlite3.h'
 end

data/lib/motion-sqlite3.rb

@@ -10,6 +10,6 @@ Motion::Project::App.setup do |app|
     app.files.unshift(file)
   end
 
-  app.libs << "/usr/lib/libsqlite3.dylib"
+  app.libs << '-lsqlite3'
   app.include "sqlite3.h"
 end

data/lib/motion-sqlite3/database.rb

@@ -1,11 +1,13 @@
 module SQLite3
   class Database
+    attr_accessor :logging
+
     def initialize(filename)
       @handle = Pointer.new(::Sqlite3.type)
       @logging = false
 
       result = sqlite3_open(filename, @handle)
-      raise SQLite3Error, sqlite3_errmsg(@handle.value) if result != SQLITE_OK
+      raise SQLite3Error, sqlite3_errmsg(@handle.value_with_autorelease) if result != SQLITE_OK
     end
 
     def execute(sql, params = nil, &block)
@@ -39,8 +41,6 @@ module SQLite3
       execute(*args).first.values.first
     end
 
-    attr_accessor :logging
-
     def transaction(&block)
       execute("BEGIN TRANSACTION")
 

data/lib/motion-sqlite3/result_set.rb

@@ -15,43 +15,29 @@ module SQLite3
 
     private
 
-    def columns
-      @result_columns ||= begin
-        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)
-
-          columns[name] = ColumnMetadata.new(i, type)
-        end
-
-        columns
-      end
-    end
-
     def current_row
       row = {}
 
-      columns.each do |name, metadata|
-        case metadata.type
+      column_count = sqlite3_column_count(@handle.value_with_autorelease)
+      0.upto(column_count - 1) do |i|
+        name = sqlite3_column_name(@handle.value_with_autorelease, i).to_sym
+        type = sqlite3_column_type(@handle.value_with_autorelease, i)
+
+        case type
         when SQLITE_NULL
           row[name] = nil
         when SQLITE_TEXT
-          row[name] = sqlite3_column_text(@handle.value, metadata.index)
+          row[name] = sqlite3_column_text(@handle.value_with_autorelease, i)
         when SQLITE_BLOB
-          row[name] = NSData.dataWithBytes(sqlite3_column_blob(@handle.value, metadata.index), length: sqlite3_column_bytes(@handle.value, metadata.index))
+          row[name] = NSData.dataWithBytes(sqlite3_column_blob(@handle.value_with_autorelease, i), length: sqlite3_column_bytes(@handle.value_with_autorelease, i))
         when SQLITE_INTEGER
-          row[name] = sqlite3_column_int(@handle.value, metadata.index)
+          row[name] = sqlite3_column_int64(@handle.value_with_autorelease, i)
         when SQLITE_FLOAT
-          row[name] = sqlite3_column_double(@handle.value, metadata.index)
+          row[name] = sqlite3_column_double(@handle.value_with_autorelease, i)
         end
       end
 
       row
     end
   end
-
-  class ColumnMetadata < Struct.new(:index, :type); end
 end

data/lib/motion-sqlite3/statement.rb

@@ -20,13 +20,13 @@ module SQLite3
     end
 
     def finalize
-      sqlite3_finalize(@handle.value)
+      sqlite3_finalize(@handle.value_with_autorelease)
     end
 
     def step
-      @result = sqlite3_step(@handle.value)
+      @result = sqlite3_step(@handle.value_with_autorelease)
       unless @result == SQLITE_DONE || @result == SQLITE_ROW
-        raise SQLite3Error, sqlite3_errmsg(@db.value)
+        raise SQLite3Error, sqlite3_errmsg(@db.value_with_autorelease)
       end
     end
 
@@ -49,20 +49,20 @@ module SQLite3
 
       case value
       when NilClass
-        result = sqlite3_bind_null(@handle.value, index)
+        result = sqlite3_bind_null(@handle.value_with_autorelease, index)
       when String, Symbol
-        result = sqlite3_bind_text(@handle.value, index, value, -1, lambda { |arg| })
+        result = sqlite3_bind_text(@handle.value_with_autorelease, index, value, -1, lambda { |arg| })
       when Integer
-        result = sqlite3_bind_int(@handle.value, index, value)
+        result = sqlite3_bind_int64(@handle.value_with_autorelease, index, value)
       when Float
-        result = sqlite3_bind_double(@handle.value, index, value)
-      when NSData
-        result = sqlite3_bind_blob(@handle.value, index, value.bytes, value.length, lambda { |arg| })
+        result = sqlite3_bind_double(@handle.value_with_autorelease, index, value)
+      when NSDatavalue
+        result = sqlite3_bind_blob(@handle.value_with_autorelease, index, value.bytes, value.length, lambda { |arg| })
       else
         raise SQLite3Error, "unable to bind #{value} to #{name}: unexpected type #{value.class}"
       end
 
-      raise SQLite3Error, sqlite3_errmsg(@db.value) if result != SQLITE_OK
+      raise SQLite3Error, sqlite3_errmsg(@db.value_with_autorelease) if result != SQLITE_OK
     end
 
     def column_index(name)
@@ -70,7 +70,7 @@ module SQLite3
 
       case name
       when String, Symbol
-        index = sqlite3_bind_parameter_index(@handle.value, ":#{name}")
+        index = sqlite3_bind_parameter_index(@handle.value_with_autorelease, ":#{name}")
         raise SQLite3Error, "couldn't find index for #{name}!" if index == 0
 
       when Integer
@@ -82,8 +82,8 @@ module SQLite3
 
     def prepare(sql)
       remainder = Pointer.new(:string)
-      result = sqlite3_prepare_v2(@db.value, sql, -1, @handle, remainder)
-      raise SQLite3Error, sqlite3_errmsg(@db.value) if result != SQLITE_OK
+      result = sqlite3_prepare_v2(@db.value_with_autorelease, sql, -1, @handle, remainder)
+      raise SQLite3Error, sqlite3_errmsg(@db.value_with_autorelease) if result != SQLITE_OK
     end
   end
 end

data/lib/motion-sqlite3/version.rb

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

data/motion-sqlite3.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.description   = "A minimal wrapper over the SQLite 3 C API for RubyMotion"
   gem.summary       = "A minimal wrapper over the SQLite 3 C API for RubyMotion"
   gem.license       = "MIT"
-  gem.homepage      = "http://github.com/mattgreen/motion-sqlite3"
+  gem.homepage      = "http://github.com/rubymotion-community/motion-sqlite3"
 
   gem.files         = `git ls-files`.split($\)
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
@@ -16,5 +16,5 @@ Gem::Specification.new do |gem|
   gem.version       = SQLite3::VERSION
 
   gem.add_development_dependency 'rake'
-  gem.add_dependency 'motion.h', '~> 0.0.3'
+  gem.add_dependency 'motion.h', '~> 0.0.6'
 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: 2.0.0
 platform: ruby
 authors:
 - Matt Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2021-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.6
 description: A minimal wrapper over the SQLite 3 C API for RubyMotion
 email:
 - mattgreenrocks@gmail.com
@@ -49,6 +49,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - Guardfile
+- LICENSE
 - README.md
 - Rakefile
 - app/app_delegate.rb
@@ -60,7 +61,7 @@ files:
 - lib/motion-sqlite3/version.rb
 - motion-sqlite3.gemspec
 - spec/database_spec.rb
-homepage: http://github.com/mattgreen/motion-sqlite3
+homepage: http://github.com/rubymotion-community/motion-sqlite3
 licenses:
 - MIT
 metadata: {}
@@ -79,8 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A minimal wrapper over the SQLite 3 C API for RubyMotion