bc3 0.1.2 → 0.2.0

data/bin/bc3_db_compare.rb

@@ -0,0 +1,473 @@
+#!/usr/bin/env ruby
+=begin rdoc
+==What's for
+
+BC3 offers no genuine method to compare database content.
+
+This script is part of a solution to compare two tables in two databases
+(or different selections in one database...)
+
+==How to use
+Call
+  bc3_db-compare <configfile> <targetfile> [<logfile>]
+
+The configfile will be used to prepare a database connection and 
+a DB-selection. The result is written to targetfile.
+
+The optional logfile will get some logging data
+(can be used to analyse errors).
+
+==How to use in BC3
+Import the file formats from file examples/BCSettings_db4bc3.
+to Beyond Compare 3 (BC3)
+
+Save your two configuration files with extension bcpkg
+
+Compare your two configuration files.
+
+
+==How it works
+You can define file formats with conversion process.
+This script implement such a conversion for 
+database access.
+
+The file to compare contains a
+configuration to make a data base selection and
+build a result file.
+
+Two of this configuration files will be compared with BC3.
+BC3 calls this script as conversion tool,
+the data base selection is executed and a text file is the result.
+
+The configuration file defines the configuration in yaml-syntax.
+Details see DBconverter#check_configuration_file.
+
+The file formats can be imported from file examples/BCSettings_db4bc3.bcpkg
+
+This script based on a question in
+http://www.scootersoftware.com/vbulletin/showthread.php?t=7360
+=end
+
+=begin
+==Beyond Compare
+Beyond Compare is limited to comparison of plain text files.  To compare binary files, or to format files before comparison, Beyond Compare can call an external program to generate a temporary text file for comparison.  The following details the conversion process.
+
+To access settings for external conversion in the File Viewer, select Tools | Edit Current Rules.  Go to the Conversion tab.
+
+Variables for external conversion
+%s - source file and path
+%t - target file and path
+%n - source filename
+%x - extension of the source file
+=end
+require 'yaml'
+require 'sequel' 
+require 'log4r' 
+$log = Log4r::Logger.new('log')
+
+module BC3
+=begin rdoc
+Class to support comparison of database content.
+
+Define a converter for Beyond Compare 3.
+=end
+class DBconverter
+  VERSION = '0.2.0'
+  #Exitcodes
+  EXITCODES = {
+    # => 1 normal ruby errors (syntax error)
+    :sourcefile_missing => 2,
+    :configuration_error => 3,
+    :configuration_incomplete => 4,
+    
+    :db_connection_error => 10,
+    :adapter_unknown => 11,
+    :sequel_error => 12,
+    :db_table_missing => 20,
+    
+    :dataset_error => 30,
+    
+    :argv_wrong => 90,
+  } # File.open(__FILE__){|f| puts f.read.scan(/EXITCODES\[(.*)\]/) }; exit
+
+  
+  OBLIGATORY_KEYS = %w{adapter db tab}
+  VALID_KEYS = OBLIGATORY_KEYS + %w{
+      server password username
+      header schema 
+      data headline 
+      select filter order
+      sql
+      show_sql
+      }
+  
+=begin rdoc
+Expect a configuration file and a filename to save the result.
+
+Without target file name, an empty object is created.
+=end
+  def initialize( source_filename = nil, target_filename = nil, log_filename = nil )
+    if target_filename
+      
+      if log_filename
+        $log.outputters << Log4r::FileOutputter.new('log', :filename => log_filename ) 
+      end
+      
+      @header = true  #Default
+      
+      $log.info("Start conversion (%s)%s => %s" % [DBconverter::VERSION, source_filename, target_filename]) if $log.info?
+      #set attributes
+      $log.debug("Open %s" % source_filename) if $log.debug?
+      check_configuration_file(source_filename)
+      analyse_configuration_file(File.read(source_filename), File.dirname(source_filename))
+      
+      prepare_dataset()
+      save_target(target_filename)
+    end
+  end # initialize
+
+=begin rdoc
+Leave the script after an error.
+
+For unit test, this may be redefined to throw an exception or similar.
+=end
+  def bc3_exit( exitcode, description)
+      $log.error(description) if $log.error?
+      exit EXITCODES[exitcode]
+  end
+=begin rdoc
+Check existence of configuration file.
+=end
+  def check_configuration_file(filename)
+    if ! filename or ! File.exist?(filename)
+      bc3_exit(:sourcefile_missing, "Open %s" % filename.inspect)
+    end
+  end
+=begin rdoc
+Open and analyse configuration file
+
+==Examples for configuration  files
+Compare data of table 'languages' in sqlite data base file 'test.db' in a 
+csv-file.
+
+  adapter: sqlite
+  db: test.db
+  tab: languages
+  data: csv_tab
+
+
+
+==Obligatory configuration settings
+===adapter
+Defines the type of DB-connection.
+
+Supported:
+* ado (server required, username and password optional)
+* sqlite
+
+===db
+Name of the @db.
+
+* ado: name of the database.
+* sqlite: filename
+
+Warning! BC3 calls the script from bc3-folder.
+The filename should be an absolute path.
+
+===tab
+Table name for comparison.
+
+==Optional configuration settings
+===schema
+if true, the table schema (meta data of table) is added on top.
+
+==Adapt the selection
+
+===select
+Restrict columns.
+See Sequel::@dataset#select
+http://sequel.rubyforge.org/rdoc/classes/Sequel/@dataset.html#M000439
+
+===filter
+Where-clause. Restrict rows.
+See Sequel::@dataset#filter
+* http://sequel.rubyforge.org/rdoc/classes/Sequel/@dataset.html#M000412
+
+===order
+See Sequel::@dataset#order
+http://sequel.rubyforge.org/rdoc/classes/Sequel/@dataset.html#M000429
+
+List of column names.
+
+===sql
+You can define a sql-command.
+
+This sql-command will ignore all other selection commands (select, filter, order)
+
+=end
+  def analyse_configuration_file(configuration, dirname = nil)
+    
+    $log.debug("Analyse Configuration") if $log.debug?
+    options = {}
+    begin
+      options = YAML.load(configuration)
+    rescue ArgumentError => err
+      bc3_exit(:configuration_error, "Configuration file has error #{err}")
+    end
+    # check obligatory parameters
+    OBLIGATORY_KEYS.each{|opt|
+      if ! options[opt]
+        bc3_exit(:configuration_incomplete,"Option %s missing" % opt)
+      end
+    }
+    options.each{|key, value|
+      if ! VALID_KEYS.include?(key)
+        $log.warn("Undefined option %s" % key) if $log.warn?
+      end
+    }
+    
+    @dbname = options['db']
+    case @adapter = options['adapter']
+      when 'ado'
+          if ! @server = options['server']
+            bc3_exit(:db_connection_error, "No Server given" % @dbname)
+          end
+          if ! @dbname
+            bc3_exit(:db_connection_error, "No @db given" % @dbname)
+          end
+            @username = options['username'] #optional, not needed for all logins (single sign on...)
+            @password = options['password'] #optional, not needed for all logins (single sign on...)
+      when 'sqlite'
+        #set the path relative to configuration file
+        @dbname = File.join(dirname, @dbname) if dirname and ! File.exist?(@dbname)
+        if ! File.exist?(@dbname)
+          bc3_exit(:db_connection_error, "DB-File %s not found in %s" % [@dbname, Dir.pwd])
+        end
+    else
+      bc3_exit(:adapter_unknown, "Adapter %s not defined " % @adapter.inspect)
+    end
+    @tabsym = options['tab'].downcase.to_sym
+
+    @select = [options['select']].flatten if options['select']
+    @filter  = options['filter']
+    @order  = options['order']
+    @sql  = options['sql']
+
+    @header = options['header']  if options.has_key?('header') #add header (information about DB, table,,,)
+    @show_schema = options['schema']
+    @show_sql = options['show_sql']
+    @headline  = options['headline']  #add headline for csv
+    
+    case @show_data = options['data']
+      when nil  #no data required
+      when 'inspect', 'csv_tab'
+        $log.info("Define data conversion routine #{@show_data}") if $log.info?
+      else  
+        $log.error("Data conversion routine #{@show_data} not found") if $log.error?
+    end
+  end #analyse_configuration_file
+
+  #add header information
+  attr_accessor :header
+  #add heading data to csv
+  attr_accessor :headline
+  #(re)-define select-clause (what fields are needed)
+  attr_accessor :select
+  #(re)-define where-clause
+  attr_accessor :filter
+  #(re)-define order-clause
+  attr_accessor :order
+  #(re)-define raw sql -clause.
+  #This inactivates #select, #filter and #order
+  attr_writer :sql
+  
+=begin rdoc
+Connect DB
+=end
+  def connect()
+    $log.debug("Connect DB %s" % @dbname) if $log.debug?
+    begin
+      case @adapter
+        when 'ado'
+          @db = Sequel.connect(
+            :adapter=>'ado', 
+            :host     =>@server, 
+            :database=>@dbname, 
+            :user       => @username, 
+            :password=>@password 
+          )    
+        when 'sqlite'
+          @db = Sequel.sqlite(@dbname)
+        else
+          bc3_exit(:adapter_unknown, "Adapter %s not defined " % @adapter.inspect)
+      end #@adapter
+      #Test connection
+      if @db.test_connection
+        $log.info("Connected to DB %s" % @dbname) if $log.info?
+      else
+        bc3_exit(:db_connection_error, "DB-Connection error")
+      end
+    rescue Sequel::DatabaseError, Sequel::DatabaseConnectionError => err
+      bc3_exit(:sequel_error, "DB-Connection error: %s" % err.inspect)
+    end
+    @db
+  end #connect
+=begin rdoc
+Prepare @dataset.
+
+Defines only the accessor. 
+There is no check, if the data are correct.
+=end
+  def prepare_dataset(tabsym = @tabsym, select = @select, filter = @filter, order = @order )
+    @db = connect
+    
+    if ! tabsym
+      $log.error("No table name available") if $log.error?
+      return {}
+    elsif ! @db.table_exists?(tabsym)
+      bc3_exit(:db_table_missing, "DB error: Table #{tabsym} not defined")
+    end
+    
+    if @sql
+      $log.info("Use raw sql for dataset (#{@sql.inspect})") if $log.info?
+      return @dataset = @db.execute(@sql)
+    end
+    
+    @dataset = @db[tabsym]
+    if select
+      $log.debug("Restrict rows to #{select.inspect}") if $log.debug?
+      @select.each{|row|
+        $log.warn("Rows definition for filter is no symbol: #{row.inspect}") unless row.is_a?(Symbol)
+      }
+      @dataset = @dataset.select(*select)
+    end
+    if filter
+      $log.debug("Restrict columns to #{filter.inspect}") if $log.debug?
+      @dataset = @dataset.filter(filter)
+    end
+    if order
+      $log.debug("Order columns by #{order.inspect}") if $log.debug?
+      @dataset = @dataset.order(order)
+    end    
+    @dataset
+  end #prepare_dataset()
+=begin rdoc
+Build target file
+=end
+  def save_target(filename = @target_filename)
+    $log.info("Save %s" % [filename]) if $log.info?
+    File.open(filename, 'w'){|f|
+      f << build_target.join("\n")
+    }
+  end #save_target
+=begin rdoc
+Build content for target file
+=end
+  def build_target()
+
+      bc3_exit(:db_connection_error, "Database missing (forgot #prepare_dataset ?)") unless @db
+
+      txt = []
+      if @header
+        txt <<  "Check table %s.%s" % [@dbname, @tabsym]
+      end
+
+      
+      if ! @db.table_exists?(@tabsym)
+        txt <<  "Table #{@tabsym} not found"
+        bc3_exit(:db_table_missing, "Table #{@tabsym} not found")
+      end
+
+=begin
+Add schema of table.
+=end
+      if @show_schema
+        $log.debug("Get table schema #{@tabsym}") if $log.debug?
+        txt <<  "Table schema #{@tabsym}" if @header
+        txt <<  @db.schema(@tabsym).to_yaml
+      end
+
+=begin
+Add SQL 
+=end
+      if @show_sql
+        $log.debug("Write SQL-command (%s)" % (@sql ? 'raw sql' : 'dataset')) if $log.debug?
+        
+        txt <<  "SQL for selection:" if @header
+        txt <<  ( @sql ? @sql : @dataset.sql )
+      end
+
+=begin
+Check table content/get content.
+
+Only, when options['data'] is set.
+=end
+      if @show_data
+        $log.debug("Get data from #{@tabsym}") if $log.debug?
+        txt <<  "Data content of table #{@tabsym}:" if @header
+        
+        first_line = true
+        @dataset.each{|line|
+          case @show_data
+            when 'inspect'
+              txt <<  line.inspect
+            when 'csv_tab'
+              case line
+                when Array  #@sql defined
+                txt << line.join("\t")
+                when Hash #Sequel::Dataset
+                  if first_line and @headline
+                    txt << @dataset.columns.map{|x|x.to_s}.join("\t") 
+                  end
+                  txt << build_csv_line(line, "\t")
+                else
+                  bc3_exit(:dataset_error , "Type of dataset is undefined #{line.inspect}")
+              end #case line
+            else  
+              $log.error("Data conversion routine #{@show_data} not found") if $log.error?
+              txt <<  "Data conversion routine #{@show_data} not found"
+          end
+          first_line = false
+        } 
+      else#ok, maybe you only want to compare the scheme.
+        $log.info("No data output") if $log.debug?  
+      end
+    txt
+  end #build_target
+=begin rdoc
+Build one character separated value-line.
+=end
+  def build_csv_line(line, sep, dataset = @dataset)
+    vals = []
+    dataset.columns.each{|col|
+      if line[col].respond_to?(:include?) and line[col].include?(sep)
+        $log.warn("Data contain separator #{sep} (#{line[col]})") if $log.warn?
+        vals <<  "\"#{line[col]}\""
+      else
+        vals <<  line[col].to_s
+      end
+      
+    }
+    vals.join(sep)
+  end
+end #class  DBconverter
+end #module BC3
+
+
+$log.outputters = Log4r::StdoutOutputter.new('log', :level => Log4r::WARN)
+
+$log.info("Start %s V%s" % [__FILE__, BC3::DBconverter::VERSION]) if $log.info?
+if $log.debug?
+  $log.debug("  Parameters: %s" % ARGV.inspect) 
+  $log.debug("  We are in: %s" % Dir.pwd)
+end
+
+
+if ARGV.empty?
+  $log.error("Testcase ARGV empty") 
+  #~ $log.outputters = Log4r::StdoutOutputter.new('log', :level => Log4r::DEBUG)
+  #~ conv = DBconverter.new('../unittest/test_sql.db4bc3', 'xx')
+  exit BC3::DBconverter::EXITCODES[:argv_wrong]
+else
+  conv = BC3::DBconverter.new(*ARGV)
+end unless defined? SKIP_AUTOSTART

data/changes.rd

@@ -8,12 +8,15 @@
 * Changed BC3::Snapshot.newd -> BC3::Snapshot.new_filesystem (newd as alias)
 * BC3::Snapshot.save saves yaml or bcss file
 * bin/bc_merge.rb can handle yaml-files
+
 ==0.1.2 2011-02-20
 * BC3::SnapshotParse: Support UTF for linux files
 * BC3::Snapshot#utf: Added flag. Allows creation of Linux-UTF-snapshots.
 * BC3::Snapshot: Support UTF for linux files (Snapshot uses UTF-8).
 * BC3::Snapshot.uncompress: Added
 
+==0.2.0 2011-04-08
+* Add bc3_db_compare.rb
 
 
 =Known problems/Todos

data/examples_db_connect/sqlite_test_1.db4bc3

@@ -0,0 +1,6 @@
+  adapter: sqlite
+  db: ./test.db
+  tab: languages 
+  show_sql: true
+  headline: true
+  data: csv_tab

data/examples_db_connect/sqlite_test_2.db4bc3

@@ -0,0 +1,8 @@
+  adapter: sqlite
+  db: ./test.db
+  tab: languages
+  show_sql: true
+  data: csv_tab
+  headline: true
+  filter: 
+    - :key: [ 1, 2, 3, 4, 5, 6, 7, 8 ]

data/examples_db_connect/sqlite_test_sql.db4bc3

@@ -0,0 +1,11 @@
+  adapter: sqlite
+  db: ./test.db
+  tab: languages
+  data: csv_tab
+  show_sql: true
+  sql: |
+    SELECT * FROM `languages` 
+    WHERE ((`key` IN (1, 2, 3, 4, 6, 7, 8)))
+  headline: true
+  filter: 
+    - :key: [ 1, 2, 3, 4, 5, 6, 7, 8 ]

data/lib/bc3.rb

@@ -85,7 +85,7 @@ require 'bc3/time'
 require 'bc3/parse'
 
 module BC3
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end
 
 __END__

data/lib/bc3/time.rb

@@ -1 +1 @@
-=begin rdoc
  bignum too big to convert into `unsigned long' (RangeError)
  AD_EPOCH      = 116_444_736_000_000_000
  AD_MULTIPLIER = 10_000_000
  # convert a Time object to AD's epoch
  def time2ad()
    (self.to_f * AD_MULTIPLIER) + AD_EPOCH
  end
  # convert from AD's time string to a Time object
  def self.ad2time(time)
    Time.at((time.to_f - AD_EPOCH) / AD_MULTIPLIER)
  end
+=begin rdoc
  bignum too big to convert into `unsigned long' (RangeError)
  AD_EPOCH      = 116_444_736_000_000_000
  AD_MULTIPLIER = 10_000_000
  # convert a Time object to AD's epoch
  def time2ad()
    (self.to_f * AD_MULTIPLIER) + AD_EPOCH
  end
  # convert from AD's time string to a Time object
  def self.ad2time(time)
    Time.at((time.to_f - AD_EPOCH) / AD_MULTIPLIER)
  end

data/unittest/unittest_bc3_db_compare.rb

@@ -0,0 +1,310 @@
+=begin 
+This tests need sqlite3.
+
+Details see 
+* http://www.sqlite.org/
+* http://rubygems.org/gems/sqlite3
+
+=end
+gem 'test-unit'
+require 'test/unit' 
+
+$:.unshift('../bin')
+SKIP_AUTOSTART = true #avoid ARGV-interpretation 
+require 'bc3_db_compare.rb' 
+
+#~ $log.level = Log4r::FATAL
+TESTDB = 'test.db'
+TESTDATA = [
+  {:lc2=>"af", :lc3=>"afr", :name_en=>"Afrikaans", :iso8859=>"ISO8859_1"},
+  {:lc2=>"ar", :lc3=>"ara", :name_en=>"Arabic", :iso8859=>nil},
+  {:lc2=>"bg", :lc3=>"bul", :name_en=>"Bulgarian", :iso8859=>"ISO8859_5"},
+  {:lc2=>"br", :lc3=>"por", :name_en=>"Portuguese braz.", :iso8859=>"ISO8859_1"},
+  {:lc2=>"de", :lc3=>"deu", :name_en=>"German", :iso8859=>"ISO8859_1"},
+  {:lc2=>"en", :lc3=>"eng", :name_en=>"English", :iso8859=>"ISO8859_1"},
+  {:lc2=>"es", :lc3=>"spa", :name_en=>"Spanish", :iso8859=>"ISO8859_1"},
+  {:lc2=>"et", :lc3=>"est", :name_en=>"Estonian", :iso8859=>"ISO8859_4"},
+  {:lc2=>"fi", :lc3=>"fin", :name_en=>"Finnish", :iso8859=>"ISO8859_1"},
+  {:lc2=>"pt", :lc3=>"por", :name_en=>"Portuguese", :iso8859=>"ISO8859_1"},
+]
+def build_testdata()
+  if ! File.exist?(TESTDB)
+    db = Sequel.sqlite(TESTDB)
+    db.create_table :languages do
+      primary_key :key
+      column :lc2, :string, :max_chars => 2
+      column :lc3, :string
+      column :name_en, :string
+      column :iso8859, :string
+    end
+    TESTDATA.each{|ds| db[:languages].insert(ds)}      
+  end
+end
+
+
+class BC3::DBconverter
+  #Build excetions as replacement for exit
+  EXCEPTIONS = {}
+  EXITCODES.each{|key, value|
+      eval <<-xx
+          EXCEPTIONS[#{key.inspect}] = Error_#{key} =  Class.new(SystemExit)
+        xx
+  }
+=begin rdoc
+For unit test, this must be redefined,
+else the test is finished.
+=end
+  def bc3_exit( exitcode, description)
+      #~ $log.error(description) if $log.error?
+      #~ exit EXITCODES[exitcode]
+      raise EXCEPTIONS[exitcode], description
+  end  
+end #class BC3::DBconverter
+  
+class Test_configuration < Test::Unit::TestCase
+=begin
+Build some test data with sqlite
+=end
+  def self.startup
+    build_testdata
+  end #self.startup
+  def setup()
+    @bc3 = BC3::DBconverter.new()
+  end
+  def test_configuration()
+    #Invalid yaml-data
+    assert_raise(BC3::DBconverter::Error_configuration_error){
+                            @bc3.analyse_configuration_file("- 1\na")
+                        }
+    
+    assert_raise(BC3::DBconverter::Error_configuration_incomplete){
+                            @bc3.analyse_configuration_file('xx')
+                        }
+    #adapter, tab and db must be defined.
+    assert_raise(BC3::DBconverter::Error_configuration_incomplete){
+                            @bc3.analyse_configuration_file(<<-config
+                                        adapter: undefined_adapter
+                                        db: undefined_db
+                                      config
+                                        )
+                      }
+    assert_raise(BC3::DBconverter::Error_adapter_unknown){
+                            @bc3.analyse_configuration_file(<<-config
+                                        adapter: undefined_adapter
+                                        db: undefined_db
+                                        tab: xx
+                                      config
+                                        )
+                        }
+  end #test_configuration()
+  def test_configuration_ado()
+    assert_nothing_raised(){
+                            @bc3.analyse_configuration_file(<<-config
+                                        adapter: ado
+                                        db: undefined_db
+                                        tab: xx
+                                        server: xx
+                                      config
+                                        )
+                        }
+    assert_raise(BC3::DBconverter::Error_db_connection_error, 'Server missing'){
+                            @bc3.analyse_configuration_file(<<-config
+                                        adapter: ado
+                                        db: undefined_db
+                                        tab: xx
+                                      config
+                                        )
+                        }    
+  end
+                      
+  def test_configuration_sqlite()
+    assert_nothing_raised(){
+                            @bc3.analyse_configuration_file(<<-config
+                                        adapter: sqlite
+                                        db: #{TESTDB}
+                                        tab: languages
+                                      config
+                                        )
+                        }
+    assert_raise(BC3::DBconverter::Error_configuration_incomplete, 'filename missing'){
+                            @bc3.analyse_configuration_file(<<-config
+                                        adapter: sqlite
+                                        tab: xx
+                                      config
+                                        )
+                        }    
+    assert_raise(BC3::DBconverter::Error_db_connection_error, 'filename wrong'){
+                            @bc3.analyse_configuration_file(<<-config
+                                        adapter: sqlite
+                                        db: undefined_db
+                                        tab: xx
+                                      config
+                                        )
+                        }    
+    assert_nothing_raised(){
+                            @bc3.analyse_configuration_file(<<-config
+                                        adapter: sqlite
+                                        db: #{TESTDB}
+                                        tab: xx_languages
+                                      config
+                                        )
+                        }  
+    #Test table xx_languages
+    assert_raise(BC3::DBconverter::Error_db_table_missing, 'table not defined'){
+                            @bc3.prepare_dataset()
+                        }
+    end
+end
+
+class Test_testdata_sqlite < Test::Unit::TestCase
+  def self.startup
+    build_testdata
+  end #self.startup
+  def setup()
+    @bc3 = BC3::DBconverter.new()
+    @bc3.analyse_configuration_file(<<-config
+                            adapter: sqlite
+                            db: #{TESTDB}
+                            tab: languages
+                          config
+                        )
+  end
+  def test_dataset()
+    assert_instance_of(Sequel::SQLite::Dataset, @bc3.prepare_dataset())
+    assert_equal("SELECT * FROM `languages`", @bc3.prepare_dataset.sql)
+    assert_equal([], @bc3.build_target())
+    @bc3.header = true
+    assert_equal(["Check table test.db.languages"], @bc3.build_target())
+  end
+end
+
+class Test_testdata_sqlite_inspect < Test::Unit::TestCase
+  def self.startup
+    build_testdata
+  end #self.startup
+  def setup()
+    @bc3 = BC3::DBconverter.new()
+    @bc3.analyse_configuration_file(<<-config
+                            adapter: sqlite
+                            db: #{TESTDB}
+                            tab: languages
+                            data: inspect
+                          config
+                        )
+  end
+  def test_dataset()
+    assert_instance_of(Sequel::SQLite::Dataset, @bc3.prepare_dataset())
+    assert_equal("SELECT * FROM `languages`", @bc3.prepare_dataset.sql)
+    assert_equal("{:key=>1, :lc2=>\"af\", :lc3=>\"afr\", :name_en=>\"Afrikaans\", :iso8859=>\"ISO8859_1\"}\n{:key=>2, :lc2=>\"ar\", :lc3=>\"ara\", :name_en=>\"Arabic\", :iso8859=>nil}\n{:key=>3, :lc2=>\"bg\", :lc3=>\"bul\", :name_en=>\"Bulgarian\", :iso8859=>\"ISO8859_5\"}\n{:key=>4, :lc2=>\"br\", :lc3=>\"por\", :name_en=>\"Portuguese braz.\", :iso8859=>\"ISO8859_1\"}\n{:key=>5, :lc2=>\"de\", :lc3=>\"deu\", :name_en=>\"German\", :iso8859=>\"ISO8859_1\"}\n{:key=>6, :lc2=>\"en\", :lc3=>\"eng\", :name_en=>\"English\", :iso8859=>\"ISO8859_1\"}\n{:key=>7, :lc2=>\"es\", :lc3=>\"spa\", :name_en=>\"Spanish\", :iso8859=>\"ISO8859_1\"}\n{:key=>8, :lc2=>\"et\", :lc3=>\"est\", :name_en=>\"Estonian\", :iso8859=>\"ISO8859_4\"}\n{:key=>9, :lc2=>\"fi\", :lc3=>\"fin\", :name_en=>\"Finnish\", :iso8859=>\"ISO8859_1\"}\n{:key=>10, :lc2=>\"pt\", :lc3=>\"por\", :name_en=>\"Portuguese\", :iso8859=>\"ISO8859_1\"}",
+                      @bc3.build_target.join("\n")
+                      )
+  end
+end
+
+class Test_testdata_sqlite_csv_tab < Test::Unit::TestCase
+  def self.startup
+    build_testdata
+  end #self.startup
+  def setup()
+    @bc3 = BC3::DBconverter.new()
+    @bc3.analyse_configuration_file(<<-config
+                            adapter: sqlite
+                            db: #{TESTDB}
+                            tab: languages
+                            data: csv_tab
+                          config
+                        )
+  end
+  def test_dataset()
+    assert_instance_of(Sequel::SQLite::Dataset, @bc3.prepare_dataset())
+    assert_equal("SELECT * FROM `languages`", @bc3.prepare_dataset.sql)
+    assert_equal(%{1	af	afr	Afrikaans	ISO8859_1
+2	ar	ara	Arabic	
+3	bg	bul	Bulgarian	ISO8859_5
+4	br	por	Portuguese braz.	ISO8859_1
+5	de	deu	German	ISO8859_1
+6	en	eng	English	ISO8859_1
+7	es	spa	Spanish	ISO8859_1
+8	et	est	Estonian	ISO8859_4
+9	fi	fin	Finnish	ISO8859_1
+10	pt	por	Portuguese	ISO8859_1},
+                      @bc3.build_target.join("\n")
+                      )
+  end
+  def test_dataset_headline()
+    @bc3.headline = true
+    assert_equal("SELECT * FROM `languages`", @bc3.prepare_dataset.sql)
+    assert_equal(%{key	lc2	lc3	name_en	iso8859
+1	af	afr	Afrikaans	ISO8859_1
+2	ar	ara	Arabic	
+3	bg	bul	Bulgarian	ISO8859_5
+4	br	por	Portuguese braz.	ISO8859_1
+5	de	deu	German	ISO8859_1
+6	en	eng	English	ISO8859_1
+7	es	spa	Spanish	ISO8859_1
+8	et	est	Estonian	ISO8859_4
+9	fi	fin	Finnish	ISO8859_1
+10	pt	por	Portuguese	ISO8859_1},
+                      @bc3.build_target.join("\n")
+                      )
+  end
+  def test_dataset_filter()
+    @bc3.filter = {:key => [1,2] }
+    assert_equal("SELECT * FROM `languages` WHERE (`key` IN (1, 2))", @bc3.prepare_dataset.sql)
+    assert_equal(%{1	af	afr	Afrikaans	ISO8859_1
+2	ar	ara	Arabic\t},
+                      @bc3.build_target.join("\n")
+                      )
+    @bc3.filter = nil #reset filter
+  end
+  def test_dataset_select()
+    @bc3.select = [:lc2, :lc3]
+    assert_equal("SELECT `lc2`, `lc3` FROM `languages`", @bc3.prepare_dataset.sql)
+    assert_equal(%{af	afr
+ar	ara
+bg	bul
+br	por
+de	deu
+en	eng
+es	spa
+et	est
+fi	fin
+pt	por},
+                      @bc3.build_target.join("\n")
+                      )
+    @bc3.select = nil #reset filter
+  end
+  def test_dataset_order()
+    @bc3.order = [:name_en]
+    assert_equal("SELECT * FROM `languages` ORDER BY (`name_en`)", @bc3.prepare_dataset.sql)
+    #~ puts @bc3.build_target.join("\n")
+    assert_equal(%{1	af	afr	Afrikaans	ISO8859_1
+2	ar	ara	Arabic	
+3	bg	bul	Bulgarian	ISO8859_5
+6	en	eng	English	ISO8859_1
+8	et	est	Estonian	ISO8859_4
+9	fi	fin	Finnish	ISO8859_1
+5	de	deu	German	ISO8859_1
+10	pt	por	Portuguese	ISO8859_1
+4	br	por	Portuguese braz.	ISO8859_1
+7	es	spa	Spanish	ISO8859_1},
+                      @bc3.build_target.join("\n")
+                      )
+    @bc3.order = nil #reset filter
+  end
+  def test_dataset_sql()
+    @bc3.sql = "SELECT * FROM `languages` WHERE (`key` IN (1, 2))"
+    #exception before @bc3.prepare_dataset
+    assert_raise(BC3::DBconverter::Error_db_connection_error){@bc3.build_target}    
+    assert_instance_of(SQLite3::ResultSet, @bc3.prepare_dataset)
+    assert_equal(%w{key lc2 lc3 name_en iso8859}, @bc3.prepare_dataset.columns)
+    
+    assert_equal(%{1	af	afr	Afrikaans	ISO8859_1
+2	ar	ara	Arabic\t},
+                      @bc3.build_target.join("\n")
+                      )
+    @bc3.sql = nil #reset sql
+  end
+end
+
+__END__

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bc3
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Knut Lickert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-20 00:00:00 +01:00
+date: 2011-04-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,34 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: sequel
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: |
   Build and analyse Beyond Compare (BC3) Snapshot-Files.
   This gem allows flexible definition of BC3-snapshots and
@@ -43,6 +71,7 @@ email: knut@lickert.net
 executables: 
 - bc3_merge.rb
 - bc3_search.rb
+- bc3_db_compare.rb
 extensions: []
 
 extra_rdoc_files: 
@@ -50,11 +79,13 @@ extra_rdoc_files:
 - changes.rd
 - bin/bc3_merge.rb
 - bin/bc3_search.rb
+- bin/bc3_db_compare.rb
 files: 
 - changes.rd
 - BCSS_Binary_Format.txt
 - bin/bc3_merge.rb
 - bin/bc3_search.rb
+- bin/bc3_db_compare.rb
 - lib/bc3.rb
 - lib/bc3/file.rb
 - lib/bc3/folder.rb
@@ -77,6 +108,11 @@ files:
 - examples/scootersoftware/UnicodePath(Linux).bcss
 - examples/scootersoftware/UnicodeFilenames(Win32).bcss
 - examples/scootersoftware/UnicodePath(Win32).bcss
+- examples_db_connect/BCSettings_db4bc3.bcpkg
+- examples_db_connect/sqlite_test_1.db4bc3
+- examples_db_connect/sqlite_test_2.db4bc3
+- examples_db_connect/sqlite_test_sql.db4bc3
+- examples_db_connect/test.db
 - unittest/unittest_bc3_helper.rb
 - unittest/unittest_bc3_time.rb
 - unittest/unittest_bc3_file.rb
@@ -84,6 +120,7 @@ files:
 - unittest/unittest_bc3_snapshot.rb
 - unittest/unittest_bc3_merge.rb
 - unittest/unittest_bc3_search.rb
+- unittest/unittest_bc3_db_compare.rb
 has_rdoc: true
 homepage: http://gems.rubypla.net/bc3
 licenses: []
@@ -114,6 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: 
 - Beyond Compare, see http://www.scootersoftware.com
+- sequel for bc3_db_compare.rb
 rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
@@ -127,3 +165,4 @@ test_files:
 - unittest/unittest_bc3_snapshot.rb
 - unittest/unittest_bc3_merge.rb
 - unittest/unittest_bc3_search.rb
+- unittest/unittest_bc3_db_compare.rb