dbmlite3 1.0.a1 → 1.0.a4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 546ca0010f91757ca1346cd87ca9f2846318e65123668363239b61e8f1f5bbdd
-  data.tar.gz: 5500f44eec01f68da64ed8e8d8ec73a1325ffafeab274a2ae00604a68e16ae61
+  metadata.gz: fac72547c8bd87ca5fcc089e5570ee80b4a7beeb539e76df1888c8b1b97b163b
+  data.tar.gz: d689bf111e159c2c46568f921c945fdbdbed53f57e7a6fd68f24bc52baa5cf34
 SHA512:
-  metadata.gz: 45e67ef18cff8f3f17610e888a7153bb83d83438334c8ce0d204fdda7c599926e5ec210e09cb67bf909dbfa829fb17046b46a540e5373960b049bccb77526cf1
-  data.tar.gz: 7c113a41818d9bdea1aec2b8e3d5fe1f54c4c134e8fa777a6e19a6c0f8546c326f6ef901caddc4b65985df1b50a89d809db6b32196eb157034e619fd9cebade5
+  metadata.gz: a8706449a100a494853f57f5ee5f7d2c79a67794d835efb3ab5453a56898909129811b4acf72a9770ed61a55b4919105adedc1cdbf005b87475801c7effcb84a
+  data.tar.gz: ef3fc4ad6f06c4b270584cc86d60a0b9526f9e51f1456077edd8076d676bdf1b69f124fe45fca50eabfa88067214c669f7563bd1a29ac23921630614c82b7b35

data/DBMLite3.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'dbmlite3'
-  s.version     = '1.0.a1'
+  s.version     = '1.0.a4'
   s.date        = '2022-02-21'
   s.summary     = "A DBM-style key-value store using SQLite3"
   s.description = <<-EOF
@@ -34,6 +34,6 @@ EOF
   s.add_development_dependency "rspec", '~> 3.10', '>= 3.10.0'
   s.add_development_dependency "yard", '~> 0.9.25', '>= 0.9.25'
   
-  s.homepage    = 'https://codeberg.org/suetanvil/dbmlite3-ruby'
+  s.homepage    = 'https://codeberg.org/suetanvil/dbmlite'
   s.license     = 'MIT'
 end

data/doc/Lite3/DBM.html

@@ -940,8 +940,6 @@ and will result in a Lite3::Error exception.</p>
       <pre class="lines">
 
 
-407
-408
 409
 410
 411
@@ -960,10 +958,12 @@ and will result in a Lite3::Error exception.</p>
 424
 425
 426
-427</pre>
+427
+428
+429</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 407</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 409</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_initialize'>initialize</span><span class='lparen'>(</span><span class='id identifier rubyid_filename'>filename</span><span class='comma'>,</span> <span class='id identifier rubyid_tablename'>tablename</span><span class='comma'>,</span> <span class='id identifier rubyid_serializer'>serializer</span> <span class='op'>=</span> <span class='symbol'>:yaml</span><span class='rparen'>)</span>
   <span class='ivar'>@filename</span> <span class='op'>=</span> <span class='id identifier rubyid_filename'>filename</span>
@@ -1025,8 +1025,6 @@ This is analagous to <code>File.open</code>.</p>
       <pre class="lines">
 
 
-433
-434
 435
 436
 437
@@ -1034,10 +1032,12 @@ This is analagous to <code>File.open</code>.</p>
 439
 440
 441
-442</pre>
+442
+443
+444</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 433</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 435</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_open'>open</span><span class='lparen'>(</span><span class='id identifier rubyid_filename'>filename</span><span class='comma'>,</span> <span class='id identifier rubyid_tablename'>tablename</span><span class='comma'>,</span> <span class='id identifier rubyid_serializer'>serializer</span> <span class='op'>=</span> <span class='symbol'>:yaml</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_instance'>instance</span> <span class='op'>=</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='id identifier rubyid_filename'>filename</span><span class='comma'>,</span> <span class='id identifier rubyid_tablename'>tablename</span><span class='comma'>,</span> <span class='id identifier rubyid_serializer'>serializer</span><span class='rparen'>)</span>
@@ -1086,12 +1086,12 @@ nil if it is not present.</p>
       <pre class="lines">
 
 
-613
-614
-615</pre>
+644
+645
+646</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 613</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 644</span>
 
 <span class='kw'>def</span> <span class='op'>[]</span><span class='lparen'>(</span><span class='id identifier rubyid_key'>key</span><span class='rparen'>)</span>
   <span class='kw'>return</span> <span class='id identifier rubyid_fetch'>fetch</span><span class='lparen'>(</span><span class='id identifier rubyid_key'>key</span><span class='comma'>,</span> <span class='kw'>nil</span><span class='rparen'>)</span>
@@ -1135,8 +1135,6 @@ serialization method you have chosen.</p>
       <pre class="lines">
 
 
-595
-596
 597
 598
 599
@@ -1148,21 +1146,81 @@ serialization method you have chosen.</p>
 605
 606
 607
-608</pre>
+608
+609
+610
+611
+612
+613
+614
+615
+616
+617
+618
+619
+620
+621
+622
+623
+624
+625
+626
+627
+628
+629
+630
+631
+632
+633
+634
+635
+636
+637
+638
+639</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 595</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 597</span>
 
 <span class='kw'>def</span> <span class='op'>[]=</span><span class='lparen'>(</span><span class='id identifier rubyid_key'>key</span><span class='comma'>,</span> <span class='id identifier rubyid_value'>value</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_key'>key</span> <span class='op'>=</span> <span class='id identifier rubyid_check_key'>check_key</span><span class='lparen'>(</span><span class='id identifier rubyid_key'>key</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_valstr'>valstr</span> <span class='op'>=</span> <span class='const'>SQLite3</span><span class='op'>::</span><span class='const'>Blob</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span> <span class='ivar'>@valenc</span><span class='period'>.</span><span class='id identifier rubyid_call'>call</span><span class='lparen'>(</span><span class='id identifier rubyid_value'>value</span><span class='rparen'>)</span> <span class='rparen'>)</span>
 
-  <span class='id identifier rubyid_insert'>insert</span> <span class='op'>=</span> <span class='heredoc_beg'>&lt;&lt;~SQL</span>
-<span class='tstring_content'>    insert into </span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_actual_tbl'>actual_tbl</span><span class='embexpr_end'>}</span><span class='tstring_content'> (key, value) values (?,?)
-</span><span class='tstring_content'>        on conflict(key) do update set value = ?;
-</span><span class='heredoc_end'>    SQL
+  <span class='comment'># At one point, this operation was done with SQLite3&#39;s UPSERT:
+</span>  <span class='comment'>#
+</span>  <span class='comment'>#     insert into #{actual_tbl} (key, value) values (?,?)
+</span>  <span class='comment'>#         on conflict(key) do update set value = ?;
+</span>  <span class='comment'>#
+</span>  <span class='comment'># Unfortunately, this capability was only added to SQLite3 in
+</span>  <span class='comment'># 2018, which means that at the time of this writing (2022)
+</span>  <span class='comment'># there are still a lot of systems out there that have older
+</span>  <span class='comment'># versions of SQLite3 and so can&#39;t do this.
+</span>  <span class='comment'>#
+</span>  <span class='comment'># The venerable `insert or replace` feature **almost** does what
+</span>  <span class='comment'># I want:
+</span>  <span class='comment'>#
+</span>  <span class='comment'>#   insert or replace into #{actual_tbl} (key, value) values (?, ?);
+</span>  <span class='comment'>#
+</span>  <span class='comment'># The one problem is that it changes the order of the rows,
+</span>  <span class='comment'># which we need to preserve in order to remain consistent with
+</span>  <span class='comment'># `Hash` semantics (and because it&#39;s useful).
+</span>  <span class='comment'>#
+</span>  <span class='comment'># So we kick it old school and do a `select` followed by an
+</span>  <span class='comment'># `insert` or `update` wrapped in a transaction.
 </span>  <span class='id identifier rubyid_transaction'>transaction</span> <span class='lbrace'>{</span>
-    <span class='ivar'>@handle</span><span class='period'>.</span><span class='id identifier rubyid_sql'>sql</span><span class='lparen'>(</span><span class='id identifier rubyid_insert'>insert</span><span class='comma'>,</span> <span class='lbracket'>[</span><span class='id identifier rubyid_key'>key</span><span class='comma'>,</span> <span class='id identifier rubyid_valstr'>valstr</span><span class='comma'>,</span> <span class='id identifier rubyid_valstr'>valstr</span><span class='rbracket'>]</span><span class='rparen'>)</span>
+    <span class='id identifier rubyid_rowid'>rowid</span> <span class='op'>=</span> <span class='kw'>nil</span>
+    <span class='id identifier rubyid_select'>select</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>select rowid, key, value from </span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_actual_tbl'>actual_tbl</span><span class='embexpr_end'>}</span><span class='tstring_content'> where key = ?;</span><span class='tstring_end'>&quot;</span></span>
+    <span class='ivar'>@handle</span><span class='period'>.</span><span class='id identifier rubyid_sql'>sql</span><span class='lparen'>(</span><span class='id identifier rubyid_select'>select</span><span class='comma'>,</span> <span class='lbracket'>[</span><span class='id identifier rubyid_key'>key</span><span class='rbracket'>]</span><span class='rparen'>)</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_row'>row</span><span class='op'>|</span>
+      <span class='id identifier rubyid_rowid'>rowid</span> <span class='op'>=</span> <span class='id identifier rubyid_row'>row</span><span class='lbracket'>[</span><span class='int'>0</span><span class='rbracket'>]</span>
+    <span class='rbrace'>}</span>
+
+    <span class='kw'>if</span> <span class='id identifier rubyid_rowid'>rowid</span>
+      <span class='id identifier rubyid_update'>update</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>update </span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_actual_tbl'>actual_tbl</span><span class='embexpr_end'>}</span><span class='tstring_content'> set value = ? where rowid = ?;</span><span class='tstring_end'>&quot;</span></span>
+      <span class='ivar'>@handle</span><span class='period'>.</span><span class='id identifier rubyid_sql'>sql</span><span class='lparen'>(</span><span class='id identifier rubyid_update'>update</span><span class='comma'>,</span> <span class='lbracket'>[</span><span class='id identifier rubyid_valstr'>valstr</span><span class='comma'>,</span> <span class='id identifier rubyid_rowid'>rowid</span><span class='rbracket'>]</span><span class='rparen'>)</span>
+    <span class='kw'>else</span>
+      <span class='id identifier rubyid_insert'>insert</span> <span class='op'>=</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>insert into </span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_actual_tbl'>actual_tbl</span><span class='embexpr_end'>}</span><span class='tstring_content'> (key, value) values (?,?);</span><span class='tstring_end'>&quot;</span></span>
+      <span class='ivar'>@handle</span><span class='period'>.</span><span class='id identifier rubyid_sql'>sql</span><span class='lparen'>(</span><span class='id identifier rubyid_insert'>insert</span><span class='comma'>,</span> <span class='lbracket'>[</span><span class='id identifier rubyid_key'>key</span><span class='comma'>,</span> <span class='id identifier rubyid_valstr'>valstr</span><span class='rbracket'>]</span><span class='rparen'>)</span>
+    <span class='kw'>end</span>
   <span class='rbrace'>}</span>
 
   <span class='kw'>return</span> <span class='id identifier rubyid_value'>value</span>
@@ -1197,12 +1255,12 @@ serialization method you have chosen.</p>
       <pre class="lines">
 
 
-697
-698
-699</pre>
+728
+729
+730</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 697</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 728</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_clear'>clear</span>
   <span class='id identifier rubyid_transaction'>transaction</span> <span class='lbrace'>{</span> <span class='ivar'>@handle</span><span class='period'>.</span><span class='id identifier rubyid_sql'>sql</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>delete from </span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_actual_tbl'>actual_tbl</span><span class='embexpr_end'>}</span><span class='tstring_content'>;</span><span class='tstring_end'>&quot;</span></span><span class='comma'>,</span> <span class='lbracket'>[</span><span class='rbracket'>]</span><span class='rparen'>)</span> <span class='rbrace'>}</span>
@@ -1242,13 +1300,13 @@ no other <code>DBM</code> objects using that file.</p>
       <pre class="lines">
 
 
-530
-531
 532
-533</pre>
+533
+534
+535</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 530</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 532</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_close'>close</span>
   <span class='ivar'>@handle</span><span class='period'>.</span><span class='id identifier rubyid_delref'>delref</span><span class='lparen'>(</span><span class='kw'>self</span><span class='rparen'>)</span>
@@ -1298,12 +1356,12 @@ closed <code>DBM</code>.</p>
       <pre class="lines">
 
 
-537
-538
-539</pre>
+539
+540
+541</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 537</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 539</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_closed?'>closed?</span><span class='lparen'>(</span><span class='rparen'>)</span>
   <span class='kw'>return</span> <span class='ivar'>@handle</span><span class='period'>.</span><span class='id identifier rubyid_is_a?'>is_a?</span> <span class='const'>ClosedHandle</span>
@@ -1339,14 +1397,14 @@ not present, does nothing.</p>
       <pre class="lines">
 
 
-786
-787
-788
-789
-790</pre>
+817
+818
+819
+820
+821</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 786</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 817</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_delete'>delete</span><span class='lparen'>(</span><span class='id identifier rubyid_key'>key</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_transaction'>transaction</span> <span class='lbrace'>{</span>
@@ -1405,14 +1463,14 @@ each entry for which the block returns true.</p>
       <pre class="lines">
 
 
-796
-797
-798
-799
-800</pre>
+827
+828
+829
+830
+831</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 796</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 827</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_delete_if'>delete_if</span><span class='lparen'>(</span><span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_transaction'>transaction</span> <span class='lbrace'>{</span>
@@ -1477,14 +1535,14 @@ own transaction.</p>
       <pre class="lines">
 
 
-711
-712
-713
-714
-715</pre>
+742
+743
+744
+745
+746</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 711</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 742</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_each'>each</span><span class='lparen'>(</span><span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
   <span class='kw'>return</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_to_enum'>to_enum</span><span class='lparen'>(</span><span class='symbol'>:nt_each</span><span class='rparen'>)</span> <span class='kw'>unless</span> <span class='id identifier rubyid_block'>block</span>
@@ -1539,13 +1597,13 @@ own transaction.</p>
       <pre class="lines">
 
 
-761
-762
-763
-764</pre>
+792
+793
+794
+795</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 761</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 792</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_each_key'>each_key</span><span class='lparen'>(</span><span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
   <span class='kw'>return</span> <span class='const'>Enumerator</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lbrace'>{</span><span class='op'>|</span><span class='id identifier rubyid_y'>y</span><span class='op'>|</span> <span class='id identifier rubyid_nt_each'>nt_each</span><span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_k'>k</span><span class='comma'>,</span><span class='id identifier rubyid_v'>v</span><span class='op'>|</span> <span class='id identifier rubyid_y'>y</span> <span class='op'>&lt;&lt;</span> <span class='id identifier rubyid_k'>k</span>  <span class='rbrace'>}</span> <span class='rbrace'>}</span> <span class='kw'>unless</span> <span class='id identifier rubyid_block'>block</span>
@@ -1599,13 +1657,13 @@ own transaction.</p>
       <pre class="lines">
 
 
-770
-771
-772
-773</pre>
+801
+802
+803
+804</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 770</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 801</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_each_value'>each_value</span><span class='lparen'>(</span><span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
   <span class='kw'>return</span> <span class='const'>Enumerator</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lbrace'>{</span><span class='op'>|</span><span class='id identifier rubyid_y'>y</span><span class='op'>|</span> <span class='id identifier rubyid_nt_each'>nt_each</span><span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_k'>k</span><span class='comma'>,</span><span class='id identifier rubyid_v'>v</span><span class='op'>|</span> <span class='id identifier rubyid_y'>y</span> <span class='op'>&lt;&lt;</span> <span class='id identifier rubyid_v'>v</span>  <span class='rbrace'>}</span> <span class='rbrace'>}</span> <span class='kw'>unless</span> <span class='id identifier rubyid_block'>block</span>
@@ -1654,12 +1712,12 @@ own transaction.</p>
       <pre class="lines">
 
 
-813
-814
-815</pre>
+844
+845
+846</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 813</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 844</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_empty?'>empty?</span>
   <span class='kw'>return</span> <span class='id identifier rubyid_size'>size</span> <span class='op'>==</span> <span class='int'>0</span>
@@ -1735,36 +1793,36 @@ exception.</p>
       <pre class="lines">
 
 
-631
-632
-633
-634
-635
-636
-637
-638
-639
-640
-641
-642
-643
-644
-645
-646
-647
-648
-649
-650
-651
-652
-653
-654
-655
-656
-657</pre>
+662
+663
+664
+665
+666
+667
+668
+669
+670
+671
+672
+673
+674
+675
+676
+677
+678
+679
+680
+681
+682
+683
+684
+685
+686
+687
+688</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 631</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 662</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_fetch'>fetch</span><span class='lparen'>(</span><span class='id identifier rubyid_key'>key</span><span class='comma'>,</span> <span class='op'>*</span><span class='id identifier rubyid_args'>args</span><span class='comma'>,</span> <span class='op'>&amp;</span><span class='id identifier rubyid_default_block'>default_block</span><span class='rparen'>)</span>
 
@@ -1840,12 +1898,12 @@ to help with unit tests.</p>
       <pre class="lines">
 
 
-546
-547
-548</pre>
+548
+549
+550</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 546</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 548</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_handle_closed?'>handle_closed?</span>
   <span class='kw'>return</span> <span class='ivar'>@handle</span><span class='period'>.</span><span class='id identifier rubyid_closed?'>closed?</span>
@@ -1898,14 +1956,14 @@ to help with unit tests.</p>
       <pre class="lines">
 
 
-687
-688
-689
-690
-691</pre>
+718
+719
+720
+721
+722</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 687</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 718</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_has_key?'>has_key?</span><span class='lparen'>(</span><span class='id identifier rubyid_key'>key</span><span class='rparen'>)</span>
   <span class='kw'>return</span> <span class='kw'>false</span> <span class='kw'>unless</span> <span class='id identifier rubyid_key'>key</span><span class='period'>.</span><span class='id identifier rubyid_class'>class</span> <span class='op'>==</span> <span class='const'>String</span> <span class='op'>||</span> <span class='id identifier rubyid_key'>key</span><span class='period'>.</span><span class='id identifier rubyid_class'>class</span> <span class='op'>==</span> <span class='const'>Symbol</span>
@@ -1961,13 +2019,13 @@ to help with unit tests.</p>
       <pre class="lines">
 
 
-856
-857
-858
-859</pre>
+887
+888
+889
+890</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 856</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 887</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_has_value?'>has_value?</span><span class='lparen'>(</span><span class='id identifier rubyid_val'>val</span><span class='rparen'>)</span>
   <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_each'>each</span><span class='lbrace'>{</span><span class='op'>|</span><span class='id identifier rubyid_k'>k</span><span class='comma'>,</span><span class='id identifier rubyid_v'>v</span><span class='op'>|</span> <span class='kw'>return</span> <span class='kw'>true</span> <span class='kw'>if</span> <span class='id identifier rubyid_v'>v</span> <span class='op'>==</span> <span class='id identifier rubyid_val'>val</span><span class='rbrace'>}</span>
@@ -2008,14 +2066,14 @@ program.</p>
       <pre class="lines">
 
 
-868
-869
-870
-871
-872</pre>
+899
+900
+901
+902
+903</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 868</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 899</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_invert'>invert</span>
   <span class='id identifier rubyid_result'>result</span> <span class='op'>=</span> <span class='lbrace'>{</span><span class='rbrace'>}</span>
@@ -2055,14 +2113,14 @@ that the result could exceed available memory.</p>
       <pre class="lines">
 
 
-669
-670
-671
-672
-673</pre>
+700
+701
+702
+703
+704</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 669</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 700</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_keys'>keys</span>
   <span class='id identifier rubyid_keys'>keys</span> <span class='op'>=</span> <span class='lbracket'>[</span><span class='rbracket'>]</span>
@@ -2101,19 +2159,19 @@ as determined by SQLite3.</p>
       <pre class="lines">
 
 
-877
-878
-879
-880
-881
-882
-883
-884
-885
-886</pre>
+908
+909
+910
+911
+912
+913
+914
+915
+916
+917</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 877</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 908</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_shift'>shift</span>
   <span class='id identifier rubyid_transaction'>transaction</span> <span class='lbrace'>{</span>
@@ -2159,15 +2217,15 @@ as determined by SQLite3.</p>
       <pre class="lines">
 
 
-804
-805
-806
-807
-808
-809</pre>
+835
+836
+837
+838
+839
+840</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 804</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 835</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_size'>size</span>
   <span class='ivar'>@handle</span><span class='period'>.</span><span class='id identifier rubyid_sql'>sql</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>select count(*) from </span><span class='embexpr_beg'>#{</span><span class='id identifier rubyid_actual_tbl'>actual_tbl</span><span class='embexpr_end'>}</span><span class='tstring_content'>;</span><span class='tstring_end'>&quot;</span></span><span class='comma'>,</span> <span class='lbracket'>[</span><span class='rbracket'>]</span><span class='rparen'>)</span> <span class='lbrace'>{</span> <span class='op'>|</span><span class='id identifier rubyid_row'>row</span><span class='op'>|</span>
@@ -2210,14 +2268,14 @@ program.</p>
       <pre class="lines">
 
 
-841
-842
-843
-844
-845</pre>
+872
+873
+874
+875
+876</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 841</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 872</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_to_a'>to_a</span>
   <span class='id identifier rubyid_result'>result</span> <span class='op'>=</span> <span class='lbracket'>[</span><span class='rbracket'>]</span>
@@ -2258,14 +2316,14 @@ program.</p>
       <pre class="lines">
 
 
-828
-829
-830
-831
-832</pre>
+859
+860
+861
+862
+863</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 828</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 859</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_to_hash'>to_hash</span>
   <span class='id identifier rubyid_result'>result</span> <span class='op'>=</span> <span class='lbrace'>{</span><span class='rbrace'>}</span>
@@ -2296,14 +2354,14 @@ program.</p>
       <pre class="lines">
 
 
-517
-518
 519
 520
-521</pre>
+521
+522
+523</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 517</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 519</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_to_s'>to_s</span>
   <span class='id identifier rubyid_openstr'>openstr</span> <span class='op'>=</span> <span class='id identifier rubyid_closed?'>closed?</span> <span class='op'>?</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>CLOSED</span><span class='tstring_end'>&#39;</span></span> <span class='op'>:</span> <span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>OPEN</span><span class='tstring_end'>&#39;</span></span>
@@ -2371,12 +2429,12 @@ argument.</p>
       <pre class="lines">
 
 
-574
-575
-576</pre>
+576
+577
+578</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 574</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 576</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_transaction'>transaction</span><span class='lparen'>(</span><span class='op'>&amp;</span><span class='id identifier rubyid_block'>block</span><span class='rparen'>)</span>
   <span class='kw'>return</span> <span class='ivar'>@handle</span><span class='period'>.</span><span class='id identifier rubyid_transaction'>transaction</span> <span class='lbrace'>{</span> <span class='id identifier rubyid_block'>block</span><span class='period'>.</span><span class='id identifier rubyid_call'>call</span><span class='lparen'>(</span><span class='kw'>self</span><span class='rparen'>)</span> <span class='rbrace'>}</span>
@@ -2424,12 +2482,12 @@ argument.</p>
       <pre class="lines">
 
 
-579
-580
-581</pre>
+581
+582
+583</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 579</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 581</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_transaction_active?'>transaction_active?</span>
   <span class='kw'>return</span> <span class='ivar'>@handle</span><span class='period'>.</span><span class='id identifier rubyid_transaction_active?'>transaction_active?</span>
@@ -2466,14 +2524,14 @@ including <code>Hash</code> and <code>DBM</code> objects.</p>
       <pre class="lines">
 
 
-778
-779
-780
-781
-782</pre>
+809
+810
+811
+812
+813</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 778</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 809</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_update'>update</span><span class='lparen'>(</span><span class='id identifier rubyid_hash'>hash</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_transaction'>transaction</span> <span class='lbrace'>{</span>
@@ -2513,14 +2571,14 @@ that the result could exceed available memory.</p>
       <pre class="lines">
 
 
-679
-680
-681
-682
-683</pre>
+710
+711
+712
+713
+714</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 679</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 710</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_values'>values</span>
   <span class='id identifier rubyid_values'>values</span> <span class='op'>=</span> <span class='lbracket'>[</span><span class='rbracket'>]</span>
@@ -2558,12 +2616,12 @@ given keys.</p>
       <pre class="lines">
 
 
-661
-662
-663</pre>
+692
+693
+694</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 661</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 692</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_values_at'>values_at</span><span class='lparen'>(</span><span class='op'>*</span><span class='id identifier rubyid_keys'>keys</span><span class='rparen'>)</span>
   <span class='kw'>return</span> <span class='id identifier rubyid_keys'>keys</span><span class='period'>.</span><span class='id identifier rubyid_map'>map</span><span class='lbrace'>{</span><span class='op'>|</span><span class='id identifier rubyid_k'>k</span><span class='op'>|</span> <span class='kw'>self</span><span class='lbracket'>[</span><span class='id identifier rubyid_k'>k</span><span class='rbracket'>]</span><span class='rbrace'>}</span>
@@ -2578,7 +2636,7 @@ given keys.</p>
 </div>
 
       <div id="footer">
-  Generated on Fri Feb 25 14:42:43 2022 by
+  Generated on Sat Feb 26 11:46:07 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.7.0).
 </div>

data/doc/Lite3/Error.html

@@ -125,7 +125,7 @@
 </div>
 
       <div id="footer">
-  Generated on Fri Feb 25 14:42:43 2022 by
+  Generated on Sat Feb 26 11:46:07 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.7.0).
 </div>

data/doc/Lite3/SQL.html

@@ -266,10 +266,10 @@ progress.  (E.g. do <strong>not</strong> call this from the block of
       <pre class="lines">
 
 
-307</pre>
+309</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 307</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 309</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_close_all'>close_all</span><span class='lparen'>(</span><span class='rparen'>)</span>    <span class='kw'>return</span> <span class='const'>HandlePool</span><span class='period'>.</span><span class='id identifier rubyid_close_all'>close_all</span>     <span class='kw'>end</span></pre>
     </td>
@@ -310,10 +310,10 @@ probably not useful to you; it&#39;s there for the unit tests.</p>
       <pre class="lines">
 
 
-298</pre>
+300</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 298</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 300</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_gc'>gc</span><span class='lparen'>(</span><span class='rparen'>)</span>           <span class='kw'>return</span> <span class='const'>HandlePool</span><span class='period'>.</span><span class='id identifier rubyid_gc'>gc</span><span class='semicolon'>;</span>           <span class='kw'>end</span></pre>
     </td>
@@ -360,12 +360,12 @@ thread safe.  Just a wrapper around <code>SQLite3.threadsafe?</code></p>
       <pre class="lines">
 
 
-285
-286
-287</pre>
+287
+288
+289</pre>
     </td>
     <td>
-      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 285</span>
+      <pre class="code"><span class="info file"># File 'lib/dbmlite3.rb', line 287</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_threadsafe?'>threadsafe?</span>
   <span class='kw'>return</span> <span class='const'>SQLite3</span><span class='period'>.</span><span class='id identifier rubyid_threadsafe?'>threadsafe?</span>
@@ -380,7 +380,7 @@ thread safe.  Just a wrapper around <code>SQLite3.threadsafe?</code></p>
 </div>
 
       <div id="footer">
-  Generated on Fri Feb 25 14:42:43 2022 by
+  Generated on Sat Feb 26 11:46:07 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.7.0).
 </div>

data/doc/Lite3.html

@@ -107,7 +107,7 @@
 </div>
 
       <div id="footer">
-  Generated on Fri Feb 25 14:42:43 2022 by
+  Generated on Sat Feb 26 11:46:07 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.7.0).
 </div>

data/doc/_index.html

@@ -142,7 +142,7 @@
 </div>
 
       <div id="footer">
-  Generated on Fri Feb 25 14:42:43 2022 by
+  Generated on Sat Feb 26 11:46:07 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.7.0).
 </div>

data/doc/file.README.html

@@ -193,7 +193,7 @@ make sense of them.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Fri Feb 25 14:42:43 2022 by
+  Generated on Sat Feb 26 11:46:07 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.7.0).
 </div>

data/doc/index.html

@@ -193,7 +193,7 @@ make sense of them.</p>
 </div></div>
 
       <div id="footer">
-  Generated on Fri Feb 25 14:42:43 2022 by
+  Generated on Sat Feb 26 11:46:07 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.7.0).
 </div>

data/doc/top-level-namespace.html

@@ -100,7 +100,7 @@
 </div>
 
       <div id="footer">
-  Generated on Fri Feb 25 14:42:43 2022 by
+  Generated on Sat Feb 26 11:46:07 2022 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.9.25 (ruby-2.7.0).
 </div>

data/lib/dbmlite3.rb

@@ -1,4 +1,6 @@
 
+gem "sqlite3", "~> 1.4"
+
 require 'sqlite3'
 require 'yaml'
 require 'set'
@@ -338,7 +340,7 @@ module Lite3
   # string.  you will need to do this instead:
   #
   #     db.keys.include?('foo') or raise AbjectFailure.new
-  #     
+  #
   # Unlike DBM, values may (optionally) be any serializable Ruby type.
   #
   # You can select the serialization method with an optional third
@@ -596,12 +598,41 @@ SQL
       key = check_key(key)
       valstr = SQLite3::Blob.new( @valenc.call(value) )
 
-      insert = <<~SQL
-        insert into #{actual_tbl} (key, value) values (?,?)
-            on conflict(key) do update set value = ?;
-        SQL
+      # At one point, this operation was done with SQLite3's UPSERT:
+      #
+      #     insert into #{actual_tbl} (key, value) values (?,?)
+      #         on conflict(key) do update set value = ?;
+      #
+      # Unfortunately, this capability was only added to SQLite3 in
+      # 2018, which means that at the time of this writing (2022)
+      # there are still a lot of systems out there that have older
+      # versions of SQLite3 and so can't do this.
+      #
+      # The venerable `insert or replace` feature **almost** does what
+      # I want:
+      #
+      #   insert or replace into #{actual_tbl} (key, value) values (?, ?);
+      #
+      # The one problem is that it changes the order of the rows,
+      # which we need to preserve in order to remain consistent with
+      # `Hash` semantics (and because it's useful).
+      #
+      # So we kick it old school and do a `select` followed by an
+      # `insert` or `update` wrapped in a transaction.
       transaction {
-        @handle.sql(insert, [key, valstr, valstr])
+        rowid = nil
+        select = "select rowid, key, value from #{actual_tbl} where key = ?;"
+        @handle.sql(select, [key]) { |row|
+          rowid = row[0]
+        }
+
+        if rowid
+          update = "update #{actual_tbl} set value = ? where rowid = ?;"
+          @handle.sql(update, [valstr, rowid])
+        else
+          insert = "insert into #{actual_tbl} (key, value) values (?,?);"
+          @handle.sql(insert, [key, valstr])
+        end
       }
 
       return value

data/spec/dbmlite3_spec.rb

@@ -1,8 +1,6 @@
 
 # Tests for *some* of util.rb; this is nowhere near complete.
 
-gem "sqlite3", "~> 1.4"
-
 require_relative '../lib/dbmlite3.rb'
 require 'fileutils'
 require 'set'
@@ -122,6 +120,25 @@ Serializations = Set.new
       db.close
     end
 
+    it "preserves order after modification" do
+      path = Tmp.file
+      db = newdb.call(path, "floop")
+
+      expect( db.keys ) .to eq []
+      expect( db.values ) .to eq []
+
+      db["foo"] = 42
+      db["bar"] = 99
+      db["quux"] = 123
+
+      db["foo"] = 88
+
+      expect( db.keys ) .to eq %w{foo bar quux}
+      expect( db.values ) .to eq [88, 99, 123]
+
+      db.close
+    end
+
     it "implements has_key?" do
       path = Tmp.file
       db = newdb.call(path, "floop")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dbmlite3
 version: !ruby/object:Gem::Version
-  version: 1.0.a1
+  version: 1.0.a4
 platform: ruby
 authors:
 - Chris Reuter
@@ -104,7 +104,7 @@ files:
 - lib/dbmlite3.rb
 - spec/dbmlite3_spec.rb
 - spec/spec_helper.rb
-homepage: https://codeberg.org/suetanvil/dbmlite3-ruby
+homepage: https://codeberg.org/suetanvil/dbmlite
 licenses:
 - MIT
 metadata: {}