baza 0.0.20 → 0.0.21

data/lib/baza/{drivers → driver}/mysql/unbuffered_result.rb

@@ -50,8 +50,14 @@ class Baza::Driver::Mysql::UnbufferedResult < Baza::ResultBase
 
   # Loops over every single result yielding it.
   def each
-    while row = fetch
-      yield row
+    loop do
+      row = fetch
+
+      if row
+        yield row
+      else
+        break
+      end
     end
   end
 

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

@@ -0,0 +1,22 @@
+class Baza::Driver::Mysql::User
+  attr_reader :name
+
+  def initialize(args)
+    @args = args
+    @data = args.fetch(:data)
+    @db = args.fetch(:db)
+  end
+
+  def name
+    @data.fetch(:User)
+  end
+
+  def host
+    @data.fetch(:Host)
+  end
+
+  def drop
+    @db.query("DROP USER '#{@db.esc(name)}'@'#{@db.esc(host)}'")
+    true
+  end
+end

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

@@ -0,0 +1,39 @@
+require_relative "user"
+
+class Baza::Driver::Mysql::Users
+  def initialize(args)
+    @args = args
+    @db = @args.fetch(:db)
+  end
+
+  def list
+    result = []
+    @db.query("SELECT * FROM mysql.user") do |user_data|
+      user = Baza::Driver::Mysql::User.new(
+        db: @db,
+        data: user_data
+      )
+
+      if block_given?
+        yield user
+      else
+        result << user
+      end
+    end
+
+    result unless block_given?
+  end
+
+  def find_by_name(name)
+    list do |user|
+      return user if user.name == name.to_s
+    end
+
+    raise Baza::Errors::UserNotFound, "Could not find a user by that name: #{name}"
+  end
+
+  def create(data)
+    @db.query("CREATE USER '#{@db.esc(data.fetch(:name))}'@'#{@db.esc(data.fetch(:host))}' IDENTIFIED BY '#{data.fetch(:password)}'")
+    find_by_name(data.fetch(:name))
+  end
+end

data/lib/baza/{drivers → driver}/mysql2.rb

@@ -1,19 +1,7 @@
 Baza.load_driver("mysql")
 
 class Baza::Driver::Mysql2 < Baza::MysqlBaseDriver
-  path = "#{File.dirname(__FILE__)}/mysql2"
-
-  autoload :Database, "#{path}/database"
-  autoload :Databases, "#{path}/databases"
-  autoload :Table, "#{path}/table"
-  autoload :Tables, "#{path}/tables"
-  autoload :Column, "#{path}/column"
-  autoload :Columns, "#{path}/columns"
-  autoload :Index, "#{path}/index"
-  autoload :Indexes, "#{path}/indexes"
-  autoload :Result, "#{path}/result"
-  autoload :UnbufferedResult, "#{path}/unbuffered_result"
-  autoload :Sqlspecs, "#{path}/sqlspecs"
+  AutoAutoloader.autoload_sub_classes(self, __FILE__)
 
   attr_reader :conn, :conns
 
@@ -35,10 +23,10 @@ class Baza::Driver::Mysql2 < Baza::MysqlBaseDriver
     nil
   end
 
-  def initialize(baza)
+  def initialize(db)
     super
 
-    @opts = @baza.opts
+    @opts = @db.opts
 
     require "monitor"
     @mutex = Monitor.new
@@ -49,8 +37,8 @@ class Baza::Driver::Mysql2 < Baza::MysqlBaseDriver
       @encoding = "utf8"
     end
 
-    if @baza.opts.key?(:port)
-      @port = @baza.opts[:port].to_i
+    if @db.opts.key?(:port)
+      @port = @db.opts[:port].to_i
     else
       @port = 3306
     end
@@ -66,11 +54,13 @@ 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")
+
       args = {
-        host: @baza.opts[:host],
-        username: @baza.opts[:user],
-        password: @baza.opts[:pass],
-        database: @baza.opts[:db],
+        host: @db.opts[:host],
+        username: @db.opts[:user],
+        password: @db.opts[:pass],
+        database: @db.opts[:db],
         port: @port,
         symbolize_keys: true,
         cache_rows: false
@@ -78,35 +68,20 @@ class Baza::Driver::Mysql2 < Baza::MysqlBaseDriver
 
       # Symbolize keys should also be given here, else table-data wont be symbolized for some reason - knj.
       @query_args = {symbolize_keys: true}
-      @query_args[:cast] = false unless @baza.opts[:type_translation]
-      @query_args.merge!(@baza.opts[:query_args]) if @baza.opts[:query_args]
+      @query_args[:cast] = false unless @db.opts[:type_translation]
+      @query_args.merge!(@db.opts[:query_args]) if @db.opts[:query_args]
 
       pos_args = [:as, :async, :cast_booleans, :database_timezone, :application_timezone, :cache_rows, :connect_flags, :cast]
       pos_args.each do |key|
-        args[key] = @baza.opts[key] if @baza.opts.key?(key)
+        args[key] = @db.opts[key] if @db.opts.key?(key)
       end
 
       args[:as] = :array
 
-      tries = 0
-      begin
-        tries += 1
-        if @baza.opts[:conn]
-          @conn = @baza.opts[:conn]
-        else
-          require "mysql2"
-          @conn = Mysql2::Client.new(args)
-        end
-      rescue => e
-        if tries <= 3
-          if e.message == "Can't connect to local MySQL server through socket '/var/run/mysqld/mysqld.sock' (111)"
-            sleep 1
-            tries += 1
-            retry
-          end
-        end
-
-        raise e
+      if @db.opts[:conn]
+        @conn = @db.opts[:conn]
+      else
+        @conn = ::Mysql2::Client.new(args)
       end
 
       query("SET NAMES '#{esc(@encoding)}'") if @encoding
@@ -152,11 +127,6 @@ class Baza::Driver::Mysql2 < Baza::MysqlBaseDriver
     @conn.escape(string.to_s)
   end
 
-  # Returns the last inserted ID for the connection.
-  def last_id
-    @mutex.synchronize { return @conn.last_id.to_i }
-  end
-
   # Closes the connection threadsafe.
   def close
     @mutex.synchronize { @conn.close }
@@ -165,7 +135,7 @@ class Baza::Driver::Mysql2 < Baza::MysqlBaseDriver
   # Destroyes the connection.
   def destroy
     @conn = nil
-    @baza = nil
+    @db = nil
     @mutex = nil
     @encoding = nil
     @query_args = nil

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

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

data/lib/baza/{drivers → driver}/mysql2/result.rb

@@ -3,7 +3,7 @@ class Baza::Driver::Mysql2::Result < Baza::ResultBase
   # Constructor. This should not be called manually.
   def initialize(driver, result)
     @result = result
-    @type_translation = driver.baza.opts[:type_translation]
+    @type_translation = driver.db.opts[:type_translation]
   end
 
   # Returns a single result.
@@ -15,6 +15,8 @@ class Baza::Driver::Mysql2::Result < Baza::ResultBase
 
   # Loops over every single result yielding it.
   def each
+    return unless @result
+
     @result.each(as: :hash, symbolize_keys: true) do |row|
       next unless row # This sometimes happens when streaming results...
       row = Hash[row.map { |k, v| [k, v.to_s] }] if @type_translation == :string

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

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

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

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

data/lib/baza/{drivers → driver}/mysql_java.rb

@@ -1,19 +1,7 @@
 Baza.load_driver("mysql")
 
 class Baza::Driver::MysqlJava < Baza::JdbcDriver
-  path = "#{File.dirname(__FILE__)}/mysql_java"
-
-  autoload :Database, "#{path}/database"
-  autoload :Databases, "#{path}/databases"
-  autoload :Table, "#{path}/table"
-  autoload :Tables, "#{path}/tables"
-  autoload :Column, "#{path}/column"
-  autoload :Columns, "#{path}/columns"
-  autoload :Index, "#{path}/index"
-  autoload :Indexes, "#{path}/indexes"
-  autoload :Result, "#{path}/result"
-  autoload :UnbufferedResult, "#{path}/unbuffered_result"
-  autoload :Sqlspecs, "#{path}/sqlspecs"
+  AutoAutoloader.autoload_sub_classes(self, __FILE__)
 
   attr_reader :conn, :conns
 
@@ -32,19 +20,36 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
     nil
   end
 
-  def initialize(baza)
-    super
+  def self.args
+    [{
+      label: "Host",
+      name: "host"
+    }, {
+      label: "Port",
+      name: "port"
+    }, {
+      label: "Username",
+      name: "user"
+    }, {
+      label: "Password",
+      name: "pass"
+    }, {
+      label: "Database",
+      name: "db"
+    }, {
+      label: "Encoding",
+      name: "encoding"
+    }]
+  end
 
-    @opts = @baza.opts
+  def initialize(db)
+    super
 
-    if @opts[:encoding]
-      @encoding = @opts[:encoding]
-    else
-      @encoding = "utf8"
-    end
+    @opts = @db.opts
+    @encoding = @opts[:encoding] || "utf8"
 
-    if @baza.opts.key?(:port)
-      @port = @baza.opts[:port].to_i
+    if @db.opts.key?(:port)
+      @port = @db.opts[:port].to_i
     else
       @port = 3306
     end
@@ -56,12 +61,12 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
   # Respawns the connection to the MySQL-database.
   def reconnect
     @mutex.synchronize do
-      if @baza.opts[:conn]
+      if @db.opts[:conn]
         @jdbc_loaded = true
-        @conn = @baza.opts[:conn]
+        @conn = @db.opts.fetch(:conn)
       else
         com.mysql.jdbc.Driver
-        @conn = java.sql::DriverManager.getConnection("jdbc:mysql://#{@baza.opts[:host]}:#{@port}/#{@baza.opts[:db]}?user=#{@baza.opts[:user]}&password=#{@baza.opts[:pass]}&populateInsertRowWithDefaultValues=true&zeroDateTimeBehavior=round&characterEncoding=#{@encoding}&holdResultsOpenOverStatementClose=true")
+        @conn = java.sql::DriverManager.getConnection(jdbc_connect_command)
       end
 
       query_no_result_set("SET SQL_MODE = ''")
@@ -69,13 +74,6 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
     end
   end
 
-  # Returns the last inserted ID for the connection.
-  def last_id
-    data = query("SELECT LAST_INSERT_ID() AS id").fetch
-    return data[:id].to_i if data[:id]
-    raise "Could not figure out last inserted ID."
-  end
-
   # Closes the connection threadsafe.
   def close
     @mutex.synchronize { @conn.close }
@@ -84,7 +82,7 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
   # Destroyes the connection.
   def destroy
     @conn = nil
-    @baza = nil
+    @db = nil
     @mutex = nil
     @encoding = nil
     @query_args = nil
@@ -92,7 +90,7 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
   end
 
   # Inserts multiple rows in a table. Can return the inserted IDs if asked to in arguments.
-  def insert_multi(tablename, arr_hashes, args = nil)
+  def insert_multi(tablename, arr_hashes, args = {})
     sql = "INSERT INTO `#{tablename}` ("
 
     first = true
@@ -129,7 +127,7 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
             sql << ","
           end
 
-          sql << @baza.sqlval(val)
+          sql << @db.sqlval(val)
         end
       else
         hash.each do |_key, val|
@@ -139,7 +137,7 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
             sql << ","
           end
 
-          sql << @baza.sqlval(val)
+          sql << @db.sqlval(val)
         end
       end
     end
@@ -172,11 +170,35 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
     query_no_result_set("START TRANSACTION")
 
     begin
-      yield @baza
+      yield @db
       query_no_result_set("COMMIT")
     rescue
       query_no_result_set("ROLLBACK")
       raise
     end
   end
+
+private
+
+  def jdbc_connect_command
+    conn_options = {
+      "populateInsertRowWithDefaultValues" => true,
+      "zeroDateTimeBehavior" => "round",
+      "holdResultsOpenOverStatementClose" => true
+    }
+
+    conn_options["user"] = @db.opts.fetch(:user) if @db.opts[:user]
+    conn_options["password"] = @db.opts.fetch(:pass) if db.opts[:pass]
+    conn_options["characterEncoding"] = @encoding if @encoding
+
+    conn_command = "jdbc:mysql://#{@db.opts.fetch(:host)}:#{@port}/#{@db.opts.fetch(:db)}?"
+    first = true
+    conn_options.each do |key, value|
+      conn_command << "&" unless first
+      first = false if first
+      conn_command << "#{key}=#{value}"
+    end
+
+    conn_command
+  end
 end

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

@@ -0,0 +1,2 @@
+class Baza::Driver::MysqlJava::Commands < Baza::Driver::Mysql::Commands
+end

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

@@ -0,0 +1,2 @@
+class Baza::Driver::MysqlJava::Database < Baza::Driver::Mysql::Database
+end

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

@@ -0,0 +1,2 @@
+class Baza::Driver::MysqlJava::Databases < Baza::Driver::Mysql::Databases
+end

data/lib/baza/driver/mysql_java/user.rb

@@ -0,0 +1,2 @@
+class Baza::Driver::MysqlJava::User < Baza::Drivers::Mysql::User
+end