baza 0.0.33 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1636cb2175a8d3d441067544e5ab2236cffdaf59
-  data.tar.gz: b435a6ca05bf3a7f0240f0e5bd726a6714c2afaf
+SHA256:
+  metadata.gz: cf763d9725a54b1f83dc7fdd00181b8361b150c2ebb266b11ad914c9c3d7cbfa
+  data.tar.gz: 1818e5b131b457a5e8bb7a7e06a23a5261e5f4a2fe9812d3de6bdd10b51dccfa
 SHA512:
-  metadata.gz: 33ba5182cf87b242e63f700b75d35698ee7a166d41988ac066a50579c899d1f044f057cf4ed7883443693316e7cdf79dfa3b0ecdd7c988815492b91bfbe4f8d5
-  data.tar.gz: ac1b0ce883e7096a806de147e6baa56be67249b3a1890a453072f3dcb22fc508a446320972d8ff8ed11fa4d1f03d17e7d293d3d8b5cb032b97d7275762aca43c
+  metadata.gz: 3668e2de450161e3e616beeb6c2a40a85f870bd0234956e9c5ac949615f9b49e6e51a4c069675c3ec7a69b81e42603307eafb0b0a3d76da8159981dabdd77580
+  data.tar.gz: a3eee544394d088cf4171cfadab545521a91e42d1cb66ed6cf90fb86c95f25163056526311b6678d2b2088c01b2d4f371fb511da38e1a74ff9bcfdf2b6fbd695

data/VERSION

@@ -1 +1 @@
-0.0.33
+0.0.34

data/baza.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: baza 0.0.33 ruby lib
+# stub: baza 0.0.34 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "baza".freeze
-  s.version = "0.0.33"
+  s.version = "0.0.34"
 
   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 = "2018-04-26"
+  s.date = "2018-06-07"
   s.description = "A database abstraction layer, model framework and database framework.".freeze
   s.email = "kj@gfish.com".freeze
   s.extra_rdoc_files = [
@@ -137,6 +137,9 @@ Gem::Specification.new do |s|
     "lib/baza/driver/sqlite3_java/tables.rb",
     "lib/baza/driver/sqlite3_java/unbuffered_result.rb",
     "lib/baza/driver/sqlite3_rhodes.rb",
+    "lib/baza/driver/tiny.rb",
+    "lib/baza/driver/tiny/commands.rb",
+    "lib/baza/driver/tiny/result.rb",
     "lib/baza/dump.rb",
     "lib/baza/errors.rb",
     "lib/baza/foreign_key.rb",
@@ -202,7 +205,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/kaspernj/baza".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.6.13".freeze
+  s.rubygems_version = "2.7.7".freeze
   s.summary = "A database abstraction layer, model framework and database framework.".freeze
 
   if s.respond_to? :specification_version then

data/lib/baza.rb

@@ -54,7 +54,7 @@ class Baza
     loads = %w(databases database tables table columns column indexes index result commands)
     loads.each do |load|
       file_path = "#{File.dirname(__FILE__)}/baza/driver/#{name}/#{load}"
-      require_relative file_path if File.exist?(file_path)
+      require_relative file_path if File.exist?(file_path) || File.exist?("#{file_path}.rb")
     end
   end
 end

data/lib/baza/base_sql_driver.rb

@@ -214,7 +214,7 @@ class Baza::BaseSqlDriver
   # If it is a number, then just the raw number as a string will be returned.
   # nil's will be NULL and strings will have quotes and will be escaped.
   def self.sqlval(val)
-    if val.is_a?(Fixnum) || val.is_a?(Integer)
+    if val.class.name == "Fixnum" || val.is_a?(Integer)
       val.to_s
     elsif val == nil
       "NULL"

data/lib/baza/database.rb

@@ -20,6 +20,7 @@ class Baza::Database
   end
 
   def name=(new_name)
+    @name_was = @name
     @changes[:name] = new_name
     @name = new_name
   end
@@ -29,7 +30,7 @@ class Baza::Database
   end
 
   def name_was
-    @changes[:name]
+    @name_was
   end
 
   def tables(args = {})

data/lib/baza/db.rb

@@ -300,7 +300,7 @@ class Baza::Db
     if @debug
       print "SQL: #{string}\n"
 
-      if @debug.is_a?(Fixnum) && @debug >= 2
+      if @debug.class.name == "Fixnum" && @debug >= 2
         print caller.join("\n")
         print "\n"
       end

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

@@ -14,7 +14,7 @@ class Baza::Driver::ActiveRecord::Result < Baza::ResultBase
     return unless @result
 
     @result.each do |result|
-      result = result.delete_if { |k, _v| k.is_a?(Fixnum) } # Seems like this happens depending on the version installed? - kaspernj
+      result = result.delete_if { |k, _v| k.class.name == "Fixnum" } # Seems like this happens depending on the version installed? - kaspernj
       result = Hash[result.map { |k, v| [k, v.to_s] }] if @type_translation == :string
 
       yield result.symbolize_keys

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

@@ -59,6 +59,8 @@ class Baza::Driver::Mysql::Database < Baza::Database
     end
   end
 
+private
+
   def rename(new_name)
     new_name = new_name.to_s
     @db.databases.create(name: new_name)

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

@@ -1,23 +1,5 @@
 # This class controls the results for the normal MySQL-driver.
 class Baza::Driver::Mysql::Result < Baza::ResultBase
-  INT_TYPES = {
-    ::Mysql::Field::TYPE_DECIMAL => true,
-    ::Mysql::Field::TYPE_TINY => true,
-    ::Mysql::Field::TYPE_LONG => true,
-    ::Mysql::Field::TYPE_YEAR => true
-  }.freeze
-  FLOAT_TYPES = {
-    ::Mysql::Field::TYPE_DECIMAL => true,
-    ::Mysql::Field::TYPE_FLOAT => true,
-    ::Mysql::Field::TYPE_DOUBLE => true
-  }.freeze
-  TIME_TYPES = {
-    ::Mysql::Field::TYPE_DATETIME => true
-  }.freeze
-  DATE_TYPES = {
-    ::Mysql::Field::TYPE_DATE => true
-  }.freeze
-
   # Constructor. This should not be called manually.
   def initialize(driver, result)
     @driver = driver
@@ -74,16 +56,17 @@ private
   def translate_value_to_type(value, type_no)
     return if value == nil
 
-    if INT_TYPES[type_no]
-      return value.to_i
-    elsif FLOAT_TYPES[type_no]
-      return value.to_f
-    elsif TIME_TYPES[type_no]
-      return Time.parse(value)
-    elsif DATE_TYPES[type_no]
-      return Date.parse(value)
+    case type_no
+    when ::Mysql::Field::TYPE_DECIMAL, ::Mysql::Field::TYPE_TINY, ::Mysql::Field::TYPE_LONG, ::Mysql::Field::TYPE_YEAR
+      value.to_i
+    when ::Mysql::Field::TYPE_DECIMAL, ::Mysql::Field::TYPE_FLOAT, ::Mysql::Field::TYPE_DOUBLE
+      value.to_f
+    when ::Mysql::Field::TYPE_DATETIME
+      Time.parse(value)
+    when ::Mysql::Field::TYPE_DATE
+      Date.parse(value)
     else
-      return value.to_s
+      value.to_s
     end
   end
 end

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

@@ -1,6 +1,6 @@
 class Baza::Driver::Pg::Database < Baza::Database
   def save!
-    rename(name) unless name.to_s == name_was
+    rename(name) unless name.to_s == name_was.to_s
     self
   end
 
@@ -61,9 +61,11 @@ class Baza::Driver::Pg::Database < Baza::Database
     end
   end
 
+private
+
   def rename(new_name)
     with_cloned_conn_and_terminated_connections do |cloned_conn|
-      cloned_conn.query("ALTER DATABASE #{db.sep_database}#{db.escape_database(name_was)}#{db.sep_database} RENAME TO #{db.sep_database}#{db.escape_database(new_name)}#{db.sep_database}")
+      cloned_conn.query("ALTER DATABASE #{db.sep_database}#{db.escape_database(name_was)}#{db.sep_database} RENAME TO #{db.sep_database}#{db.escape_database(name)}#{db.sep_database}")
     end
 
     @name = new_name.to_s
@@ -76,8 +78,8 @@ class Baza::Driver::Pg::Database < Baza::Database
     # Drop database through a cloned connection, because Postgres might bug up if dropping the current
     db.clone_conn(db: other_db.name) do |cloned_conn|
       # Close existing connections to avoid 'is being accessed by other users' errors
-      cloned_conn.query("REVOKE CONNECT ON DATABASE #{db.sep_database}#{db.escape_database(name)}#{db.sep_database} FROM public") unless name_changed?
-      cloned_conn.query("SELECT pid, pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = #{db.sep_val}#{@db.esc(name)}#{db.sep_val} AND pid != pg_backend_pid()")
+      cloned_conn.query("REVOKE CONNECT ON DATABASE #{db.sep_database}#{db.escape_database(name_was)}#{db.sep_database} FROM public") unless name_changed?
+      cloned_conn.query("SELECT pid, pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = #{db.sep_val}#{@db.esc(name_was)}#{db.sep_val} AND pid != pg_backend_pid()")
 
       yield cloned_conn
     end

data/lib/baza/driver/tiny.rb

@@ -0,0 +1,42 @@
+class Baza::Driver::Tiny < Baza::BaseSqlDriver
+  SEPARATOR_DATABASE = "`".freeze
+  SEPARATOR_TABLE = "".freeze
+  SEPARATOR_COLUMN = "".freeze
+  SEPARATOR_VALUE = "'".freeze
+  SEPARATOR_INDEX = "`".freeze
+
+  def initialize(db)
+    super
+
+    @sep_database = SEPARATOR_DATABASE
+    @sep_table = SEPARATOR_TABLE
+    @sep_col = SEPARATOR_COLUMN
+    @sep_val = SEPARATOR_VALUE
+    @sep_index = SEPARATOR_INDEX
+  end
+
+  def initialize(db)
+    super
+    @client = TinyTds::Client.new(username: db.opts.fetch(:user), password: db.opts.fetch(:pass), host: db.opts.fetch(:host))
+  end
+
+  def close
+    @client.close
+  end
+
+  def insert(table_name, data, args = {})
+    sql = Baza::SqlQueries::GenericInsert.new({
+      db: @db,
+      table_name: table_name,
+      data: data
+    }.merge(args)).to_sql
+
+    result = @client.execute(sql)
+    result.insert if args[:return_id]
+  end
+
+  def query(sql)
+    result = @client.execute(sql)
+    Baza::Driver::Tiny::Result.new(result)
+  end
+end

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

@@ -0,0 +1,9 @@
+class Baza::Driver::Tiny::Commands
+  def initialize(db:)
+    @db = db
+  end
+
+  def last_id
+    @db.query("SELECT SCOPE_IDENTITY() AS id").first.fetch(:id)
+  end
+end

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

@@ -0,0 +1,9 @@
+class Baza::Driver::Tiny::Result < Baza::ResultBase
+  def initialize(result)
+    @result = result.to_a
+  end
+
+  def each(*args, &blk)
+    @result.each(*args, &blk)
+  end
+end

data/lib/baza/row.rb

@@ -16,13 +16,13 @@ class Baza::Row
     @args[:col_id] ||= :id
     raise "No table given." unless @args[:table]
 
-    if @args[:data] && (@args[:data].is_a?(Integer) || @args[:data].is_a?(Fixnum) || @args[:data].is_a?(String))
+    if @args[:data] && (@args[:data].is_a?(Integer) || @args[:data].class.name == "Fixnum" || @args[:data].is_a?(String))
       @data = {@args[:col_id].to_sym => @args[:data].to_s}
       reload
     elsif @args[:data] && @args.fetch(:data).is_a?(Hash)
       @data = {}
       @args.fetch(:data).each do |key, value|
-        key = key.to_sym unless key.is_a?(Fixnum)
+        key = key.to_sym unless key.class.name == "Fixnum"
         @data[key] = value
       end
     elsif @args[:id]

data/spec/support/driver_collection.rb

@@ -340,7 +340,7 @@ shared_examples_for "a baza driver" do
     row = db_with_type_translation.select(:test, text: "Kasper").fetch
 
     expect(row.fetch(:text).class).to eq String
-    expect(row.fetch(:number).class).to eq Fixnum
+    expect(row.fetch(:number).class.name).to eq "Fixnum"
     expect(row.fetch(:float).class).to eq Float
 
     if db.driver.conn.class.name == "ActiveRecord::ConnectionAdapters::SQLite3Adapter"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baza
 version: !ruby/object:Gem::Version
-  version: 0.0.33
+  version: 0.0.34
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-26 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_enumerator
@@ -430,6 +430,9 @@ files:
 - lib/baza/driver/sqlite3_java/tables.rb
 - lib/baza/driver/sqlite3_java/unbuffered_result.rb
 - lib/baza/driver/sqlite3_rhodes.rb
+- lib/baza/driver/tiny.rb
+- lib/baza/driver/tiny/commands.rb
+- lib/baza/driver/tiny/result.rb
 - lib/baza/dump.rb
 - lib/baza/errors.rb
 - lib/baza/foreign_key.rb
@@ -512,7 +515,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A database abstraction layer, model framework and database framework.