baza 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ca360eb0771fa4e40e286f2693d2e2957b9ee44
-  data.tar.gz: f9e91f37f01b60f6333fa1561d907c3ab7759d24
+  metadata.gz: a08442b27108efbaf692c8672da32fb95e0fb554
+  data.tar.gz: f975c643812141118d9767aaea21b265143a1ca8
 SHA512:
-  metadata.gz: ffbb2c02f6d404ceb64d4ebf7dca19f5a31d43e5fcfd0f43aac60fa42d61d459fb285c2308ec477f2ad8383cd7c2e8a2eac6746716e338841db2677608b1e448
-  data.tar.gz: ad1a9f018bed9a0e3ed570a2058d28ee6c83fa43ba821fe3f3b55de458cbde5f40685c5a21a4cbc0f4265f92f0ba9e376a348e0ab03ca3a824b0613a8510747b
+  metadata.gz: 5b82757ce77e2333b61a881c73c2ef0b0a384d2ada12376caa84e749c887608297f16816a958b56d095e5d3470d5bad693b9d429264466361eb4fa6d82848471
+  data.tar.gz: 661c572c592445928abd4c1dd9d23f38d8b6275abfd4e3646dff24adc7d6fb4ae91cc790d04893558d20d2670288123d05a0d9060b3487783098c5c666810c79

data/VERSION

@@ -1 +1 @@
-0.0.24
+0.0.25

data/baza.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: baza 0.0.24 ruby lib
+# stub: baza 0.0.25 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "baza".freeze
-  s.version = "0.0.24"
+  s.version = "0.0.25"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
     "lib/baza/cloner.rb",
     "lib/baza/column.rb",
     "lib/baza/commands.rb",
+    "lib/baza/commands/importer.rb",
     "lib/baza/commands/select.rb",
     "lib/baza/database.rb",
     "lib/baza/database_model.rb",
@@ -185,6 +186,7 @@ Gem::Specification.new do |s|
     "spec/support/driver_columns_collection.rb",
     "spec/support/driver_databases_collection.rb",
     "spec/support/driver_foreign_keys_collection.rb",
+    "spec/support/driver_importer_collection.rb",
     "spec/support/driver_indexes_collection.rb",
     "spec/support/driver_tables_collection.rb",
     "spec/support/driver_users_collection.rb"

data/lib/baza/commands/importer.rb

@@ -0,0 +1,31 @@
+class Baza::Commands::Importer
+  def initialize(args)
+    @db = args.fetch(:db)
+    @debug = args[:debug]
+    @io = args.fetch(:io)
+  end
+
+  def execute
+    sql = ""
+
+    @io.each_line do |line|
+      next if line.strip.blank?
+      next if line.start_with?("--")
+
+      debug "Add line to SQL: #{line}" if @debug
+      sql << line
+
+      next unless line.end_with?(";\n")
+
+      debug "Execute SQL: #{sql}" if @debug
+      @db.query(sql)
+      sql = ""
+    end
+  end
+
+private
+
+  def debug(message)
+    puts message if @debug
+  end
+end

data/lib/baza/database.rb

@@ -11,6 +11,14 @@ class Baza::Database
     @name_was = @name
   end
 
+  def import_file!(path)
+    File.open(path, "r") do |io|
+      use do
+        Baza::Commands::Importer.new(db: @db, io: io).execute
+      end
+    end
+  end
+
   def tables(args = {})
     list_args = {database: name}
     list_args[:name] = args.fetch(:name) if args[:name]

data/lib/baza/driver/pg/table.rb

@@ -13,6 +13,24 @@ class Baza::Driver::Pg::Table < Baza::Table
     end
   end
 
+  def data
+    ret = {
+      name: name,
+      columns: [],
+      indexes: []
+    }
+
+    columns do |column|
+      ret[:columns] << column.data
+    end
+
+    indexes do |index|
+      ret[:indexes] << index.data
+    end
+
+    ret
+  end
+
   def database_name
     @data.fetch(:table_catalog)
   end

data/spec/drivers/active_record_mysql2_spec.rb

@@ -17,5 +17,6 @@ unless RUBY_PLATFORM == "java"
     it_should_behave_like "a baza indexes driver"
     it_should_behave_like "a baza users driver"
     it_should_behave_like "an active record driver"
+    it_should_behave_like "a baza importer driver"
   end
 end

data/spec/drivers/active_record_mysql_spec.rb

@@ -15,4 +15,5 @@ describe Baza::Driver::ActiveRecord do
   it_should_behave_like "a baza indexes driver"
   it_should_behave_like "a baza users driver"
   it_should_behave_like "an active record driver"
+  it_should_behave_like "a baza importer driver"
 end

data/spec/drivers/active_record_pg_spec.rb

@@ -17,5 +17,6 @@ unless RUBY_PLATFORM == "java"
     it_should_behave_like "a baza foreign keys driver"
     it_should_behave_like "a baza indexes driver"
     it_should_behave_like "an active record driver"
+    it_should_behave_like "a baza importer driver"
   end
 end

data/spec/drivers/active_record_sqlite3_spec.rb

@@ -14,4 +14,5 @@ describe Baza::Driver::ActiveRecord do
   it_should_behave_like "a baza columns driver"
   it_should_behave_like "a baza indexes driver"
   it_should_behave_like "an active record driver"
+  it_should_behave_like "a baza importer driver"
 end

data/spec/drivers/mysql2_spec.rb

@@ -15,4 +15,5 @@ describe Baza::Driver::Mysql2 do
   it_should_behave_like "a baza foreign keys driver"
   it_should_behave_like "a baza indexes driver"
   it_should_behave_like "a baza users driver"
+  it_should_behave_like "a baza importer driver"
 end

data/spec/drivers/mysql_spec.rb

@@ -15,6 +15,7 @@ describe Baza.const_get(:Driver).const_get(:Mysql) do
   it_should_behave_like "a baza foreign keys driver"
   it_should_behave_like "a baza indexes driver"
   it_should_behave_like "a baza users driver"
+  it_should_behave_like "a baza importer driver"
 
   it "should dump to sqlite3" do
     require "info_sqlite3"

data/spec/drivers/pg_spec.rb

@@ -15,5 +15,6 @@ unless RUBY_PLATFORM == "java"
     it_should_behave_like "a baza columns driver"
     it_should_behave_like "a baza foreign keys driver"
     it_should_behave_like "a baza indexes driver"
+    it_should_behave_like "a baza importer driver"
   end
 end

data/spec/drivers/sqlite3_spec.rb

@@ -12,6 +12,7 @@ describe Baza::Driver::Sqlite3 do
   it_should_behave_like "a baza tables driver"
   it_should_behave_like "a baza columns driver"
   it_should_behave_like "a baza indexes driver"
+  it_should_behave_like "a baza importer driver"
 
   it "should copy database structure and data" do
     require "info_sqlite3"

data/spec/support/driver_importer_collection.rb

@@ -0,0 +1,38 @@
+shared_examples_for "a baza importer driver" do
+  let(:driver) { constant.new(debug: false) }
+  let(:db) { driver.db }
+  let(:test_table) do
+    db.tables.create(
+      "test",
+      columns: [
+        {name: "id", type: :int, autoincr: true, primarykey: true},
+        {name: "text", type: :varchar}
+      ]
+    )
+    db.tables[:test]
+  end
+
+  before do
+    driver.before
+  end
+
+  after do
+    driver.after
+  end
+
+  it "imports sql" do
+    test_table
+
+    io = StringIO.new
+    dumper = Baza::Dump.new(db: db)
+    dumper.dump(io)
+    io.rewind
+
+    test_table.drop
+
+    importer = Baza::Commands::Importer.new(db: db, io: io)
+    importer.execute
+
+    expect(db.tables[:test].name).to eq "test"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baza
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Kasper Johansen
@@ -345,6 +345,7 @@ files:
 - lib/baza/cloner.rb
 - lib/baza/column.rb
 - lib/baza/commands.rb
+- lib/baza/commands/importer.rb
 - lib/baza/commands/select.rb
 - lib/baza/database.rb
 - lib/baza/database_model.rb
@@ -492,6 +493,7 @@ files:
 - spec/support/driver_columns_collection.rb
 - spec/support/driver_databases_collection.rb
 - spec/support/driver_foreign_keys_collection.rb
+- spec/support/driver_importer_collection.rb
 - spec/support/driver_indexes_collection.rb
 - spec/support/driver_tables_collection.rb
 - spec/support/driver_users_collection.rb