carray-io-sqlite3 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e722c2d367cef2bdae609adcf1fce39eb8b56e32066af328cc96ad2490ab5e2
-  data.tar.gz: f8f1f3d262970cbe8c907ff2a7499256a1f3c414e974433ec5148e08171565e8
+  metadata.gz: 1314c190f90f50800ec969287e33214b64c7492ae4541027c92e6bb95dba19f5
+  data.tar.gz: 7d9cdd018be9407fe1d5c8ff78d0c7529551478a369b15f5a8c48daf2f7dbe36
 SHA512:
-  metadata.gz: a41bc8f66e79e508e2faba02e933a1eff01f65079a8e7130fa1ef1427932cefed78a2902bf3b00b3dddd477935731056e9d759c279d9e6cbf76486e789fbdeec
-  data.tar.gz: bd001891dc3018bcf0c1bdba84edbc92ad20619dfd37d7d537ab44b984d5bedab7c2669aea0894825695e2945cb733c558b15cd8952de9f8f0f71ca4d06871fa
+  metadata.gz: 5e26cd252361633fa52d7ee0c2e8e5b9039783378e70bb6a913c47971b41ecfd0f3a81f7886303dd125575f30d6da0248b3c097fdccf37f05f7521e75cade3d3
+  data.tar.gz: 2ee64698ac7e9e4e44e2a64bb535376573aa9f200cb188991c8181b821f4ed8578f29a65042861b8109418c9a5d70f147cd816f0e3bc74732e74842ae46f3ab8

data/carray-io-sqlite3.gemspec

@@ -1,5 +1,5 @@
 Gem::Specification::new do |s|
-  version = "0.9.2"
+  version = "0.9.3"
   files = Dir.glob("**/*") - [ 
                                Dir.glob("carray-io-sqlite3-*.gem"), 
                                Dir.glob("test/**/*"),

data/lib/carray-io-sqlite3/core.rb

@@ -23,12 +23,12 @@ class CArray
       raise "invalid 1st arg"
     end
     table = table.to_ca
-    table.extend(CA::TableMethods)
+    table.extend(CArray::TableMethods)
     table.column_names = names
     return table
   end
 
-  def to_sqlite3 (database: nil, table:, datatype: "numeric", schema: nil, transaction: true)
+  def to_sqlite3 (database: nil, table:, datatype: "numeric", schema: nil, transaction: true, primary_key: nil)
     unless rank <= 2
       raise "to_sqlite3 is valid only for 2-dim array (table)"
     end
@@ -56,28 +56,40 @@ class CArray
     if schema
       database.execute "create table if not exists #{table} (" + schema + ")"          
     else
-      database.execute "create table if not exists #{table} (" + vars.map{|s| s + " " + datatype }.join(",") + ")"
+      constraints = []
+      case primary_key
+      when String
+        constraints << "primary key (#{primary_key})"
+      when Array
+        constraints << "primary key (#{primary_key.join(",")})"
+      end
+      entries = vars.map{|s| s + " " + datatype } + constraints
+      database.execute "create table if not exists #{table} (" + entries.join(",") + ")"
     end
 
     insert = database.prepare %{ insert or replace into #{table} values (#{(["?"]*vars.size).join(",")}) }
-    database.transaction if transaction
-    if rank == 1
-      dim0.times do |i|
-        insert.execute [self[i]]
-      end
-    else
-      begin
+    begin
+      database.transaction if transaction
+      if rank == 1
         dim0.times do |i|
-          begin
-           insert.execute self[i,nil].to_a
-          rescue
-            puts self[i,nil].to_a
-            raise $!
+          insert.execute [self[i]]
+        end
+      else
+        out = self.object.unmask("null")
+        begin
+          dim0.times do |i|
+            begin
+             insert.execute out[i,nil].to_a
+            rescue
+              puts out[i,nil].to_a.inspect
+              raise $!
+            end
           end
         end
       end
+    ensure
+      database.commit if transaction
     end
-    database.commit if transaction
     insert.close
     return database
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carray-io-sqlite3
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Hiroki Motoyoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-08 00:00:00.000000000 Z
+date: 2021-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carray