tb 0.2 → 0.3

data/README

@@ -128,48 +128,56 @@ There are more subcommands.
   % tb help
   Usage:
     tb help [OPTS] [SUBCOMMAND]
-    tb csv [OPTS] [TABLE]
-    tb tsv [OPTS] [TABLE]
-    tb json [OPTS] [TABLE]
-    tb yaml [OPTS] [TABLE]
-    tb pp [OPTS] [TABLE]
-    tb grep [OPTS] REGEXP [TABLE]
-    tb gsub [OPTS] REGEXP STRING [TABLE]
+    tb to-csv [OPTS] [TABLE ...]
+    tb to-tsv [OPTS] [TABLE]
+    tb to-pnm [OPTS] [TABLE]
+    tb to-json [OPTS] [TABLE]
+    tb to-yaml [OPTS] [TABLE]
+    tb to-pp [OPTS] [TABLE]
+    tb grep [OPTS] REGEXP [TABLE ...]
+    tb gsub [OPTS] REGEXP STRING [TABLE ...]
     tb sort [OPTS] [TABLE]
     tb cut [OPTS] FIELD,... [TABLE]
     tb rename [OPTS] SRC,DST,... [TABLE]
     tb newfield [OPTS] FIELD RUBY-EXP [TABLE]
     tb cat [OPTS] [TABLE ...]
-    tb join [OPTS] [TABLE ...]
-    tb group [OPTS] KEY-FIELD1,... [TABLE]
-    tb cross [OPTS] HKEY-FIELD1,... VKEY-FIELD1,... [TABLE]
+    tb join [OPTS] [TABLE1 TABLE2 ...]
+    tb consecutive [OPTS] [TABLE ...]
+    tb group [OPTS] KEY-FIELD1,... [TABLE ...]
+    tb cross [OPTS] HKEY-FIELD1,... VKEY-FIELD1,... [TABLE ...]
     tb shape [OPTS] [TABLE ...]
     tb mheader [OPTS] [TABLE]
-    tb crop [OPTS] [TABLE]
+    tb crop [OPTS] [TABLE ...]
+    tb ls [OPTS] [FILE ...]
+    tb svn-log [OPTS] -- [SVN-LOG-ARGS]
 
 == Command Line Tool
 
 tb command has many subcommands.
 
-  help     : show help message of tb command.
-  csv      : convert a table to CSV (Comma Separated Value).
-  tsv      : convert a table to TSV (Tab Separated Value).
-  json     : convert a table to JSON (JavaScript Object Notation).
-  yaml     : convert a table to YAML (YAML Ain't a Markup Language).
-  pp       : convert a table to pretty printed format.
-  grep     : search rows using regexp or ruby expression.
-  gsub     : substitute cells.
-  sort     : sort rows.
-  cut      : select columns.
-  rename   : rename field names.
-  newfield : add a field.
-  cat      : concatenate tables vertically.
-  join     : concatenate tables horizontally as left/right/full natural join.
-  group    : group and aggregate rows.
-  cross    : create a contingency table.
-  shape    : show table size.
-  mheader  : collapse multi rows header.
-  crop     : extract rectangle in a table.
+  help        : Show help message of tb command.
+  to-csv      : Convert a table to CSV (Comma Separated Value).
+  to-tsv      : Convert a table to TSV (Tab Separated Value).
+  to-pnm      : Convert a table to PNM (Portable Anymap: PPM, PGM, PBM).
+  to-json     : Convert a table to JSON (JavaScript Object Notation).
+  to-yaml     : Convert a table to YAML (YAML Ain't a Markup Language).
+  to-pp       : Convert a table to pretty printed format.
+  grep        : Search rows using regexp or ruby expression.
+  gsub        : Substitute cells.
+  sort        : Sort rows.
+  cut         : Select columns.
+  rename      : Rename field names.
+  newfield    : Add a field.
+  cat         : Concatenate tables vertically.
+  join        : Concatenate tables horizontally as left/right/full natural join.
+  consecutive : Concatenate consecutive rows.
+  group       : Group and aggregate rows.
+  cross       : Create a contingency table.
+  shape       : Show table size.
+  mheader     : Collapse multi rows header.
+  crop        : Extract rectangle in a table.
+  ls          : List directory entries as a table.
+  svn-log     : Show the SVN log as a table.
 
 == Install
 
@@ -187,25 +195,29 @@ Tanaka Akira <akr@fsij.org>
 == License
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-(1) Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer.
-(2) Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-(3) The name of the author may not be used to endorse or promote products
-    derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-OF SUCH DAMAGE.
+modification, are permitted provided that the following conditions
+are met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above
+    copyright notice, this list of conditions and the following
+    disclaimer in the documentation and/or other materials provided
+    with the distribution.
+ 3. The name of the author may not be used to endorse or promote
+    products derived from this software without specific prior
+    written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 (The modified BSD licence)

data/bin/tb

@@ -3,26 +3,30 @@
 # Copyright (C) 2011 Tanaka Akira  <akr@fsij.org>
 # 
 # Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# modification, are permitted provided that the following conditions
+# are met:
 # 
-#  1. Redistributions of source code must retain the above copyright notice, this
-#     list of conditions and the following disclaimer.
-#  2. Redistributions in binary form must reproduce the above copyright notice,
-#     this list of conditions and the following disclaimer in the documentation
-#     and/or other materials provided with the distribution.
-#  3. The name of the author may not be used to endorse or promote products
-#     derived from this software without specific prior written permission.
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above
+#     copyright notice, this list of conditions and the following
+#     disclaimer in the documentation and/or other materials provided
+#     with the distribution.
+#  3. The name of the author may not be used to endorse or promote
+#     products derived from this software without specific prior
+#     written permission.
 # 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-# OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 require 'tb/cmdtop'
 

data/lib/tb.rb

@@ -1,37 +1,53 @@
 # lib/tb.rb - entry file for table library
 #
-# Copyright (C) 2010-2011 Tanaka Akira  <akr@fsij.org>
+# Copyright (C) 2010-2012 Tanaka Akira  <akr@fsij.org>
 # 
 # Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# modification, are permitted provided that the following conditions
+# are met:
 # 
-#  1. Redistributions of source code must retain the above copyright notice, this
-#     list of conditions and the following disclaimer.
-#  2. Redistributions in binary form must reproduce the above copyright notice,
-#     this list of conditions and the following disclaimer in the documentation
-#     and/or other materials provided with the distribution.
-#  3. The name of the author may not be used to endorse or promote products
-#     derived from this software without specific prior written permission.
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above
+#     copyright notice, this list of conditions and the following
+#     disclaimer in the documentation and/or other materials provided
+#     with the distribution.
+#  3. The name of the author may not be used to endorse or promote
+#     products derived from this software without specific prior
+#     written permission.
 # 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-# OF SUCH DAMAGE.
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+require 'tempfile'
+
+class Tb
+end
+
+require 'pp'
+require 'tb/enum'
+require 'tb/enumerator'
+require 'tb/pairs'
 require 'tb/basic'
 require 'tb/record'
 require 'tb/csv'
 require 'tb/tsv'
 require 'tb/pnm'
+require 'tb/json'
 require 'tb/reader'
 require 'tb/ropen'
 require 'tb/catreader'
 require 'tb/fieldset'
 require 'tb/search'
 require 'tb/enumerable'
+require 'tb/fileenumerator'
+require 'tb/revcmp'

data/lib/tb/basic.rb

@@ -1,30 +1,32 @@
 # lib/tb/basic.rb - basic fetures for table library
 #
-# Copyright (C) 2010-2011 Tanaka Akira  <akr@fsij.org>
+# Copyright (C) 2010-2012 Tanaka Akira  <akr@fsij.org>
 # 
 # Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# modification, are permitted provided that the following conditions
+# are met:
 # 
-#  1. Redistributions of source code must retain the above copyright notice, this
-#     list of conditions and the following disclaimer.
-#  2. Redistributions in binary form must reproduce the above copyright notice,
-#     this list of conditions and the following disclaimer in the documentation
-#     and/or other materials provided with the distribution.
-#  3. The name of the author may not be used to endorse or promote products
-#     derived from this software without specific prior written permission.
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above
+#     copyright notice, this list of conditions and the following
+#     disclaimer in the documentation and/or other materials provided
+#     with the distribution.
+#  3. The name of the author may not be used to endorse or promote
+#     products derived from this software without specific prior
+#     written permission.
 # 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
-# OF SUCH DAMAGE.
-
-require 'pp'
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Tb represents a set of records.
 # A record contains field values accessed by field names.
@@ -53,7 +55,7 @@ require 'pp'
 # It is an error to access a record by recordid which is not allocated.
 #
 class Tb
-  include Enumerable
+  include Tb::Enum
 
   # :call-seq:
   #   Tb.new
@@ -142,7 +144,7 @@ class Tb
 
   def check_recordid(recordid)
     recordid = check_recordid_type(recordid)
-    if !@recordid2index.include?(recordid)
+    if !@recordid2index.has_key?(recordid)
       raise IndexError, "unexpected recordid: #{recordid.inspect}"
     end
     recordid
@@ -159,7 +161,7 @@ class Tb
 
   def check_field(field)
     field = check_field_type(field)
-    unless @tbl.include? field
+    unless @tbl.has_key? field
       raise ArgumentError, "field not defined: #{field.inspect}"
     end
     field
@@ -198,7 +200,7 @@ class Tb
     if field.start_with?("_")
       raise ArgumentError, "field begins with underscore: #{field.inspect}"
     end
-    if @tbl.include? field
+    if @tbl.has_key? field
       raise ArgumentError, "field already defined: #{field.inspect}"
     end
     @tbl[field] = []
@@ -347,6 +349,32 @@ class Tb
     @recordid2index.size
   end
 
+  # :call-seq:
+  #   table.empty?
+  #
+  # returns true if there is no record.
+  #
+  #   t0 = Tb.new %w[fruit]
+  #   pp t0
+  #   #=> #<Tb>
+  #   p t0.empty?
+  #   #=> true
+  #
+  #   t3 = Tb.new %w[fruit],      
+  #               %w[apple],    
+  #               %w[banana],       
+  #               %w[orange]       
+  #   pp t3
+  #   #=> #<Tb
+  #   #    {"_recordid"=>0, "fruit"=>"apple"}
+  #   #    {"_recordid"=>1, "fruit"=>"banana"}
+  #   #    {"_recordid"=>2, "fruit"=>"orange"}>
+  #   p t3.empty?
+  #   #=> false
+  def empty?
+    self.size == 0
+  end
+
   # :call-seq:
   #   table.allocate_recordid -> fresh_recordid
   #   table.allocate_recordid(recordid) -> recordid
@@ -398,7 +426,7 @@ class Tb
       @next_recordid += 1
     else
       recordid = check_recordid_type(recordid)
-      if @recordid2index.include? recordid
+      if @recordid2index.has_key? recordid
         raise ArgumentError, "recordid already used: #{recordid.inspect}"
       end
       @next_recordid = recordid + 1 if @next_recordid <= recordid
@@ -886,6 +914,17 @@ class Tb
     }
   end
 
+  # :call-seq:
+  #   table.header_and_each(header_proc) {|record| ... }
+  #
+  # +header_and_each+ calls _header_proc_ at first.
+  # The block is called for each record after that. 
+  #
+  def header_and_each(header_proc, &block)
+    header_proc.call(list_fields) if header_proc
+    self.each(&block)
+  end
+
   # :call-seq:
   #   table.filter {|record| ... }
   def filter
@@ -898,73 +937,33 @@ class Tb
     t
   end
 
-  # :call-seq:
-  #   table1.natjoin2(table2)
-  def natjoin2(table2)
-    table1 = self
-    fields1 = table1.list_fields
-    fields2 = table2.list_fields
-    common_fields = fields1 & fields2
-    total_fields = fields1 | fields2
-    unique_fields2 = fields2 - common_fields
-    h = {}
-    table2.each {|rec2|
-      k = rec2.values_at(*common_fields)
-      (h[k] ||= []) << rec2
+  def natjoin2(table2, missing=nil, retain_left=false, retain_right=false)
+    t1 = Tb::Enumerator.new {|y|
+      self.with_header {|h0|
+        y.set_header h0
+      }.each {|record|
+        y.yield record.to_h
+      }
     }
-    result = Tb.new(fields1 | fields2)
-    table1.each {|rec1|
-      k = rec1.values_at(*common_fields)
-      rec2_list = h[k]
-      next if !rec2_list
-      values = rec1.values_at(*fields1)
-      rec2_list.each {|rec2|
-        result.insert_values total_fields, values + rec2.values_at(*unique_fields2)
+    t2 = Tb::Enumerator.new {|y|
+      table2.with_header {|h0|
+        y.set_header h0
+      }.each {|record|
+        y.yield record.to_h
       }
     }
+    er = t1.natjoin2(t2, missing, retain_left, retain_right) 
+    result = nil
+    er.with_header {|header|
+      result = Tb.new header
+    }.each {|pairs|
+      result.insert pairs
+    }
     result
   end
 
-  # :call-seq:
-  #   table1.natjoin2_outer(table2, missing=nil, retain_left=true, retain_right=true)
   def natjoin2_outer(table2, missing=nil, retain_left=true, retain_right=true)
-    table1 = self
-    fields1 = table1.list_fields
-    fields2 = table2.list_fields
-    common_fields = fields1 & fields2
-    total_fields = fields1 | fields2
-    unique_fields2 = fields2 - common_fields
-    fields2_extended = total_fields.map {|f| fields2.include?(f) ? f : nil }
-    h = {}
-    table2.each {|rec2|
-      k = rec2.values_at(*common_fields)
-      (h[k] ||= []) << rec2
-    }
-    result = Tb.new(total_fields)
-    ids2 = {}
-    table1.each {|rec1|
-      k = rec1.values_at(*common_fields)
-      rec2_list = h[k]
-      values = rec1.values_at(*fields1)
-      if !rec2_list || rec2_list.empty? 
-        if retain_left
-	  result.insert_values total_fields, values + unique_fields2.map { missing }
-	end
-      else
-        rec2_list.each {|rec2|
-          ids2[rec2['_recordid']] = true
-          result.insert_values total_fields, values + rec2.values_at(*unique_fields2)
-        }
-      end
-    }
-    if retain_right
-      table2.each {|rec2|
-	if !ids2[rec2['_recordid']]
-	  result.insert_values total_fields, fields2_extended.map {|f| f ? rec2[f] : missing }
-	end
-      }
-    end
-    result
+    natjoin2(table2, missing, retain_left, retain_right)
   end
 
   # :call-seq: