daff 1.2.3 → 1.2.4

data/lib/lib/coopy/flat_cell_builder.rb

@@ -62,7 +62,7 @@ module Coopy
           score+=1
         end
       end
-      str = "_" + _hx_str(str) if str[score..-1] == _nil
+      str = "_" + _hx_str(str) if HxOverrides.substr(str,score,nil) == _nil
       return str
     end
     

data/lib/lib/coopy/highlight_patch.rb

@@ -8,6 +8,7 @@ module Coopy
       @source = source
       @patch = patch
       @view = patch.get_cell_view
+      @source_view = source.get_cell_view
     end
     
     protected
@@ -15,6 +16,7 @@ module Coopy
     attr_accessor :source
     attr_accessor :patch
     attr_accessor :view
+    attr_accessor :source_view
     attr_accessor :csv
     attr_accessor :header
     attr_accessor :header_pre
@@ -201,13 +203,13 @@ module Coopy
           if mod != nil 
             if (mod[0].ord rescue nil) == 58 
               move = true
-              mod = mod[1,mod.length]
+              mod = HxOverrides.substr(mod,1,mod.length)
             end
           end
           @header[i] = name
           if mod != nil 
             if (mod[0].ord rescue nil) == 40 
-              prev_name = mod[1,mod.length - 2]
+              prev_name = HxOverrides.substr(mod,1,mod.length - 2)
               @header_pre[prev_name] = i
               @header_post[name] = i
               @header_rename[prev_name] = name
@@ -276,13 +278,13 @@ module Coopy
     
     def check_act 
       act = self.get_string(@rc_offset)
-      ::Coopy::DiffRender.examine_cell(0,0,act,"",act,"",@row_info) if @row_info.value != act
+      ::Coopy::DiffRender.examine_cell(0,0,@view,act,"",act,"",@row_info) if @row_info.value != act
     end
     
     def get_pre_string(txt)
       self.check_act
       return txt if !@row_info.updated
-      ::Coopy::DiffRender.examine_cell(0,0,txt,"",@row_info.value,"",@cell_info)
+      ::Coopy::DiffRender.examine_cell(0,0,@view,txt,"",@row_info.value,"",@cell_info)
       return txt if !@cell_info.updated
       return @cell_info.lvalue
     end
@@ -310,7 +312,7 @@ module Coopy
     end
     
     def process_mods(rmods,fate,len)
-      rmods.sort{|a,b| self.sort_mods(a,b)}
+      rmods.sort!{|a,b| self.sort_mods(a,b)}
       offset = 0
       last = -1
       target = 0
@@ -512,7 +514,7 @@ module Coopy
               while(_it2.has_next) do
                 c1 = _it2._next
                 txt = @view.to_s(@patch.get_cell(c1,mod1.patch_row))
-                ::Coopy::DiffRender.examine_cell(0,0,txt,"",@row_info.value,"",@cell_info)
+                ::Coopy::DiffRender.examine_cell(0,0,@view,txt,"",@row_info.value,"",@cell_info)
                 next if !@cell_info.updated
                 next if @cell_info.conflicted
                 d = @view.to_datum(@csv.parse_cell(@cell_info.rvalue))

data/lib/lib/coopy/mover.rb

@@ -155,7 +155,7 @@ module Coopy
         k = _it._next
         blks.push(k)
       end
-      blks.sort {|a,b|
+      blks.sort! {|a,b|
         return blk_len[b] - blk_len[a]
       }
       moved = Array.new

data/lib/lib/coopy/ndjson.rb

@@ -0,0 +1,134 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class Ndjson 
+    
+    def initialize(tab)
+      @tab = tab
+      @view = tab.get_cell_view
+      @header_row = 0
+    end
+    
+    protected
+    
+    attr_accessor :tab
+    attr_accessor :view
+    attr_accessor :columns
+    attr_accessor :header_row
+    
+    public
+    
+    def render_row(r)
+      row = {}
+      begin
+        _g1 = 0
+        _g = @tab.get_width
+        while(_g1 < _g) 
+          c = _g1
+          _g1+=1
+          key = @view.to_s(@tab.get_cell(c,@header_row))
+          key = "@:@" if c == 0 && @header_row == 1
+          begin
+            value = @tab.get_cell(c,r)
+            begin
+              value1 = value
+              row[key] = value1
+            end
+          end
+        end
+      end
+      return ::Haxe::Format::JsonPrinter._print(row,nil,nil)
+    end
+    
+    def render 
+      txt = ""
+      offset = 0
+      return txt if @tab.get_height == 0
+      return txt if @tab.get_width == 0
+      offset = 1 if @tab.get_cell(0,0) == "@:@"
+      @header_row = offset
+      begin
+        _g1 = @header_row + 1
+        _g = @tab.get_height
+        while(_g1 < _g) 
+          r = _g1
+          _g1+=1
+          txt += self.render_row(r)
+          txt += "\n"
+        end
+      end
+      return txt
+    end
+    
+    def add_row(r,txt)
+      json = ::Haxe::Format::JsonParser.new(txt).parse_rec
+      @columns = {} if @columns == nil
+      w = @tab.get_width
+      h = @tab.get_height
+      resize = false
+      begin
+        _g = 0
+        _g1 = Reflect.fields(json)
+        while(_g < _g1.length) 
+          name = _g1[_g]
+          _g+=1
+          if !@columns.include?(name) 
+            @columns[name] = w
+            w+=1
+            resize = true
+          end
+        end
+      end
+      if r >= h 
+        h = r + 1
+        resize = true
+      end
+      @tab.resize(w,h) if resize
+      begin
+        _g2 = 0
+        _g11 = Reflect.fields(json)
+        while(_g2 < _g11.length) 
+          name1 = _g11[_g2]
+          _g2+=1
+          v = Reflect.field(json,name1)
+          c = @columns[name1]
+          @tab.set_cell(c,r,v)
+        end
+      end
+    end
+    
+    def add_header_row(r)
+      names = ::Rb::RubyIterator.new(@columns.keys)
+      _it = names
+      while(_it.has_next) do
+        n = _it._next
+        @tab.set_cell(@columns[n],r,@view.to_datum(n))
+      end
+    end
+    
+    def parse(txt)
+      @columns = nil
+      rows = txt.split("\n")
+      h = rows.length
+      if h == 0 
+        @tab.clear
+        return
+      end
+      h-=1 if rows[h - 1] == ""
+      begin
+        _g = 0
+        while(_g < h) 
+          i = _g
+          _g+=1
+          at = h - i - 1
+          self.add_row(at + 1,rows[at])
+        end
+      end
+      self.add_header_row(0)
+    end
+    
+  haxe_me
+  end
+
+end

data/lib/lib/coopy/nested_cell_builder.rb

@@ -0,0 +1,74 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class NestedCellBuilder 
+    
+    def initialize
+    end
+    
+    protected
+    
+    attr_accessor :view
+    
+    public
+    
+    def need_separator 
+      return false
+    end
+    
+    def set_separator(separator)
+    end
+    
+    def set_conflict_separator(separator)
+    end
+    
+    def set_view(view)
+      @view = view
+    end
+    
+    def update(local,remote)
+      h = @view.make_hash
+      @view.hash_set(h,"before",local)
+      @view.hash_set(h,"after",remote)
+      return h
+    end
+    
+    def conflict(parent,local,remote)
+      h = @view.make_hash
+      @view.hash_set(h,"before",parent)
+      @view.hash_set(h,"ours",local)
+      @view.hash_set(h,"theirs",remote)
+      return h
+    end
+    
+    def marker(label)
+      return @view.to_datum(label)
+    end
+    
+    protected
+    
+    def neg_to_null(x)
+      return nil if x < 0
+      return x
+    end
+    
+    public
+    
+    def links(unit)
+      h = @view.make_hash
+      if unit.p >= -1 
+        @view.hash_set(h,"before",self.neg_to_null(unit.p))
+        @view.hash_set(h,"ours",self.neg_to_null(unit.l))
+        @view.hash_set(h,"theirs",self.neg_to_null(unit.r))
+        return h
+      end
+      @view.hash_set(h,"before",self.neg_to_null(unit.l))
+      @view.hash_set(h,"after",self.neg_to_null(unit.r))
+      return h
+    end
+    
+  haxe_me
+  end
+
+end

data/lib/lib/coopy/simple_view.rb

@@ -23,6 +23,35 @@ module Coopy
       return x
     end
     
+    def make_hash 
+      return {}
+    end
+    
+    def hash_set(h,str,d)
+      hh = h
+      begin
+        value = d
+        begin
+          value1 = value
+          hh[str] = value1
+        end
+      end
+    end
+    
+    def hash_exists(h,str)
+      hh = h
+      return hh.include?(str)
+    end
+    
+    def hash_get(h,str)
+      hh = h
+      return hh[str]
+    end
+    
+    def is_hash(h)
+      return h.respond_to? :keys
+    end
+    
   haxe_me
   end
 

data/lib/lib/coopy/sql_column.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class SqlColumn 
+    
+    def initialize
+    end
+    
+    attr_accessor :name
+    attr_accessor :primary
+    
+    def get_name 
+      return @name
+    end
+    
+    def is_primary_key 
+      return @primary
+    end
+    
+    def to_s 
+      return _hx_str((((@primary) ? "*" : ""))) + _hx_str(@name)
+    end
+    
+    def SqlColumn.by_name_and_primary_key(name,primary)
+      result = ::Coopy::SqlColumn.new
+      result.name = name
+      result.primary = primary
+      return result
+    end
+    
+  haxe_me
+  end
+
+end

data/lib/lib/coopy/sql_compare.rb

@@ -0,0 +1,245 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class SqlCompare 
+    
+    def initialize(db,local,remote)
+      @db = db
+      @local = local
+      @remote = remote
+    end
+    
+    attr_accessor :db
+    attr_accessor :parent
+    attr_accessor :local
+    attr_accessor :remote
+    
+    protected
+    
+    attr_accessor :at0
+    attr_accessor :at1
+    attr_accessor :align
+    
+    def equal_array(a1,a2)
+      return false if a1.length != a2.length
+      begin
+        _g1 = 0
+        _g = a1.length
+        while(_g1 < _g) 
+          i = _g1
+          _g1+=1
+          return false if a1[i] != a2[i]
+        end
+      end
+      return true
+    end
+    
+    public
+    
+    def validate_schema 
+      all_cols1 = @local.get_column_names
+      all_cols2 = @remote.get_column_names
+      return false if !self.equal_array(all_cols1,all_cols2)
+      key_cols1 = @local.get_primary_key
+      key_cols2 = @remote.get_primary_key
+      return false if !self.equal_array(key_cols1,key_cols2)
+      return false if key_cols1.length == 0
+      return true
+    end
+    
+    protected
+    
+    def denull(x)
+      return -1 if x == nil
+      return x
+    end
+    
+    def link 
+      i0 = self.denull(@db.get(0))
+      i1 = self.denull(@db.get(1))
+      if i0 == -3 
+        i0 = @at0
+        @at0+=1
+      end
+      if i1 == -3 
+        i1 = @at1
+        @at1+=1
+      end
+      factor = nil
+      if i0 >= 0 && i1 >= 0 
+        factor = 2
+      else 
+        factor = 1
+      end
+      offset = factor - 1
+      if i0 >= 0 
+        _g1 = 0
+        _g = @local.get_width
+        while(_g1 < _g) 
+          x = _g1
+          _g1+=1
+          @local.set_cell_cache(x,i0,@db.get(2 + factor * x))
+        end
+      end
+      if i1 >= 0 
+        _g11 = 0
+        _g2 = @remote.get_width
+        while(_g11 < _g2) 
+          x1 = _g11
+          _g11+=1
+          @remote.set_cell_cache(x1,i1,@db.get(2 + factor * x1 + offset))
+        end
+      end
+      @align.link(i0,i1)
+      @align.add_to_order(i0,i1)
+    end
+    
+    def link_query(query,order)
+      if @db._begin(query,nil,order) 
+        while(@db.read) 
+          self.link
+        end
+        @db._end
+      end
+    end
+    
+    public
+    
+    def apply 
+      return nil if @db == nil
+      return nil if !self.validate_schema
+      rowid_name = @db.rowid
+      @align = ::Coopy::Alignment.new
+      key_cols = @local.get_primary_key
+      data_cols = @local.get_all_but_primary_key
+      all_cols = @local.get_column_names
+      @align.meta = ::Coopy::Alignment.new
+      begin
+        _g1 = 0
+        _g = all_cols.length
+        while(_g1 < _g) 
+          i = _g1
+          _g1+=1
+          @align.meta.link(i,i)
+        end
+      end
+      @align.meta.range(all_cols.length,all_cols.length)
+      @align.tables(@local,@remote)
+      @align.range(999,999)
+      sql_table1 = @local.get_quoted_table_name
+      sql_table2 = @remote.get_quoted_table_name
+      sql_key_cols = ""
+      begin
+        _g11 = 0
+        _g2 = key_cols.length
+        while(_g11 < _g2) 
+          i1 = _g11
+          _g11+=1
+          sql_key_cols += "," if i1 > 0
+          sql_key_cols += @local.get_quoted_column_name(key_cols[i1])
+        end
+      end
+      sql_all_cols = ""
+      begin
+        _g12 = 0
+        _g3 = all_cols.length
+        while(_g12 < _g3) 
+          i2 = _g12
+          _g12+=1
+          sql_all_cols += "," if i2 > 0
+          sql_all_cols += @local.get_quoted_column_name(all_cols[i2])
+        end
+      end
+      sql_key_match = ""
+      begin
+        _g13 = 0
+        _g4 = key_cols.length
+        while(_g13 < _g4) 
+          i3 = _g13
+          _g13+=1
+          sql_key_match += " AND " if i3 > 0
+          n = @local.get_quoted_column_name(key_cols[i3])
+          sql_key_match += _hx_str(sql_table1) + "." + _hx_str(n) + " IS " + _hx_str(sql_table2) + "." + _hx_str(n)
+        end
+      end
+      sql_data_mismatch = ""
+      begin
+        _g14 = 0
+        _g5 = data_cols.length
+        while(_g14 < _g5) 
+          i4 = _g14
+          _g14+=1
+          sql_data_mismatch += " OR " if i4 > 0
+          n1 = @local.get_quoted_column_name(data_cols[i4])
+          sql_data_mismatch += _hx_str(sql_table1) + "." + _hx_str(n1) + " IS NOT " + _hx_str(sql_table2) + "." + _hx_str(n1)
+        end
+      end
+      sql_dbl_cols = ""
+      dbl_cols = []
+      begin
+        _g15 = 0
+        _g6 = all_cols.length
+        while(_g15 < _g6) 
+          i5 = _g15
+          _g15+=1
+          sql_dbl_cols += "," if i5 > 0
+          n2 = @local.get_quoted_column_name(all_cols[i5])
+          buf = "__coopy_" + _hx_str(i5)
+          sql_dbl_cols += _hx_str(sql_table1) + "." + _hx_str(n2) + " AS " + _hx_str(buf)
+          dbl_cols.push(buf)
+          sql_dbl_cols += ","
+          sql_dbl_cols += _hx_str(sql_table2) + "." + _hx_str(n2) + " AS " + _hx_str(buf) + "b"
+          dbl_cols.push(_hx_str(buf) + "b")
+        end
+      end
+      sql_order = ""
+      begin
+        _g16 = 0
+        _g7 = key_cols.length
+        while(_g16 < _g7) 
+          i6 = _g16
+          _g16+=1
+          sql_order += "," if i6 > 0
+          n3 = @local.get_quoted_column_name(key_cols[i6])
+          sql_order += n3
+        end
+      end
+      sql_dbl_order = ""
+      begin
+        _g17 = 0
+        _g8 = key_cols.length
+        while(_g17 < _g8) 
+          i7 = _g17
+          _g17+=1
+          sql_dbl_order += "," if i7 > 0
+          n4 = @local.get_quoted_column_name(key_cols[i7])
+          sql_dbl_order += _hx_str(sql_table1) + "." + _hx_str(n4)
+        end
+      end
+      rowid = "-3"
+      rowid1 = "-3"
+      rowid2 = "-3"
+      if rowid_name != nil 
+        rowid = rowid_name
+        rowid1 = _hx_str(sql_table1) + "." + _hx_str(rowid_name)
+        rowid2 = _hx_str(sql_table2) + "." + _hx_str(rowid_name)
+      end
+      sql_inserts = "SELECT DISTINCT NULL, " + _hx_str(rowid) + " AS rowid, " + _hx_str(sql_all_cols) + " FROM " + _hx_str(sql_table2) + " WHERE NOT EXISTS (SELECT 1 FROM " + _hx_str(sql_table1) + " WHERE " + _hx_str(sql_key_match) + ")"
+      sql_inserts_order = ["NULL","rowid"].concat(all_cols)
+      sql_updates = "SELECT DISTINCT " + _hx_str(rowid1) + " AS __coopy_rowid0, " + _hx_str(rowid2) + " AS __coopy_rowid1, " + _hx_str(sql_dbl_cols) + " FROM " + _hx_str(sql_table1) + " INNER JOIN " + _hx_str(sql_table2) + " ON " + _hx_str(sql_key_match) + " WHERE " + _hx_str(sql_data_mismatch)
+      sql_updates_order = ["__coopy_rowid0","__coopy_rowid1"].concat(dbl_cols)
+      sql_deletes = "SELECT DISTINCT " + _hx_str(rowid) + " AS rowid, NULL, " + _hx_str(sql_all_cols) + " FROM " + _hx_str(sql_table1) + " WHERE NOT EXISTS (SELECT 1 FROM " + _hx_str(sql_table2) + " WHERE " + _hx_str(sql_key_match) + ")"
+      sql_deletes_order = ["rowid","NULL"].concat(all_cols)
+      @at0 = 1
+      @at1 = 1
+      self.link_query(sql_inserts,sql_inserts_order)
+      self.link_query(sql_updates,sql_updates_order)
+      self.link_query(sql_deletes,sql_deletes_order)
+      return @align
+    end
+    
+  haxe_me
+  end
+
+end