baza 0.0.38 → 0.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a023d1752c079d9018cb06a5bdeaac2e86ecfc0734983a81db8e0212eae3e781
-  data.tar.gz: 1435ebdda514818695aff2314609a8a05e0bc021cff3cd5650c3bb69fe9bbeb2
+  metadata.gz: de10fe5a0d1fced254dec4212f20adb172415c8a46d97280ddcdf7d1cd4af107
+  data.tar.gz: 4be4bf7592c14cd8bc7a1b1c5466db3a4909daa0305f4094d8bca494be24424c
 SHA512:
-  metadata.gz: 100e78cf3b0f1c84e45049260190e2d3e134a4f47b62b50df2955a6aa0fb85adde9fcf4a36c797480359473a81b3845a97c99e26f07432f8901a6b045622d581
-  data.tar.gz: 330e48088ea16f46d78f685e0238882b2b7acf4497e18d80b020790fcc01b78fd62168cf53364f01f149d6befdcf5f6ee5796100aae8884a7c1ccec4e88410aa
+  metadata.gz: 53b739c18362c3bb57893f421bb1f15fad244590faead114b8bd2c36c9755779c06b21a737a0ce73454e7f6bb594823e27c88296cdf9009ff5124a98d2cc7638
+  data.tar.gz: bd82734d7a67b82945806ba35551b87d97bdf2df96c1b0e2f91c03162122596fc032dcebc8a59dd053b08ceeb922b517efe8018d8f2887e6ff3d2704b929ef19

data/Rakefile

@@ -11,20 +11,6 @@ rescue Bundler::BundlerError => e
 end
 require "rake"
 
-require "jeweler"
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "baza"
-  gem.homepage = "http://github.com/kaspernj/baza"
-  gem.license = "MIT"
-  gem.summary = %(A database abstraction layer, model framework and database framework.)
-  gem.description = %(A database abstraction layer, model framework and database framework.)
-  gem.email = "kj@gfish.com"
-  gem.authors = ["Kasper Johansen"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 require "rspec/core"
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec) do |spec|

data/lib/baza/database.rb

@@ -38,7 +38,7 @@ class Baza::Database
     list_args[:name] = args.fetch(:name) if args[:name]
 
     ArrayEnumerator.new do |yielder|
-      @db.tables.list(list_args) do |table|
+      @db.tables.list(**list_args) do |table|
         yielder << table
       end
     end

data/lib/baza/db.rb

@@ -184,7 +184,7 @@ class Baza::Db
 
       table_name = table.delete(:name)
       puts "Creating table: '#{table_name}'." if debug
-      db.tables.create(table_name, table)
+      db.tables.create(table_name, **table)
 
       limit_from = 0
       limit_incr = 1000
@@ -196,7 +196,7 @@ class Baza::Db
           col_args = nil
 
           if table_args && table_args[:columns]
-            d_rows.each do |col_name, _col_data|
+            d_rows.each_key do |col_name|
               col_args = table_args[:columns][col_name] if table_args && table_args[:columns]
               d_rows[col_name] = "" if col_args && col_args[:empty]
             end
@@ -371,7 +371,7 @@ class Baza::Db
   end
 
   # Defines all the driver methods: tables, columns and so on
-  DRIVER_PARTS = [:databases, :tables, :commands, :columns, :indexes, :users, :sqlspecs].freeze
+  DRIVER_PARTS = [:databases, :foreign_keys, :tables, :commands, :columns, :indexes, :users, :sqlspecs].freeze
   DRIVER_PARTS.each do |driver_part|
     define_method(driver_part) do
       if instance_variable_defined?(:"@#{driver_part}")
@@ -444,7 +444,8 @@ class Baza::Db
   end
 
   def sqlite?
-    @driver.class.name.downcase.include?("sqlite")
+    @driver.class.name.downcase.include?("sqlite") ||
+      (@driver.class.name == "Baza::Driver::ActiveRecord" && @driver.driver_type == :sqlite3)
   end
 
   def mysql?

data/lib/baza/driver/active_record/columns.rb

@@ -4,7 +4,7 @@ class Baza::Driver::ActiveRecord::Columns
     @proxy_to = ::Baza::Driver.const_get(StringCases.snake_to_camel(@args[:db].driver.driver_type)).const_get(:Columns).new(@args)
   end
 
-  def method_missing(name, *args, &blk)
-    @proxy_to.__send__(name, *args, &blk)
+  def method_missing(...)
+    @proxy_to.__send__(...)
   end
 end

data/lib/baza/driver/active_record/commands.rb

@@ -4,7 +4,7 @@ class Baza::Driver::ActiveRecord::Commands
     @proxy_to = ::Baza::Driver.const_get(StringCases.snake_to_camel(@db.driver.driver_type)).const_get(:Commands).new(args)
   end
 
-  def method_missing(name, *args, &blk)
-    @proxy_to.__send__(name, *args, &blk)
+  def method_missing(...)
+    @proxy_to.__send__(...)
   end
 end

data/lib/baza/driver/active_record/databases.rb

@@ -4,7 +4,7 @@ class Baza::Driver::ActiveRecord::Databases
     @proxy_to = ::Baza::Driver.const_get(StringCases.snake_to_camel(@args[:db].driver.driver_type)).const_get(:Databases).new(@args)
   end
 
-  def method_missing(name, *args, &blk)
-    @proxy_to.__send__(name, *args, &blk)
+  def method_missing(...)
+    @proxy_to.__send__(...)
   end
 end

data/lib/baza/driver/active_record/foreign_keys.rb

@@ -0,0 +1,13 @@
+class Baza::Driver::ActiveRecord::ForeignKeys
+  def initialize(db:)
+    @proxy_to = ::Baza::Driver.const_get(StringCases.snake_to_camel(db.driver.driver_type)).const_get(:ForeignKeys).new(db: db)
+  end
+
+  def method_missing(...)
+    @proxy_to.__send__(...)
+  end
+
+  def respond_to_missing?(method_name)
+    @proxy.respond_to?(method_name) || super
+  end
+end

data/lib/baza/driver/active_record/indexes.rb

@@ -4,7 +4,7 @@ class Baza::Driver::ActiveRecord::Indexes
     @proxy_to = ::Baza::Driver.const_get(StringCases.snake_to_camel(@args[:db].driver.driver_type)).const_get(:Indexes).new(@args)
   end
 
-  def method_missing(name, *args, &blk)
-    @proxy_to.__send__(name, *args, &blk)
+  def method_missing(...)
+    @proxy_to.__send__(...)
   end
 end

data/lib/baza/driver/active_record/tables.rb

@@ -3,10 +3,10 @@ class Baza::Driver::ActiveRecord::Tables
     @args = args
 
     require "#{File.dirname(__FILE__)}/../#{@args.fetch(:db).driver.driver_type}"
-    @proxy_to = ::Baza::Driver.const_get(StringCases.snake_to_camel(@args.fetch(:db).driver.driver_type)).const_get(:Tables).new(@args)
+    @proxy_to = ::Baza::Driver.const_get(StringCases.snake_to_camel(@args.fetch(:db).driver.driver_type)).const_get(:Tables).new(**@args)
   end
 
-  def method_missing(name, *args, &blk)
-    @proxy_to.__send__(name, *args, &blk)
+  def method_missing(...)
+    @proxy_to.__send__(...)
   end
 end

data/lib/baza/driver/active_record/users.rb

@@ -6,7 +6,7 @@ class Baza::Driver::ActiveRecord::Users
     @proxy_to = ::Baza::Driver.const_get(StringCases.snake_to_camel(@args.fetch(:db).driver.driver_type)).const_get(:Users).new(@args)
   end
 
-  def method_missing(name, *args, &blk)
-    @proxy_to.__send__(name, *args, &blk)
+  def method_missing(...)
+    @proxy_to.__send__(...)
   end
 end

data/lib/baza/driver/active_record.rb

@@ -115,6 +115,8 @@ class Baza::Driver::ActiveRecord < Baza::BaseSqlDriver
 
   def close
     @conn.close
+  rescue ActiveRecord::ActiveRecordError => e
+    raise e unless e.message == "Cannot expire connection, it is not currently leased."
   end
 
   def transaction
@@ -147,7 +149,7 @@ class Baza::Driver::ActiveRecord < Baza::BaseSqlDriver
       attributes[column_name.to_s] = value_array.last
     end
 
-    attributes = attributes.delete_if { |_key, value| value.nil? } if model.new_record?
+    attributes = attributes.compact if model.new_record?
 
     table_name = model.class.table_name
 

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

@@ -3,7 +3,7 @@ class Baza::Driver::Mysql::Columns
     @db = args.fetch(:db)
   end
 
-  DATA_SQL_ALLOWED_KEYS = [:type, :maxlength, :name, :primarykey, :autoincr, :default, :comment, :after, :first, :storage, :null, :renames].freeze
+  DATA_SQL_ALLOWED_KEYS = %i[foreign_key type maxlength name primarykey autoincr default comment after first storage null renames].freeze
   def data_sql(data)
     data.each_key do |key|
       raise "Invalid key: '#{key}' (#{key.class.name})." unless DATA_SQL_ALLOWED_KEYS.include?(key)

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

@@ -10,47 +10,20 @@ class Baza::Driver::Mysql::Database < Baza::Database
     self
   end
 
-  CREATE_ALLOWED_KEYS = [:columns, :indexes, :temp, :return_sql].freeze
   # Creates a new table by the given name and data.
-  def create_table(name, data, args = nil)
-    raise "No columns was given for '#{name}'." if !data[:columns] || data[:columns].empty?
-
-    sql = "CREATE"
-    sql << " TEMPORARY" if data[:temp]
-    sql << " TABLE #{@db.quote_table(name)} ("
-
-    first = true
-    data[:columns].each do |col_data|
-      sql << ", " unless first
-      first = false if first
-      col_data.delete(:after) if col_data[:after]
-      sql << @db.columns.data_sql(col_data)
-    end
-
-    if data[:indexes] && !data[:indexes].empty?
-      sql << ", "
-      sql << Baza::Driver::Mysql::Table.create_indexes(
-        data[:indexes],
-        db: @db,
-        return_sql: true,
-        create: false,
-        on_table: false,
-        table_name: name
+  def create_table(name, columns:, indexes: nil, return_sql: false, temp: false)
+    raise "No columns was given for '#{name}'." if !columns || columns.empty?
+
+    sql = Baza::Driver::Mysql::Sql::CreateTable
+      .new(
+        columns: columns,
+        indexes: indexes,
+        name: name,
+        temporary: temp
       )
-    end
-
-    sql << ")"
-
-    # return [sql] if args && args[:return_sql]
-
-    sql = Baza::Driver::Mysql::Sql::CreateTable.new(
-      columns: data.fetch(:columns),
-      indexes: data[:indexes],
-      name: name,
-      temporary: data[:temp]
-    ).sql
+      .sql
 
-    return sql if args && args[:return_sql]
+    return sql if return_sql
 
     use do
       sql.each do |sql_i|

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

@@ -7,6 +7,8 @@ class Baza::Driver::Mysql::ForeignKey < Baza::ForeignKey
     @column_name = data.fetch(:COLUMN_NAME)
     @name = data.fetch(:CONSTRAINT_NAME)
     @table_name = data.fetch(:TABLE_NAME)
+    @referenced_table_name = data.fetch(:REFERENCED_TABLE_NAME)
+    @referenced_column_name = data.fetch(:REFERENCED_COLUMN_NAME)
   end
 
   def drop

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

@@ -0,0 +1,13 @@
+class Baza::Driver::Mysql::ForeignKeys
+  attr_reader :db
+
+  def initialize(db:)
+    @db = db
+  end
+
+  def create(from:, to:)
+    sql = "ALTER TABLE #{from[0]} ADD FOREIGN KEY (#{from[1]}) REFERENCES #{to[0]}(#{to[1]})"
+
+    db.query(sql)
+  end
+end

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

@@ -1,5 +1,5 @@
 class Baza::Driver::Mysql::Sql::Column
-  DATA_SQL_ALLOWED_KEYS = [:type, :maxlength, :name, :primarykey, :autoincr, :default, :comment, :after, :first, :storage, :null, :renames].freeze
+  DATA_SQL_ALLOWED_KEYS = %i[foreign_key type maxlength name primarykey autoincr default comment after first storage null renames].freeze
 
   attr_reader :data
 
@@ -7,7 +7,7 @@ class Baza::Driver::Mysql::Sql::Column
     @data = data
   end
 
-  def sql
+  def sql # rubocop:disable Metrics/AbcSize
     data.each_key do |key|
       raise "Invalid key: '#{key}' (#{key.class.name})." unless DATA_SQL_ALLOWED_KEYS.include?(key)
     end
@@ -22,6 +22,7 @@ class Baza::Driver::Mysql::Sql::Column
     sql << " PRIMARY KEY" if data[:primarykey]
     sql << " AUTO_INCREMENT" if data[:autoincr]
     sql << " NOT NULL" if data.key?(:null) && !data[:null]
+    sql << " REFERENCES #{data.fetch(:foreign_key).fetch(:to).fetch(0)}(#{data.fetch(:foreign_key).fetch(:to).fetch(1)})" if data[:foreign_key]
 
     if data.key?(:default_func)
       sql << " DEFAULT #{data[:default_func]}"

data/lib/baza/driver/mysql/sql/create_table.rb

@@ -15,7 +15,10 @@ class Baza::Driver::Mysql::Sql::CreateTable
     @columns.each do |col_data|
       sql << ", " unless first
       first = false if first
+
+      col_data = col_data.clone
       col_data.delete(:after) if col_data[:after]
+      col_data.delete(:foreign_key)
 
       sql << Baza::Driver::Mysql::Sql::Column.new(col_data).sql.first
     end
@@ -30,6 +33,14 @@ class Baza::Driver::Mysql::Sql::CreateTable
       ).sql.first
     end
 
+    @columns.each do |col_data|
+      next unless col_data.key?(:foreign_key)
+
+      sql << ","
+      sql << " CONSTRAINT `#{col_data.fetch(:foreign_key).fetch(:name)}`" if col_data.fetch(:foreign_key)[:name]
+      sql << " FOREIGN KEY (`#{col_data.fetch(:name)}`) REFERENCES `#{col_data.fetch(:foreign_key).fetch(:to).fetch(0)}` (`#{col_data.fetch(:foreign_key).fetch(:to).fetch(1)}`)"
+    end
+
     sql << ")"
 
     [sql]

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

@@ -108,7 +108,8 @@ class Baza::Driver::Mysql::Table < Baza::Table
         INFORMATION_SCHEMA.KEY_COLUMN_USAGE
 
       WHERE
-        REFERENCED_TABLE_SCHEMA = #{@db.quote_value(@db.current_database_name)} AND
+        TABLE_SCHEMA = (SELECT DATABASE()) AND
+        CONSTRAINT_NAME != 'PRIMARY' AND
         TABLE_NAME = #{@db.quote_value(name)}
     "
 
@@ -132,6 +133,44 @@ class Baza::Driver::Mysql::Table < Baza::Table
     result
   end
 
+  def referenced_foreign_keys(args = {})
+    sql = "
+      SELECT
+        TABLE_NAME,
+        COLUMN_NAME,
+        CONSTRAINT_NAME,
+        REFERENCED_TABLE_NAME,
+        REFERENCED_COLUMN_NAME
+
+      FROM
+        INFORMATION_SCHEMA.KEY_COLUMN_USAGE
+
+      WHERE
+        TABLE_SCHEMA = (SELECT DATABASE()) AND
+        CONSTRAINT_NAME != 'PRIMARY' AND
+        REFERENCED_TABLE_NAME = #{@db.quote_value(name)}
+    "
+
+    sql << " AND CONSTRAINT_NAME = #{@db.quote_value(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
@@ -253,11 +292,11 @@ class Baza::Driver::Mysql::Table < Baza::Table
     @name = newname
     @tables.__send__(:add_to_list, self)
 
-    @list.each do |_name, column|
+    @list.each_value do |column|
       column.args[:table_name] = newname
     end
 
-    @indexes_list.each do |_name, index|
+    @indexes_list.each_value do |index|
       index.table_name = newname
     end
   end
@@ -356,7 +395,7 @@ class Baza::Driver::Mysql::Table < Baza::Table
 
   # Changes the engine for a table.
   def engine=(newengine)
-    raise "Invalid engine: '#{newengine}'." unless newengine.to_s =~ /^[A-z]+$/
+    raise "Invalid engine: '#{newengine}'." unless newengine.to_s.match?(/^[A-z]+$/)
     @db.query("ALTER TABLE #{@db.quote_table(name)} ENGINE = #{newengine}") if engine.to_s != newengine.to_s
     @data[:ENGINE] = newengine
   end

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

@@ -5,9 +5,9 @@ class Baza::Driver::Mysql::Tables < Baza::Tables
   attr_reader :db, :list
 
   # Constructor. This should not be called manually.
-  def initialize(args)
+  def initialize(db:, **args)
     @args = args
-    @db = @args.fetch(:db)
+    @db = db
     @list_mutex = Monitor.new
     @list = Wref::Map.new
     @list_should_be_reloaded = true
@@ -18,11 +18,24 @@ class Baza::Driver::Mysql::Tables < Baza::Tables
     @list.clean
   end
 
+  def exists?(table_name)
+    table_name = table_name.to_s
+    table = @list[table_name]
+
+    return true if table
+
+    list(name: table_name) do
+      return true
+    end
+
+    false
+  end
+
   # Returns a table by the given table-name.
   def [](table_name)
     table_name = table_name.to_s
-
     table = @list[table_name]
+
     return table if table
 
     list(name: table_name) do |table_i|
@@ -33,14 +46,14 @@ class Baza::Driver::Mysql::Tables < Baza::Tables
   end
 
   # Yields the tables of the current database.
-  def list(args = {})
+  def list(database: nil, name: nil)
     ret = [] unless block_given?
 
     where_args = {}
-    where_args["TABLE_NAME"] = args.fetch(:name) if args[:name]
+    where_args["TABLE_NAME"] = name if name
 
-    if args[:database]
-      where_args["TABLE_SCHEMA"] = args.fetch(:database)
+    if database
+      where_args["TABLE_SCHEMA"] = database
     else
       where_args["TABLE_SCHEMA"] = @db.opts.fetch(:db)
     end
@@ -74,8 +87,8 @@ class Baza::Driver::Mysql::Tables < Baza::Tables
     end
   end
 
-  def create(name, data, args = nil)
-    @db.current_database.create_table(name, data, args)
+  def create(name, **opts)
+    @db.current_database.create_table(name, **opts)
   end
 
 private

data/lib/baza/driver/mysql2/foreign_keys.rb

@@ -0,0 +1,2 @@
+class Baza::Driver::Mysql2::ForeignKeys < Baza::Driver::Mysql::ForeignKeys
+end

data/lib/baza/driver/mysql2.rb

@@ -3,7 +3,7 @@ Baza.load_driver("mysql")
 class Baza::Driver::Mysql2 < Baza::MysqlBaseDriver
   AutoAutoloader.autoload_sub_classes(self, __FILE__)
 
-  attr_reader :conn, :conns
+  attr_reader :conn, :conns, :encoding
 
   # Helper to enable automatic registering of database using Baza::Db.from_object
   def self.from_object(args)
@@ -54,7 +54,7 @@ class Baza::Driver::Mysql2 < Baza::MysqlBaseDriver
   # Respawns the connection to the MySQL-database.
   def reconnect
     @mutex.synchronize do
-      require "mysql2" unless ::Object.const_defined?("Mysql2")
+      require "mysql2" unless ::Object.const_defined?(:Mysql2)
 
       args = {
         host: @db.opts[:host],
@@ -63,7 +63,8 @@ class Baza::Driver::Mysql2 < Baza::MysqlBaseDriver
         database: @db.opts[:db],
         port: @port,
         symbolize_keys: true,
-        cache_rows: false
+        cache_rows: false,
+        encoding: encoding
       }
 
       # Symbolize keys should also be given here, else table-data wont be symbolized for some reason - knj.
@@ -84,14 +85,14 @@ class Baza::Driver::Mysql2 < Baza::MysqlBaseDriver
         @conn = ::Mysql2::Client.new(args)
       end
 
-      query("SET NAMES '#{esc(@encoding)}'") if @encoding
+      query("SET NAMES '#{esc(encoding)}'") if encoding
     end
   end
 
   # Executes a query and returns the result.
   def query(str)
     str = str.to_s
-    str = str.force_encoding("UTF-8") if @encoding == "utf8" && str.respond_to?(:force_encoding)
+    str = str.force_encoding("UTF-8") if encoding == "utf8" && str.respond_to?(:force_encoding)
     tries = 0
 
     begin

data/lib/baza/driver/mysql_java.rb

@@ -65,7 +65,7 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
         @jdbc_loaded = true
         @conn = @db.opts.fetch(:conn)
       else
-        com.mysql.jdbc.Driver
+        com.mysql.cj.jdbc.Driver
         @conn = java.sql::DriverManager.getConnection(jdbc_connect_command)
       end
 
@@ -130,7 +130,7 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
           sql << @db.quote_value(val)
         end
       else
-        hash.each do |_key, val|
+        hash.each_value do |val|
           if first_key
             first_key = false
           else

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

@@ -3,7 +3,7 @@ class Baza::Driver::Pg::Columns
     @db = args.fetch(:db)
   end
 
-  DATA_SQL_ALLOWED_KEYS = [:type, :maxlength, :name, :primarykey, :autoincr, :default, :comment, :after, :first, :storage, :null, :renames].freeze
+  DATA_SQL_ALLOWED_KEYS = %i[foreign_key type maxlength name primarykey autoincr default comment after first storage null renames].freeze
   def data_sql(data)
     data.each_key do |key|
       raise "Invalid key: '#{key}' (#{key.class.name})." unless DATA_SQL_ALLOWED_KEYS.include?(key)

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

@@ -6,12 +6,9 @@ class Baza::Driver::Pg::CreateIndexSqlCreator
   end
 
   def sqls
-    sqls = []
-    @indexes.each do |index_data|
-      sqls << create_sql(index_data, @create_args)
+    @indexes.map do |index_data|
+      create_sql(index_data, @create_args)
     end
-
-    sqls
   end
 
   def name_from_table_and_columns(table_name, column_names)

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

@@ -55,9 +55,9 @@ class Baza::Driver::Pg::Database < Baza::Database
 
   CREATE_ALLOWED_KEYS = [:columns, :indexes, :temp, :return_sql].freeze
   # Creates a new table by the given name and data.
-  def create_table(table_name, data, args = nil)
+  def create_table(table_name, **args)
     use do
-      db.tables.create(table_name, data, args)
+      db.tables.create(table_name, **args)
     end
   end
 

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

@@ -7,6 +7,8 @@ class Baza::Driver::Pg::ForeignKey < Baza::ForeignKey
     @column_name = data.fetch(:column_name)
     @name = data.fetch(:constraint_name)
     @table_name = data.fetch(:table_name)
+    @referenced_column_name = data.fetch(:foreign_column_name)
+    @referenced_table_name = data.fetch(:foreign_table_name)
   end
 
   def drop

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

@@ -0,0 +1,13 @@
+class Baza::Driver::Pg::ForeignKeys
+  attr_reader :db
+
+  def initialize(db:)
+    @db = db
+  end
+
+  def create(from:, to:)
+    sql = "ALTER TABLE #{from[0]} ADD FOREIGN KEY (#{from[1]}) REFERENCES #{to[0]}(#{to[1]})"
+
+    db.query(sql)
+  end
+end

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

@@ -122,7 +122,11 @@ private
       elsif type_sym == :float
         value.to_f
       elsif type_sym == :time
-        Time.parse(value)
+        if value.is_a?(Time) # ActiveRecord might already have parsed it for us
+          value
+        else
+          Time.parse(value)
+        end
       elsif type_sym == :date
         Date.parse(value)
       elsif type_sym == :string