daff 1.2.3 → 1.2.4

data/lib/lib/coopy/sql_database.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class SqlDatabase 
+    def getColumns(name) puts "Abstract SqlDatabase.getColumns called" end
+    def getQuotedTableName(name) puts "Abstract SqlDatabase.getQuotedTableName called" end
+    def getQuotedColumnName(name) puts "Abstract SqlDatabase.getQuotedColumnName called" end
+    def begin(query,args = nil,order = nil) puts "Abstract SqlDatabase.begin called" end
+    def beginRow(name,row,order = nil) puts "Abstract SqlDatabase.beginRow called" end
+    def read() puts "Abstract SqlDatabase.read called" end
+    def get(index) puts "Abstract SqlDatabase.get called" end
+    def end() puts "Abstract SqlDatabase.end called" end
+    def width() puts "Abstract SqlDatabase.width called" end
+    def rowid() puts "Abstract SqlDatabase.rowid called" end
+  haxe_me
+  end
+
+end

data/lib/lib/coopy/sql_helper.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class SqlHelper 
+    def getTableNames(db) puts "Abstract SqlHelper.getTableNames called" end
+    def countRows(db,name) puts "Abstract SqlHelper.countRows called" end
+    def getRowIDs(db,name) puts "Abstract SqlHelper.getRowIDs called" end
+  haxe_me
+  end
+
+end

data/lib/lib/coopy/sql_table.rb

@@ -0,0 +1,216 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class SqlTable 
+    
+    def initialize(db,name,helper = nil)
+      @db = db
+      @name = name
+      @helper = helper
+      @cache = {}
+      @h = -1
+      @id2rid = nil
+      self.get_columns
+    end
+    
+    protected
+    
+    attr_accessor :db
+    attr_accessor :columns
+    attr_accessor :name
+    attr_accessor :quoted_table_name
+    attr_accessor :cache
+    attr_accessor :column_names
+    attr_accessor :h
+    attr_accessor :helper
+    attr_accessor :id2rid
+    
+    def get_columns 
+      return if @columns != nil
+      return if @db == nil
+      @columns = @db.get_columns(@name)
+      @column_names = Array.new
+      begin
+        _g = 0
+        _g1 = @columns
+        while(_g < _g1.length) 
+          col = _g1[_g]
+          _g+=1
+          @column_names.push(col.get_name)
+        end
+      end
+    end
+    
+    public
+    
+    def get_primary_key 
+      self.get_columns
+      result = Array.new
+      begin
+        _g = 0
+        _g1 = @columns
+        while(_g < _g1.length) 
+          col = _g1[_g]
+          _g+=1
+          next if !col.is_primary_key
+          result.push(col.get_name)
+        end
+      end
+      return result
+    end
+    
+    def get_all_but_primary_key 
+      self.get_columns
+      result = Array.new
+      begin
+        _g = 0
+        _g1 = @columns
+        while(_g < _g1.length) 
+          col = _g1[_g]
+          _g+=1
+          next if col.is_primary_key
+          result.push(col.get_name)
+        end
+      end
+      return result
+    end
+    
+    def get_column_names 
+      self.get_columns
+      return @column_names
+    end
+    
+    def get_quoted_table_name 
+      return @quoted_table_name if @quoted_table_name != nil
+      @quoted_table_name = @db.get_quoted_table_name(@name)
+      return @quoted_table_name
+    end
+    
+    def get_quoted_column_name(name)
+      return @db.get_quoted_column_name(name)
+    end
+    
+    def get_cell(x,y)
+      if @h >= 0 
+        y = y - 1
+        y = @id2rid[y] if y >= 0
+      end
+      if y < 0 
+        self.get_columns
+        return @columns[x].name
+      end
+      row = @cache[y]
+      if row == nil 
+        row = {}
+        self.get_columns
+        @db.begin_row(@name,y,@column_names)
+        while(@db.read) 
+          _g1 = 0
+          _g = self.get_width
+          while(_g1 < _g) 
+            i = _g1
+            _g1+=1
+            begin
+              v = @db.get(i)
+              begin
+                value = v
+                row[i] = value
+              end
+              v
+            end
+          end
+        end
+        @db._end
+        begin
+          @cache[y] = row
+          row
+        end
+      end
+      begin
+        this1 = @cache[y]
+        return this1.get(x)
+      end
+    end
+    
+    def set_cell_cache(x,y,c)
+      row = @cache[y]
+      if row == nil 
+        row = {}
+        self.get_columns
+        begin
+          @cache[y] = row
+          row
+        end
+      end
+      begin
+        v = c
+        begin
+          value = v
+          row[x] = value
+        end
+        v
+      end
+    end
+    
+    def set_cell(x,y,c)
+      puts "SqlTable cannot set cells yet"
+    end
+    
+    def get_cell_view 
+      return ::Coopy::SimpleView.new
+    end
+    
+    def is_resizable 
+      return false
+    end
+    
+    def resize(w,h)
+      return false
+    end
+    
+    def clear 
+    end
+    
+    def insert_or_delete_rows(fate,hfate)
+      return false
+    end
+    
+    def insert_or_delete_columns(fate,wfate)
+      return false
+    end
+    
+    def trim_blank 
+      return false
+    end
+    
+    def height() get_height end
+    def height=(__v) @height = __v end
+    def width() get_width end
+    def width=(__v) @width = __v end
+    
+    def get_width 
+      self.get_columns
+      return @columns.length
+    end
+    
+    def get_height 
+      return @h if @h >= 0
+      return -1 if @helper == nil
+      @id2rid = @helper.get_row_ids(@db,@name)
+      @h = @id2rid.length + 1
+      return @h
+    end
+    
+    def get_data 
+      return nil
+    end
+    
+    def clone 
+      return nil
+    end
+    
+  haxe_me
+  end
+
+end

data/lib/lib/coopy/sql_table_name.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class SqlTableName 
+    
+    def initialize(name = "",prefix = "")
+      @name = name
+      @prefix = prefix
+    end
+    
+    attr_accessor :name
+    attr_accessor :prefix
+    
+    def to_s 
+      return @name if @prefix == ""
+      return _hx_str(@prefix) + "." + _hx_str(@name)
+    end
+    
+  haxe_me
+  end
+
+end

data/lib/lib/coopy/sqlite_helper.rb

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module Coopy
+  class SqliteHelper 
+    
+    def initialize
+    end
+    
+    def get_table_names(db)
+      q = "SELECT name FROM sqlite_master WHERE type='table' ORDER BY name"
+      return nil if !db._begin(q,nil,["name"])
+      names = Array.new
+      while(db.read) 
+        names.push(db.get(0))
+      end
+      db._end
+      return names
+    end
+    
+    def count_rows(db,name)
+      q = "SELECT COUNT(*) AS ct FROM " + _hx_str(db.get_quoted_table_name(name))
+      return -1 if !db._begin(q,nil,["ct"])
+      ct = -1
+      while(db.read) 
+        ct = db.get(0)
+      end
+      db._end
+      return ct
+    end
+    
+    def get_row_ids(db,name)
+      result = Array.new
+      q = "SELECT ROWID AS r FROM " + _hx_str(db.get_quoted_table_name(name)) + " ORDER BY ROWID"
+      return nil if !db._begin(q,nil,["r"])
+      while(db.read) 
+        c = db.get(0)
+        result.push(c)
+      end
+      db._end
+      return result
+    end
+    
+  haxe_me
+  end
+
+end

data/lib/lib/coopy/table_diff.rb

@@ -89,7 +89,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
     
@@ -216,7 +216,13 @@ module Coopy
     
     def hilite(output)
       return false if !output.is_resizable
-      @builder = ::Coopy::FlatCellBuilder.new if @builder == nil
+      if @builder == nil 
+        if @flags.allow_nested_cells 
+          @builder = ::Coopy::NestedCellBuilder.new
+        else 
+          @builder = ::Coopy::FlatCellBuilder.new
+        end
+      end
       output.resize(0,0)
       output.clear
       row_map = {}
@@ -453,9 +459,9 @@ module Coopy
             _g110+=1
             cunit2 = column_units[j3]
             if cunit2.r >= 0 
-              output.set_cell(j3 + 1,at1,b.get_cell(cunit2.r,rb_header)) if b.get_height > 0
+              output.set_cell(j3 + 1,at1,b.get_cell(cunit2.r,rb_header)) if b.get_height != 0
             elsif cunit2.lp >= 0 
-              output.set_cell(j3 + 1,at1,p.get_cell(cunit2.lp,rp_header)) if p.get_height > 0
+              output.set_cell(j3 + 1,at1,p.get_cell(cunit2.lp,rp_header)) if p.get_height != 0
             end
             col_map[j3 + 1] = cunit2
           end
@@ -698,7 +704,10 @@ module Coopy
             i7 = _g114
             _g114+=1
             unit2 = row_map[i7]
-            next if unit2 == nil
+            if unit2 == nil 
+              output.set_cell(0,i7,"")
+              next
+            end
             output.set_cell(0,i7,@builder.links(unit2))
           end
         end
@@ -720,7 +729,10 @@ module Coopy
             i9 = _g116
             _g116+=1
             unit3 = col_map[i9 - 1]
-            next if unit3 == nil
+            if unit3 == nil 
+              output.set_cell(i9,0,"")
+              next
+            end
             output.set_cell(i9,0,@builder.links(unit3))
           end
         end

data/lib/lib/coopy/table_io.rb

@@ -32,6 +32,7 @@ module Coopy
       begin
         return HxSys.command(cmd,args)
       rescue => e
+        e = hx_rescued(e)
         return 1
       end
     end
@@ -44,6 +45,10 @@ module Coopy
       return File.exist?(path)
     end
     
+    def open_sqlite_database(path)
+      return nil
+    end
+    
   haxe_me
   end
 

data/lib/lib/coopy/terminal_diff_render.rb

@@ -11,7 +11,7 @@ module Coopy
     protected
     
     attr_accessor :codes
-    attr_accessor :tt
+    attr_accessor :t
     attr_accessor :csv
     attr_accessor :v
     attr_accessor :align_columns
@@ -28,8 +28,8 @@ module Coopy
       w = t.get_width
       h = t.get_height
       txt = ""
+      @t = t
       @v = t.get_cell_view
-      @tt = ::Coopy::TableText.new(t)
       @codes = {}
       @codes["header"] = "\x1B[0;1m"
       @codes["spec"] = "\x1B[35;1m"
@@ -70,7 +70,8 @@ module Coopy
           txt += "\r\n"
         end
       end
-      @tt = nil
+      @t = nil
+      @v = nil
       @csv = nil
       @codes = nil
       return txt
@@ -79,9 +80,8 @@ module Coopy
     protected
     
     def get_text(x,y,color)
-      val = @tt.get_cell_text(x,y)
-      val = "" if val == nil
-      cell = ::Coopy::DiffRender.render_cell(@tt,x,y)
+      val = @t.get_cell(x,y)
+      cell = ::Coopy::DiffRender.render_cell(@t,@v,x,y)
       if color 
         code = nil
         code = @codes[cell.category] if cell.category != nil
@@ -92,10 +92,10 @@ module Coopy
         if code != nil 
           if cell.rvalue != nil 
             val = _hx_str(@codes["remove"]) + _hx_str(cell.lvalue) + _hx_str(@codes["modify"]) + _hx_str(cell.pretty_separator) + _hx_str(@codes["add"]) + _hx_str(cell.rvalue) + _hx_str(@codes["done"])
-            val = _hx_str(@codes["conflict"]) + _hx_str(cell.pvalue) + _hx_str(@codes["modify"]) + _hx_str(cell.pretty_separator) + _hx_str(val) if cell.pvalue != nil
+            val = _hx_str(@codes["conflict"]) + _hx_str(cell.pvalue) + _hx_str(@codes["modify"]) + _hx_str(cell.pretty_separator) + _hx_str(val.to_s) if cell.pvalue != nil
           else 
             val = cell.pretty_value
-            val = _hx_str(code) + _hx_str(val) + _hx_str(@codes["done"])
+            val = _hx_str(code) + _hx_str(val.to_s) + _hx_str(@codes["done"])
           end
         end
       else 
@@ -108,7 +108,6 @@ module Coopy
       w = t.get_width
       h = t.get_height
       v = t.get_cell_view
-      tt = ::Coopy::TableText.new(t)
       csv = ::Coopy::Csv.new
       sizes = Array.new
       row = -1