baza 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dc4209add2522108f9c69de529168208afb5f22
-  data.tar.gz: 16c14dfd76ca60e17f4b3a04c41f91a040454662
+  metadata.gz: 8369c9293d5a5bc7d773f2d0b433851dfbfd7357
+  data.tar.gz: 536bc2b56f0483e5df1f778552651afa91f0cce1
 SHA512:
-  metadata.gz: b6072099f859db6159e8e22ec87bd4adb2bd08bcee2bb77333fd81251513d1ea6426a324ed563872418a3b6cffd6ff13286f3d3d79e3313c305c6ba08994d283
-  data.tar.gz: b3de0fcbf50b3bb927f2aa8891092abb7d3ba7d1b97de98cad8572da7cd264f8cac11cff28625f2b7ab0028da478e748450c5b9425e77aa43e8c65d9cecb5b2f
+  metadata.gz: 2ace04b5dc91c6379d5764cd6229c6519dfec9aff794778a6e1192359b7d3de68b3006d6be48895fa633982762d440fb4ef6908d316a6891bd9c15828d391e4b
+  data.tar.gz: 3dd8ab58ffc4e7bef9d7439bb57df231c03f81ed7b6d7a9a754973d4ce94326f266e73b60de82489e8622d4998d6850bccf4db2c02f8a6dd1e7eb7e0a2d000ed

data/Gemfile

@@ -3,9 +3,9 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "datet", "~> 0.0.25"
 gem "array_enumerator", "~> 0.0.10"
 gem "auto_autoloader", "~> 0.0.1"
+gem "datet", "~> 0.0.25"
 gem "event_handler", "~> 0.0.0"
 gem "simple_delegate", "~> 0.0.2"
 gem "string-cases", "~> 0.0.4"
@@ -14,21 +14,21 @@ gem "wref", "~> 0.0.8"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development, :test do
-  gem "rspec", "3.4.0"
-  gem "rdoc"
+  gem "activerecord", "4.2.5"
+  gem "activerecord-jdbc-adapter", platform: :jruby
+  gem "best_practice_project", "0.0.9", require: false
   gem "bundler"
-  gem "jeweler"
-  gem "pry"
-  gem "jdbc-sqlite3", platform: :jruby
   gem "jdbc-mysql", platform: :jruby
-  gem "activerecord-jdbc-adapter", platform: :jruby
-  gem "sqlite3", platform: :ruby
+  gem "jdbc-sqlite3", platform: :jruby
+  gem "jeweler", "2.3.3"
   gem "mysql", "2.9.1", platform: :ruby
   gem "mysql2", "0.4.2", platform: :ruby
   gem "pg", "0.18.4", platform: :ruby
-  gem "activerecord", "4.2.5"
-  gem "best_practice_project", "0.0.9", require: false
+  gem "pry"
+  gem "rdoc"
+  gem "rspec", "3.4.0"
   gem "rubocop", "0.39.0", require: false
+  gem "sqlite3", platform: :ruby
 end
 
 gem "codeclimate-test-reporter", group: :test, require: nil

data/Gemfile.lock

@@ -16,7 +16,8 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     arel (6.0.3)
     array_enumerator (0.0.10)
     ast (2.2.0)
@@ -34,52 +35,55 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.5)
     event_handler (0.0.0)
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.10-java)
-    git (1.2.9.1)
-    github_api (0.12.3)
+    git (1.3.0)
+    github_api (0.11.3)
       addressable (~> 2.3)
-      descendants_tracker (~> 0.0.4)
+      descendants_tracker (~> 0.0.1)
       faraday (~> 0.8, < 0.10)
-      hashie (>= 3.3)
+      hashie (>= 1.2)
       multi_json (>= 1.7.5, < 2.0)
-      nokogiri (~> 1.6.3)
+      nokogiri (~> 1.6.0)
       oauth2
-    hashie (3.4.2)
-    highline (1.7.2)
+    hashie (3.4.6)
+    highline (1.7.8)
     i18n (0.7.0)
+    jar-dependencies (0.3.9)
     jdbc-mysql (5.1.37)
     jdbc-sqlite3 (3.8.11.2)
-    jeweler (2.0.1)
+    jeweler (2.3.3)
       builder
       bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api
+      github_api (~> 0.11.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       rake
       rdoc
+      semver2
     json (1.8.3)
     json (1.8.3-java)
-    jwt (1.5.1)
+    jwt (1.5.6)
     method_source (0.8.2)
-    mini_portile (0.6.2)
+    mini_portile2 (2.1.0)
     minitest (5.8.3)
-    multi_json (1.11.2)
-    multi_xml (0.5.5)
+    multi_json (1.12.1)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
     mysql (2.9.1)
     mysql2 (0.4.2)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    nokogiri (1.6.6.2-java)
-    oauth2 (1.0.0)
-      faraday (>= 0.8, < 0.10)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    nokogiri (1.6.8.1-java)
+    oauth2 (1.3.0)
+      faraday (>= 0.8, < 0.11)
       jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
+      rack (>= 1.2, < 3)
     parser (2.3.0.7)
       ast (~> 2.2)
     pg (0.18.4)
@@ -93,9 +97,13 @@ GEM
       method_source (~> 0.8.1)
       slop (~> 3.4)
       spoon (~> 0.0)
-    rack (1.6.4)
+    psych (2.2.2)
+    psych (2.2.2-java)
+      jar-dependencies (>= 0.1.7)
+    public_suffix (2.0.5)
+    rack (2.0.1)
     rainbow (2.1.0)
-    rake (10.4.2)
+    rake (12.0.0)
     rdoc (4.2.0)
       json (~> 1.4)
     rspec (3.4.0)
@@ -118,6 +126,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.7.5)
+    semver2 (3.4.2)
     simple_delegate (0.0.2)
     simplecov (0.10.0)
       docile (~> 1.1.0)
@@ -152,7 +161,7 @@ DEPENDENCIES
   event_handler (~> 0.0.0)
   jdbc-mysql
   jdbc-sqlite3
-  jeweler
+  jeweler (= 2.3.3)
   mysql (= 2.9.1)
   mysql2 (= 0.4.2)
   pg (= 0.18.4)
@@ -166,4 +175,4 @@ DEPENDENCIES
   wref (~> 0.0.8)
 
 BUNDLED WITH
-   1.11.2
+   1.13.7

data/VERSION

@@ -1 +1 @@
-0.0.21
+0.0.22

data/baza.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: baza 0.0.21 ruby lib
+# stub: baza 0.0.22 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "baza"
-  s.version = "0.0.21"
+  s.name = "baza".freeze
+  s.version = "0.0.22"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Kasper Johansen"]
-  s.date = "2016-04-09"
-  s.description = "A database abstraction layer, model framework and database framework."
-  s.email = "kj@gfish.com"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Kasper Johansen".freeze]
+  s.date = "2017-01-22"
+  s.description = "A database abstraction layer, model framework and database framework.".freeze
+  s.email = "kj@gfish.com".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -58,6 +58,7 @@ Gem::Specification.new do |s|
     "lib/baza/driver/mysql/commands.rb",
     "lib/baza/driver/mysql/database.rb",
     "lib/baza/driver/mysql/databases.rb",
+    "lib/baza/driver/mysql/foreign_key.rb",
     "lib/baza/driver/mysql/index.rb",
     "lib/baza/driver/mysql/indexes.rb",
     "lib/baza/driver/mysql/result.rb",
@@ -99,6 +100,7 @@ Gem::Specification.new do |s|
     "lib/baza/driver/pg/create_index_sql_creator.rb",
     "lib/baza/driver/pg/database.rb",
     "lib/baza/driver/pg/databases.rb",
+    "lib/baza/driver/pg/foreign_key.rb",
     "lib/baza/driver/pg/index.rb",
     "lib/baza/driver/pg/indexes.rb",
     "lib/baza/driver/pg/result.rb",
@@ -130,6 +132,7 @@ Gem::Specification.new do |s|
     "lib/baza/driver/sqlite3_rhodes.rb",
     "lib/baza/dump.rb",
     "lib/baza/errors.rb",
+    "lib/baza/foreign_key.rb",
     "lib/baza/idquery.rb",
     "lib/baza/index.rb",
     "lib/baza/jdbc_driver.rb",
@@ -179,88 +182,89 @@ Gem::Specification.new do |s|
     "spec/support/driver_collection.rb",
     "spec/support/driver_columns_collection.rb",
     "spec/support/driver_databases_collection.rb",
+    "spec/support/driver_foreign_keys_collection.rb",
     "spec/support/driver_indexes_collection.rb",
     "spec/support/driver_tables_collection.rb",
     "spec/support/driver_users_collection.rb"
   ]
-  s.homepage = "http://github.com/kaspernj/baza"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
-  s.summary = "A database abstraction layer, model framework and database framework."
+  s.homepage = "http://github.com/kaspernj/baza".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.6.8".freeze
+  s.summary = "A database abstraction layer, model framework and database framework.".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<datet>, ["~> 0.0.25"])
-      s.add_runtime_dependency(%q<array_enumerator>, ["~> 0.0.10"])
-      s.add_runtime_dependency(%q<auto_autoloader>, ["~> 0.0.1"])
-      s.add_runtime_dependency(%q<event_handler>, ["~> 0.0.0"])
-      s.add_runtime_dependency(%q<simple_delegate>, ["~> 0.0.2"])
-      s.add_runtime_dependency(%q<string-cases>, ["~> 0.0.4"])
-      s.add_runtime_dependency(%q<wref>, ["~> 0.0.8"])
-      s.add_development_dependency(%q<rspec>, ["= 3.4.0"])
-      s.add_development_dependency(%q<rdoc>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<pry>, [">= 0"])
-      s.add_development_dependency(%q<jdbc-sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<jdbc-mysql>, [">= 0"])
-      s.add_development_dependency(%q<activerecord-jdbc-adapter>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<mysql>, ["= 2.9.1"])
-      s.add_development_dependency(%q<mysql2>, ["= 0.4.2"])
-      s.add_development_dependency(%q<pg>, ["= 0.18.4"])
-      s.add_development_dependency(%q<activerecord>, ["= 4.2.5"])
-      s.add_development_dependency(%q<best_practice_project>, ["= 0.0.9"])
-      s.add_development_dependency(%q<rubocop>, ["= 0.39.0"])
+      s.add_runtime_dependency(%q<array_enumerator>.freeze, ["~> 0.0.10"])
+      s.add_runtime_dependency(%q<auto_autoloader>.freeze, ["~> 0.0.1"])
+      s.add_runtime_dependency(%q<datet>.freeze, ["~> 0.0.25"])
+      s.add_runtime_dependency(%q<event_handler>.freeze, ["~> 0.0.0"])
+      s.add_runtime_dependency(%q<simple_delegate>.freeze, ["~> 0.0.2"])
+      s.add_runtime_dependency(%q<string-cases>.freeze, ["~> 0.0.4"])
+      s.add_runtime_dependency(%q<wref>.freeze, ["~> 0.0.8"])
+      s.add_development_dependency(%q<activerecord>.freeze, ["= 4.2.5"])
+      s.add_development_dependency(%q<activerecord-jdbc-adapter>.freeze, [">= 0"])
+      s.add_development_dependency(%q<best_practice_project>.freeze, ["= 0.0.9"])
+      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_development_dependency(%q<jdbc-mysql>.freeze, [">= 0"])
+      s.add_development_dependency(%q<jdbc-sqlite3>.freeze, [">= 0"])
+      s.add_development_dependency(%q<jeweler>.freeze, ["= 2.3.3"])
+      s.add_development_dependency(%q<mysql>.freeze, ["= 2.9.1"])
+      s.add_development_dependency(%q<mysql2>.freeze, ["= 0.4.2"])
+      s.add_development_dependency(%q<pg>.freeze, ["= 0.18.4"])
+      s.add_development_dependency(%q<pry>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rdoc>.freeze, [">= 0"])
+      s.add_development_dependency(%q<rspec>.freeze, ["= 3.4.0"])
+      s.add_development_dependency(%q<rubocop>.freeze, ["= 0.39.0"])
+      s.add_development_dependency(%q<sqlite3>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<datet>, ["~> 0.0.25"])
-      s.add_dependency(%q<array_enumerator>, ["~> 0.0.10"])
-      s.add_dependency(%q<auto_autoloader>, ["~> 0.0.1"])
-      s.add_dependency(%q<event_handler>, ["~> 0.0.0"])
-      s.add_dependency(%q<simple_delegate>, ["~> 0.0.2"])
-      s.add_dependency(%q<string-cases>, ["~> 0.0.4"])
-      s.add_dependency(%q<wref>, ["~> 0.0.8"])
-      s.add_dependency(%q<rspec>, ["= 3.4.0"])
-      s.add_dependency(%q<rdoc>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<pry>, [">= 0"])
-      s.add_dependency(%q<jdbc-sqlite3>, [">= 0"])
-      s.add_dependency(%q<jdbc-mysql>, [">= 0"])
-      s.add_dependency(%q<activerecord-jdbc-adapter>, [">= 0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<mysql>, ["= 2.9.1"])
-      s.add_dependency(%q<mysql2>, ["= 0.4.2"])
-      s.add_dependency(%q<pg>, ["= 0.18.4"])
-      s.add_dependency(%q<activerecord>, ["= 4.2.5"])
-      s.add_dependency(%q<best_practice_project>, ["= 0.0.9"])
-      s.add_dependency(%q<rubocop>, ["= 0.39.0"])
+      s.add_dependency(%q<array_enumerator>.freeze, ["~> 0.0.10"])
+      s.add_dependency(%q<auto_autoloader>.freeze, ["~> 0.0.1"])
+      s.add_dependency(%q<datet>.freeze, ["~> 0.0.25"])
+      s.add_dependency(%q<event_handler>.freeze, ["~> 0.0.0"])
+      s.add_dependency(%q<simple_delegate>.freeze, ["~> 0.0.2"])
+      s.add_dependency(%q<string-cases>.freeze, ["~> 0.0.4"])
+      s.add_dependency(%q<wref>.freeze, ["~> 0.0.8"])
+      s.add_dependency(%q<activerecord>.freeze, ["= 4.2.5"])
+      s.add_dependency(%q<activerecord-jdbc-adapter>.freeze, [">= 0"])
+      s.add_dependency(%q<best_practice_project>.freeze, ["= 0.0.9"])
+      s.add_dependency(%q<bundler>.freeze, [">= 0"])
+      s.add_dependency(%q<jdbc-mysql>.freeze, [">= 0"])
+      s.add_dependency(%q<jdbc-sqlite3>.freeze, [">= 0"])
+      s.add_dependency(%q<jeweler>.freeze, ["= 2.3.3"])
+      s.add_dependency(%q<mysql>.freeze, ["= 2.9.1"])
+      s.add_dependency(%q<mysql2>.freeze, ["= 0.4.2"])
+      s.add_dependency(%q<pg>.freeze, ["= 0.18.4"])
+      s.add_dependency(%q<pry>.freeze, [">= 0"])
+      s.add_dependency(%q<rdoc>.freeze, [">= 0"])
+      s.add_dependency(%q<rspec>.freeze, ["= 3.4.0"])
+      s.add_dependency(%q<rubocop>.freeze, ["= 0.39.0"])
+      s.add_dependency(%q<sqlite3>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<datet>, ["~> 0.0.25"])
-    s.add_dependency(%q<array_enumerator>, ["~> 0.0.10"])
-    s.add_dependency(%q<auto_autoloader>, ["~> 0.0.1"])
-    s.add_dependency(%q<event_handler>, ["~> 0.0.0"])
-    s.add_dependency(%q<simple_delegate>, ["~> 0.0.2"])
-    s.add_dependency(%q<string-cases>, ["~> 0.0.4"])
-    s.add_dependency(%q<wref>, ["~> 0.0.8"])
-    s.add_dependency(%q<rspec>, ["= 3.4.0"])
-    s.add_dependency(%q<rdoc>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<pry>, [">= 0"])
-    s.add_dependency(%q<jdbc-sqlite3>, [">= 0"])
-    s.add_dependency(%q<jdbc-mysql>, [">= 0"])
-    s.add_dependency(%q<activerecord-jdbc-adapter>, [">= 0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<mysql>, ["= 2.9.1"])
-    s.add_dependency(%q<mysql2>, ["= 0.4.2"])
-    s.add_dependency(%q<pg>, ["= 0.18.4"])
-    s.add_dependency(%q<activerecord>, ["= 4.2.5"])
-    s.add_dependency(%q<best_practice_project>, ["= 0.0.9"])
-    s.add_dependency(%q<rubocop>, ["= 0.39.0"])
+    s.add_dependency(%q<array_enumerator>.freeze, ["~> 0.0.10"])
+    s.add_dependency(%q<auto_autoloader>.freeze, ["~> 0.0.1"])
+    s.add_dependency(%q<datet>.freeze, ["~> 0.0.25"])
+    s.add_dependency(%q<event_handler>.freeze, ["~> 0.0.0"])
+    s.add_dependency(%q<simple_delegate>.freeze, ["~> 0.0.2"])
+    s.add_dependency(%q<string-cases>.freeze, ["~> 0.0.4"])
+    s.add_dependency(%q<wref>.freeze, ["~> 0.0.8"])
+    s.add_dependency(%q<activerecord>.freeze, ["= 4.2.5"])
+    s.add_dependency(%q<activerecord-jdbc-adapter>.freeze, [">= 0"])
+    s.add_dependency(%q<best_practice_project>.freeze, ["= 0.0.9"])
+    s.add_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_dependency(%q<jdbc-mysql>.freeze, [">= 0"])
+    s.add_dependency(%q<jdbc-sqlite3>.freeze, [">= 0"])
+    s.add_dependency(%q<jeweler>.freeze, ["= 2.3.3"])
+    s.add_dependency(%q<mysql>.freeze, ["= 2.9.1"])
+    s.add_dependency(%q<mysql2>.freeze, ["= 0.4.2"])
+    s.add_dependency(%q<pg>.freeze, ["= 0.18.4"])
+    s.add_dependency(%q<pry>.freeze, [">= 0"])
+    s.add_dependency(%q<rdoc>.freeze, [">= 0"])
+    s.add_dependency(%q<rspec>.freeze, ["= 3.4.0"])
+    s.add_dependency(%q<rubocop>.freeze, ["= 0.39.0"])
+    s.add_dependency(%q<sqlite3>.freeze, [">= 0"])
   end
 end
 

data/lib/baza/driver/mysql/column.rb

@@ -15,6 +15,25 @@ class Baza::Driver::Mysql::Column < Baza::Column
     @name
   end
 
+  def create_foreign_key(args)
+    fk_name = args[:name]
+    fk_name ||= "fk_#{table_name}_#{name}"
+
+    other_column = args.fetch(:column)
+    other_table = other_column.table
+
+    sql = "
+      ALTER TABLE #{@db.escape_table(table_name)}
+      ADD CONSTRAINT #{@db.escape_table(fk_name)}
+      FOREIGN KEY (#{@db.escape_table(name)})
+      REFERENCES #{@db.escape_table(other_table.name)} (#{@db.escape_column(other_column.name)})
+    "
+
+    @db.query(sql)
+
+    true
+  end
+
   def table_name
     @args.fetch(:table_name)
   end

data/lib/baza/driver/mysql/foreign_key.rb

@@ -0,0 +1,19 @@
+class Baza::Driver::Mysql::ForeignKey < Baza::ForeignKey
+  def initialize(args)
+    @db = args.fetch(:db)
+
+    data = args.fetch(:data)
+
+    @column_name = data.fetch(:COLUMN_NAME)
+    @name = data.fetch(:CONSTRAINT_NAME)
+    @table_name = data.fetch(:TABLE_NAME)
+  end
+
+  def drop
+    @db.query("
+      ALTER TABLE `#{@db.escape_table(table_name)}`
+      DROP FOREIGN KEY `#{@db.escape_table(name)}`
+    ")
+    true
+  end
+end

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

@@ -95,15 +95,60 @@ class Baza::Driver::Mysql::Table < Baza::Table
     end
   end
 
-  def indexes(args = nil)
-    @db.indexes
-    ret = []
+  def foreign_keys(args = {})
+    sql = "
+      SELECT
+        TABLE_NAME,
+        COLUMN_NAME,
+        CONSTRAINT_NAME,
+        REFERENCED_TABLE_NAME,
+        REFERENCED_COLUMN_NAME
+
+      FROM
+        INFORMATION_SCHEMA.KEY_COLUMN_USAGE
+
+      WHERE
+        REFERENCED_TABLE_SCHEMA = '#{@db.escape_database(@db.current_database_name)}' AND
+        TABLE_NAME = '#{@db.escape_table(name)}'
+    "
+
+    sql << " AND CONSTRAINT_NAME = '#{@db.escape(args.fetch(:name))}'" if args[:name]
+
+    result = [] unless block_given?
+
+    @db.query(sql) do |data|
+      foreign_key = Baza::Driver::Mysql::ForeignKey.new(
+        db: @db,
+        data: data
+      )
+
+      if block_given?
+        yield foreign_key
+      else
+        result << foreign_key
+      end
+    end
+
+    result
+  end
+
+  def foreign_key(name)
+    foreign_keys(name: name) do |foreign_key|
+      return foreign_key
+    end
+
+    raise Baza::Errors::ForeignKeyNotFound, "Foreign key not found: #{name}"
+  end
+
+  def indexes(args = nil, &blk)
+    ret = {}
 
     sql = "SHOW INDEX FROM `#{@db.escape_table(name)}`"
     sql << " WHERE `Key_name` = '#{@db.esc(args.fetch(:name))}'" if args && args.key?(:name)
 
     @db.query(sql) do |d_indexes|
       next if d_indexes[:Key_name] == "PRIMARY"
+
       index_name = d_indexes.fetch(:Key_name)
       obj = @indexes_list.get(index_name)
 
@@ -113,21 +158,17 @@ class Baza::Driver::Mysql::Table < Baza::Table
           db: @db,
           data: d_indexes
         )
-        obj.columns << d_indexes.fetch(:Column_name)
         @indexes_list[index_name] = obj
       end
 
-      if block_given?
-        yield obj
-      else
-        ret << obj
-      end
+      obj.columns << d_indexes.fetch(:Column_name) unless obj.columns.include?(d_indexes.fetch(:Column_name))
+      ret[obj.name] = obj unless ret.key?(obj.name)
     end
 
-    if block_given?
-      return nil
+    if blk
+      ret.values.each(&blk)
     else
-      return ret
+      return ret.values
     end
   end
 

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

@@ -8,7 +8,26 @@ class Baza::Driver::Pg::Column < Baza::Column
   end
 
   def table_name
-    @data.fetch(:table_name)
+    @_table_name ||= @data.fetch(:table_name)
+  end
+
+  def create_foreign_key(args)
+    fk_name = args[:name]
+    fk_name ||= "fk_#{table_name}_#{name}"
+
+    other_column = args.fetch(:column)
+    other_table = other_column.table
+
+    sql = "
+      ALTER TABLE #{@db.escape_table(table_name)}
+      ADD CONSTRAINT #{@db.escape_table(fk_name)}
+      FOREIGN KEY (#{@db.escape_table(name)})
+      REFERENCES #{@db.escape_table(other_table.name)} (#{@db.escape_column(other_column.name)})
+    "
+
+    @db.query(sql)
+
+    true
   end
 
   def type

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

@@ -0,0 +1,19 @@
+class Baza::Driver::Pg::ForeignKey < Baza::ForeignKey
+  def initialize(args)
+    @db = args.fetch(:db)
+
+    data = args.fetch(:data)
+
+    @column_name = data.fetch(:column_name)
+    @name = data.fetch(:constraint_name)
+    @table_name = data.fetch(:table_name)
+  end
+
+  def drop
+    @db.query("
+      ALTER TABLE #{@db.escape_table(table_name)}
+      DROP CONSTRAINT #{@db.escape_table(name)}
+    ")
+    true
+  end
+end

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

@@ -49,7 +49,7 @@ class Baza::Driver::Pg::Table < Baza::Table
 
   def column(name)
     column = columns(name: name).first
-    raise Baza::Errors::ColumnNotFound unless column
+    raise Baza::Errors::ColumnNotFound, "Column not found: #{name}" unless column
     column
   end
 
@@ -58,6 +58,57 @@ class Baza::Driver::Pg::Table < Baza::Table
     self
   end
 
+  def foreign_keys(args = {})
+    sql = "
+      SELECT
+        tc.constraint_name,
+        tc.table_name,
+        kcu.column_name,
+        ccu.table_name AS foreign_table_name,
+        ccu.column_name AS foreign_column_name
+
+      FROM
+        information_schema.table_constraints AS tc
+
+      JOIN information_schema.key_column_usage AS kcu ON
+        tc.constraint_name = kcu.constraint_name
+
+      JOIN information_schema.constraint_column_usage AS ccu
+        ON ccu.constraint_name = tc.constraint_name
+
+      WHERE
+        constraint_type = 'FOREIGN KEY' AND
+        tc.table_name = '#{@db.escape(name)}'
+    "
+
+    sql << " AND tc.constraint_name = '#{@db.escape(args.fetch(:name))}'" if args[:name]
+
+    result = [] unless block_given?
+
+    @db.query(sql) do |data|
+      foreign_key = Baza::Driver::Pg::ForeignKey.new(
+        db: @db,
+        data: data
+      )
+
+      if block_given?
+        yield foreign_key
+      else
+        result << foreign_key
+      end
+    end
+
+    result
+  end
+
+  def foreign_key(name)
+    foreign_keys(name: name) do |foreign_key|
+      return foreign_key
+    end
+
+    raise Baza::Errors::ForeignKeyNotFound, "Foreign key not found: #{name}"
+  end
+
   def indexes(args = {})
     where_args = {
       tablename: name

data/lib/baza/errors.rb

@@ -1,6 +1,7 @@
 class Baza::Errors
   class DatabaseNotFound < RuntimeError; end
   class ColumnNotFound < RuntimeError; end
+  class ForeignKeyNotFound < RuntimeError; end
   class IndexNotFound < RuntimeError; end
   class UserNotFound < RuntimeError; end
   class NotImplemented < RuntimeError; end

data/lib/baza/foreign_key.rb

@@ -0,0 +1,17 @@
+class Baza::ForeignKey
+  include Baza::DatabaseModelFunctionality
+
+  attr_reader :column_name, :db, :name, :table_name
+
+  def column
+    @_column ||= table.column(column_name)
+  end
+
+  def table
+    @_table ||= db.tables[table_name]
+  end
+
+  def to_param
+    name
+  end
+end

data/lib/baza/sql_queries/postgres_upsert_duplicate_key.rb

@@ -8,7 +8,7 @@ class Baza::SqlQueries::PostgresUpsertDuplicateKey
   end
 
   def execute
-    if @db.commands.version.to_f >= 9.5
+    if @db.commands.version.to_f >= 9.5 && @db.commands.version.to_f <= 9.5
       @db.query(on_conflict_sql)
     elsif @terms.empty?
       return insert_and_register_conflict
@@ -54,7 +54,21 @@ private
   end
 
   def on_conflict_sql
-    "#{insert_sql} ON CONFLICT DO UPDATE #{update_set_sql}"
+    "#{insert_sql} ON CONFLICT (#{conflict_column_sql}) DO UPDATE #{update_set_sql}"
+  end
+
+  def conflict_column_sql
+    sql = ""
+
+    first = true
+    @updates.keys.each do |column_name|
+      sql << ", " if first
+      first = false if first
+
+      sql << "'#{@db.escape_column(column_name)}'"
+    end
+
+    sql
   end
 
   def insert_sql

data/spec/drivers/active_record_mysql2_spec.rb

@@ -13,6 +13,7 @@ unless RUBY_PLATFORM == "java"
     it_behaves_like "a baza driver"
     it_should_behave_like "a baza tables driver"
     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 users driver"
     it_should_behave_like "an active record driver"

data/spec/drivers/active_record_mysql_spec.rb

@@ -11,6 +11,7 @@ describe Baza::Driver::ActiveRecord do
   it_behaves_like "a baza driver"
   it_should_behave_like "a baza tables driver"
   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 users driver"
   it_should_behave_like "an active record driver"

data/spec/drivers/active_record_pg_spec.rb

@@ -14,6 +14,7 @@ unless RUBY_PLATFORM == "java"
     it_behaves_like "a baza driver"
     it_should_behave_like "a baza tables driver"
     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 "an active record driver"
   end

data/spec/drivers/mysql2_spec.rb

@@ -12,6 +12,7 @@ describe Baza::Driver::Mysql2 do
   it_should_behave_like "a baza databases driver"
   it_should_behave_like "a baza tables driver"
   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 users driver"
 end

data/spec/drivers/mysql_spec.rb

@@ -12,6 +12,7 @@ describe Baza.const_get(:Driver).const_get(:Mysql) do
   it_should_behave_like "a baza databases driver"
   it_should_behave_like "a baza tables driver"
   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 users driver"
 

data/spec/drivers/pg_spec.rb

@@ -13,6 +13,7 @@ unless RUBY_PLATFORM == "java"
     it_should_behave_like "a baza databases driver"
     it_should_behave_like "a baza tables driver"
     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"
   end
 end

data/spec/support/driver_foreign_keys_collection.rb

@@ -0,0 +1,54 @@
+shared_examples_for "a baza foreign keys driver" do
+  let(:driver) { constant.new }
+  let(:db) { driver.db }
+  let(:posts_table) do
+    db.tables.create(
+      "posts",
+      columns: [
+        {name: "id", type: :int, autoincr: true, primarykey: true},
+        {name: "user_id", type: :int},
+        {name: "text", type: :varchar}
+      ]
+    )
+    db.tables[:posts]
+  end
+  let(:users_table) do
+    db.tables.create(
+      "users",
+      columns: [
+        {name: "id", type: :int, autoincr: true, primarykey: true},
+        {name: "email", type: :varchar}
+      ]
+    )
+    db.tables[:users]
+  end
+  let(:users_id_column) { users_table.column("id") }
+  let(:user_id_foreign_key) do
+    posts_table.column("user_id").create_foreign_key(
+      column: users_id_column,
+      name: "test_column_key"
+    )
+    posts_table.foreign_key("test_column_key")
+  end
+
+  before do
+    driver.before
+  end
+
+  after do
+    driver.after
+  end
+
+  it "creates foreign keys" do
+    user_id_foreign_key
+
+    expect(posts_table.foreign_keys.length).to eq 1
+    expect(posts_table.foreign_key("test_column_key").name).to eq "test_column_key"
+  end
+
+  it "destroys foreign keys" do
+    user_id_foreign_key.drop
+
+    expect { posts_table.foreign_key("test_column_key") }.to raise_error(Baza::Errors::ForeignKeyNotFound)
+  end
+end

data/spec/support/driver_indexes_collection.rb

@@ -11,7 +11,8 @@ shared_examples_for "a baza indexes driver" do
       ],
       indexes: [
         :text,
-        {name: :email, unique: true, columns: [:email]}
+        {name: :email, unique: true, columns: [:email]},
+        {name: :two_columns, columns: [:text, :email]}
       ]
     )
     db.tables[:test]
@@ -45,13 +46,21 @@ shared_examples_for "a baza indexes driver" do
     end.to raise_error(Baza::Errors::IndexNotFound)
   end
 
-  describe "#unique?" do
-    it "returns true when it is unique" do
-      expect(test_table.index("email").unique?).to eq true
+  describe Baza::Index do
+    describe "#unique?" do
+      it "returns true when it is unique" do
+        expect(test_table.index("email").unique?).to eq true
+      end
+
+      it "returns false when it isn't unique" do
+        expect(test_table.index("text").unique?).to eq false
+      end
     end
 
-    it "returns false when it isn't unique" do
-      expect(test_table.index("text").unique?).to eq false
+    describe "#columns" do
+      it "returns the correct columns" do
+        expect(test_table.index("two_columns").columns).to eq %w(text email)
+      end
     end
   end
 end

data/spec/support/driver_tables_collection.rb

@@ -24,7 +24,7 @@ shared_examples_for "a baza tables driver" do
 
   it "creates tables" do
     expect(test_table.name).to eq "test"
-    expect(db.tables[:test]).to_not eq nil
+    expect(db.tables[:test].name).to eq "test"
   end
 
   it "#list" do

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: baza
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-09 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: datet
+  name: array_enumerator
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.25
+        version: 0.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.25
+        version: 0.0.10
 - !ruby/object:Gem::Dependency
-  name: array_enumerator
+  name: auto_autoloader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
-  name: auto_autoloader
+  name: datet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.25
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.25
 - !ruby/object:Gem::Dependency
   name: event_handler
   requirement: !ruby/object:Gem::Requirement
@@ -109,21 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.8
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 4.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 4.2.5
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: activerecord-jdbc-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,21 +137,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: best_practice_project
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: jdbc-mysql
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,131 +193,131 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jdbc-mysql
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.3
 - !ruby/object:Gem::Dependency
-  name: activerecord-jdbc-adapter
+  name: mysql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.1
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
-  name: mysql
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.1
+        version: 0.18.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.1
+        version: 0.18.4
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.18.4
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
-  name: best_practice_project
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.39.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.39.0
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: '0'
 description: A database abstraction layer, model framework and database framework.
 email: kj@gfish.com
 executables: []
@@ -365,6 +365,7 @@ files:
 - lib/baza/driver/mysql/commands.rb
 - lib/baza/driver/mysql/database.rb
 - lib/baza/driver/mysql/databases.rb
+- lib/baza/driver/mysql/foreign_key.rb
 - lib/baza/driver/mysql/index.rb
 - lib/baza/driver/mysql/indexes.rb
 - lib/baza/driver/mysql/result.rb
@@ -406,6 +407,7 @@ files:
 - lib/baza/driver/pg/create_index_sql_creator.rb
 - lib/baza/driver/pg/database.rb
 - lib/baza/driver/pg/databases.rb
+- lib/baza/driver/pg/foreign_key.rb
 - lib/baza/driver/pg/index.rb
 - lib/baza/driver/pg/indexes.rb
 - lib/baza/driver/pg/result.rb
@@ -437,6 +439,7 @@ files:
 - lib/baza/driver/sqlite3_rhodes.rb
 - lib/baza/dump.rb
 - lib/baza/errors.rb
+- lib/baza/foreign_key.rb
 - lib/baza/idquery.rb
 - lib/baza/index.rb
 - lib/baza/jdbc_driver.rb
@@ -486,6 +489,7 @@ files:
 - spec/support/driver_collection.rb
 - spec/support/driver_columns_collection.rb
 - spec/support/driver_databases_collection.rb
+- spec/support/driver_foreign_keys_collection.rb
 - spec/support/driver_indexes_collection.rb
 - spec/support/driver_tables_collection.rb
 - spec/support/driver_users_collection.rb
@@ -509,7 +513,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A database abstraction layer, model framework and database framework.