flattendb 0.0.3.242 → 0.0.4

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to flattendb version 0.0.3
+This documentation refers to flattendb version 0.0.4
 
 
 == DESCRIPTION
@@ -10,6 +10,15 @@ This documentation refers to flattendb version 0.0.3
 TODO: well, the description... ;-)
 
 
+== LINKS
+
+<b></b>
+Documentation::     <http://prometheus.rubyforge.org/flattendb>
+Source code (old):: <http://prometheus.rubyforge.org/svn/scratch/flattendb>
+Source code::       <http://github.com/blackwinter/flattendb>
+Rubyforge project:: <http://rubyforge.org/projects/prometheus>
+
+
 == AUTHORS
 
 * Jens Wille <mailto:jens.wille@uni-koeln.de>

data/bin/flattendb.mysql

@@ -42,6 +42,10 @@ else
         abort "Input file doesn't seem to be a valid XML file, XML declaration missing"
       end
     when :sql
+      $dump_file = $infile.sub(/\.(?:sql|dump)$/i, '') << '.xml'
+      abort "Dump file and output file are the same: #{$dump_file} = #{$outfile}" \
+        if File.expand_path($dump_file) == File.expand_path($outfile)
+
       mysql_cmd = 'mysql'
       dump_cmd  = 'mysqldump'
 
@@ -60,10 +64,6 @@ else
       temp_user = 'flattendb_user'
       temp_pass = 'flattendb_pass'
 
-      $dump_file = $infile.sub(/\.(?:sql|dump)$/i, '') << '.xml'
-      abort "Dump file and output file are the same: #{$dump_file} = #{$outfile}" \
-        if File.expand_path($dump_file) == File.expand_path($outfile)
-
       mysql_args = "--one-database -u#{temp_user} -p#{temp_pass} #{temp_db} < #{$infile}"
       dump_args  = "--xml -u#{temp_user} -p#{temp_pass} #{temp_db} > #{$dump_file}"
 

data/example/mysql-sample2flat.yaml

@@ -8,3 +8,11 @@ object:
   barobject:
     @key: ObjID
     attr4: attr4ID
+
+#primary_table:
+#  foreign_table1: foreign_key1  # local_key1 = foreign_key1
+#  foreign_table2: [local_key2, foreign_key2]
+#  foreign_table3:
+#    @key: foreign_key3          # local_key3 = foreign_key3
+#  foreign_table4:
+#    @key: [local_key4, foreign_key4]

data/lib/flattendb/types/mdb.rb

@@ -26,8 +26,6 @@
 ###############################################################################
 #++
 
-require 'xml/libxml'
-
 require 'flattendb/base'
 
 module FlattenDB

data/lib/flattendb/types/mysql.rb

@@ -26,7 +26,7 @@
 ###############################################################################
 #++
 
-require 'xml/libxml'
+require 'libxml'
 
 require 'flattendb/base'
 
@@ -41,7 +41,7 @@ module FlattenDB
     def initialize(infile, outfile, config)
       super
 
-      @document = XML::Document.file(@input.first)
+      @document = LibXML::XML::Document.file(@input.first)
       @database = @document.root.find_first('database[@name]')
       @name     = @database[:name]
       @tables   = {}
@@ -102,15 +102,18 @@ module FlattenDB
           when Array
             inject_foreign(tables, primary_table, foreign_table, *spec)
           when Hash
-            raise "invalid join table spec, '#{JOIN_KEY}' missing" unless spec.has_key?(JOIN_KEY)
+            raise ArgumentError, "invalid join table spec, '#{JOIN_KEY}' missing" unless spec.has_key?(JOIN_KEY)
 
-            local_key, foreign_key = spec.delete(JOIN_KEY)
-            foreign_key ||= local_key
+            join_key_spec = spec.delete(JOIN_KEY)
 
             joined_tables = tables.dup
             flatten_tables!(joined_tables, foreign_table, spec)
 
-            inject_foreign(tables, primary_table, foreign_table, local_key, foreign_key, joined_tables)
+            (join_key_spec.is_a?(Hash) ? join_key_spec : { foreign_table => join_key_spec }).each { |foreign_table_name, join_key|
+              local_key, foreign_key = join_key
+
+              inject_foreign(tables, primary_table, foreign_table, local_key, foreign_key || local_key, joined_tables, foreign_table_name)
+            }
           else
             raise ArgumentError, "don't know how to handle spec of type '#{spec.class}'"
         end
@@ -121,15 +124,19 @@ module FlattenDB
       }
     end
 
-    def inject_foreign(tables, primary_table, foreign_table, local_key, foreign_key = local_key, foreign_tables = tables)
-      tables[primary_table].each { |row|
-        next unless row.has_key?(local_key)
+    def inject_foreign(tables, primary_table, foreign_table, local_key, foreign_key = local_key, foreign_tables = tables, foreign_table_name = foreign_table)
+      raise ArgumentError, "no such foreign table: #{foreign_table}" unless foreign_tables.has_key?(foreign_table)
 
-        foreign_content = foreign_tables[foreign_table].find_all { |foreign_row|
-          row[local_key] == foreign_row[foreign_key]
-        }
+      foreign_rows = foreign_tables[foreign_table]
 
-        row[foreign_table] = foreign_content unless foreign_content.empty?
+      tables[primary_table].each { |row|
+        if row.has_key?(local_key)
+          foreign_content = foreign_rows.select { |foreign_row|
+            row[local_key] == foreign_row[foreign_key]
+          }
+
+          row[foreign_table_name] = foreign_content unless foreign_content.empty?
+        end
       }
     end
 

data/lib/flattendb/version.rb

@@ -32,7 +32,7 @@ module FlattenDB
 
     MAJOR = 0
     MINOR = 0
-    TINY  = 3
+    TINY  = 4
 
     class << self
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: flattendb
 version: !ruby/object:Gem::Version 
-  version: 0.0.3.242
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jens Wille
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-21 00:00:00 +02:00
+date: 2008-12-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: highline
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: libxml-ruby
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -32,6 +34,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: builder
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -41,6 +44,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: ruby-nuggets
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -51,8 +55,8 @@ dependencies:
 description: Flatten relational databases.
 email: jens.wille@uni-koeln.de
 executables: 
-- flattendb
 - flattendb.mysql
+- flattendb
 - flattendb.mdb
 extensions: []
 
@@ -61,36 +65,36 @@ extra_rdoc_files:
 - ChangeLog
 - README
 files: 
+- lib/flattendb/types/mdb.rb
+- lib/flattendb/types/mysql.rb
+- lib/flattendb/cli.rb
 - lib/flattendb/version.rb
 - lib/flattendb/base.rb
-- lib/flattendb/cli.rb
-- lib/flattendb/types/mysql.rb
-- lib/flattendb/types/mdb.rb
 - lib/flattendb.rb
-- bin/flattendb
 - bin/flattendb.mysql
+- bin/flattendb
 - bin/flattendb.mdb
+- Rakefile
 - COPYING
-- README
 - ChangeLog
-- Rakefile
-- example/mysql-sample.sql
+- README
+- example/mysql-sample.xml
 - example/mysql-sample2flat.yaml
 - example/mysql-sample.flat.xml
-- example/mysql-sample.xml
+- example/mysql-sample.sql
 has_rdoc: true
 homepage: http://prometheus.rubyforge.org/flattendb
 post_install_message: 
 rdoc_options: 
-- --all
 - --line-numbers
-- --main
-- README
 - --inline-source
 - --title
 - flattendb Application documentation
+- --main
+- README
 - --charset
 - UTF-8
+- --all
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -108,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: prometheus
-rubygems_version: 1.1.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Flatten relational databases.