baza 0.0.20 → 0.0.21

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

@@ -0,0 +1,39 @@
+class Baza::Driver::Mysql::Commands
+  def initialize(args)
+    @db = args.fetch(:db)
+  end
+
+  def upsert_duplicate_key(table_name, updates, terms, args = {})
+    Baza::SqlQueries::MysqlUpsertDuplicateKey.new(
+      db: @db,
+      table_name: table_name,
+      updates: updates,
+      terms: terms,
+      buffer: args[:buffer],
+      return_id: args[:return_id]
+    ).execute
+  end
+
+  def upsert(table_name, updates, terms, args = {})
+    if args[:buffer]
+      Baza::SqlQueries::NonAtomicUpsert.new(
+        db: @db,
+        table_name: table_name,
+        buffer: args[:buffer],
+        terms: terms,
+        updates: updates
+      ).execute
+    else
+      Baza::SqlQueries::MysqlUpsert.new(
+        db: @db,
+        table_name: table_name,
+        updates: updates,
+        terms: terms
+      ).execute
+    end
+  end
+
+  def last_id
+    @db.query("SELECT LAST_INSERT_ID() AS `id`").fetch.fetch(:id).to_i
+  end
+end

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

@@ -0,0 +1,64 @@
+class Baza::Driver::Mysql::Database < Baza::Database
+  def save!
+    rename(name) unless name.to_s == name_was
+    self
+  end
+
+  def drop
+    sql = "DROP DATABASE `#{@db.escape_database(name)}`"
+    @db.query(sql)
+    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.sep_table}#{@db.escape_table(name)}#{db.sep_table} ("
+
+    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
+      )
+    end
+
+    sql << ")"
+
+    return [sql] if args && args[:return_sql]
+
+    use { @db.query(sql) }
+  end
+
+private
+
+  def rename(new_name)
+    new_name = new_name.to_s
+    @db.databases.create(name: new_name)
+
+    tables.each do |table|
+      @db.query("ALTER TABLE `#{@db.escape_database(name_was)}`.`#{@db.escape_table(table.name)}` RENAME `#{@db.escape_database(name)}`.`#{@db.escape_table(table.name)}`")
+    end
+
+    @db.query("DROP DATABASE `#{@db.escape_database(name_was)}`")
+
+    @name = new_name
+    @name_was = new_name
+  end
+end

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

@@ -0,0 +1,63 @@
+class Baza::Driver::Mysql::Databases
+  def initialize(args)
+    @db = args.fetch(:db)
+  end
+
+  def create(args)
+    sql = "CREATE DATABASE"
+    sql << " IF NOT EXISTS" if args[:if_not_exists]
+    sql << " #{@db.sep_database}#{@db.escape_table(args.fetch(:name))}#{@db.sep_database}"
+
+    @db.query(sql)
+    true
+  end
+
+  def [](name)
+    name = name.to_s
+    list.each do |database|
+      return database if database.name == name
+    end
+
+    raise Baza::Errors::DatabaseNotFound
+  end
+
+  def list
+    ArrayEnumerator.new do |yielder|
+      @db.query("SHOW DATABASES") do |data|
+        yielder << Baza::Driver::Mysql::Database.new(
+          name: data.fetch(:Database),
+          driver: self,
+          db: @db
+        )
+      end
+    end
+  end
+
+  def with_database(name)
+    if @db.opts[:db].to_s == name.to_s
+      yield if block_given?
+      return self
+    end
+
+    previous_db_name = @db.current_database_name
+    @db.query("USE #{@db.sep_database}#{@db.escape_database(name)}#{@db.sep_database}")
+
+    if block_given?
+      begin
+        yield
+      ensure
+        @db.query("USE #{@db.sep_database}#{@db.escape_database(previous_db_name)}#{@db.sep_database}")
+      end
+    end
+
+    self
+  end
+
+  def current_database_name
+    @db.query("SELECT DATABASE()").fetch.values.first
+  end
+
+  def current_database
+    @db.databases[current_database_name]
+  end
+end

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

@@ -5,25 +5,25 @@ class Baza::Driver::Mysql::Result < Baza::ResultBase
     ::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
     @result = result
     @mutex = Mutex.new
-    @type_translation = driver.baza.opts[:type_translation]
+    @type_translation = driver.db.opts[:type_translation]
 
     return unless @result
 
@@ -49,6 +49,8 @@ class Baza::Driver::Mysql::Result < Baza::ResultBase
       fetched.collect!.with_index do |value, count|
         translate_value_to_type(value, @types[count])
       end
+    elsif @type_translation == :string
+      fetched.collect!(&:to_s)
     end
 
     Hash[*@keys.zip(fetched).flatten]
@@ -56,8 +58,14 @@ class Baza::Driver::Mysql::Result < Baza::ResultBase
 
   # Loops over every result yielding it.
   def each
-    while data = fetch
-      yield data
+    loop do
+      data = fetch
+
+      if data
+        yield data
+      else
+        break
+      end
     end
   end
 

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

@@ -6,25 +6,33 @@ class Baza::Driver::Mysql::Table < Baza::Table
     @data = args.fetch(:data)
     @list = Wref::Map.new
     @indexes_list = Wref::Map.new
-    @name = @data.fetch(:name)
+    @name = @data.fetch(:TABLE_NAME)
     @tables = args.fetch(:tables)
   end
 
   def reload
-    data = @db.q("SHOW TABLE STATUS WHERE `Name` = '#{@db.esc(name)}'").fetch
+    data = @db.single([:information_schema, :tables], "TABLE_SCHEMA" => database_name, "TABLE_NAME" => name)
     raise Baza::Errors::TableNotFound unless data
     @data = data
     self
   end
 
+  def database_name
+    @data.fetch(:TABLE_SCHEMA)
+  end
+
   # Used to validate in Wref::Map.
   def __object_unique_id__
     name
   end
 
   def drop
-    raise "Cant drop native table: '#{name}'." if self.native?
-    @db.query("DROP TABLE `#{@db.escape_table(name)}`")
+    raise "Cant drop native table: '#{name}'" if native?
+
+    @db.with_database(database_name) do
+      @db.query("DROP TABLE `#{@db.escape_table(name)}`")
+    end
+
     @tables.__send__(:remove_from_list, self)
     nil
   end
@@ -41,16 +49,11 @@ class Baza::Driver::Mysql::Table < Baza::Table
     self
   end
 
-  def rows_count
-    @db.query("SELECT COUNT(*) AS count FROM `#{@db.escape_table(name)}`").fetch.fetch(:count).to_i
-  end
-
   def column(name)
     name = name.to_s
 
-    if col = @list.get(name)
-      return @list[name]
-    end
+    col = @list.get(name)
+    return col if col
 
     columns(name: name) do |col_i|
       return col_i if col_i.name == name
@@ -60,7 +63,7 @@ class Baza::Driver::Mysql::Table < Baza::Table
   end
 
   def columns(args = nil)
-    @db.cols
+    @db.columns
     ret = []
     sql = "SHOW FULL COLUMNS FROM `#{@db.escape_table(name)}`"
     sql << " WHERE `Field` = '#{@db.esc(args.fetch(:name))}'" if args && args.key?(:name)
@@ -131,9 +134,8 @@ class Baza::Driver::Mysql::Table < Baza::Table
   def index(name)
     name = name.to_s
 
-    if index = @indexes_list.get(name)
-      return index
-    end
+    index = @indexes_list.get(name)
+    return index if index
 
     indexes(name: name) do |index_i|
       return index_i if index_i.name == name
@@ -142,15 +144,6 @@ class Baza::Driver::Mysql::Table < Baza::Table
     raise Baza::Errors::IndexNotFound, "Index not found: #{name}."
   end
 
-  def create_columns(col_arr)
-    @db.transaction do
-      col_arr.each do |col_data|
-        sql = "ALTER TABLE `#{name}` ADD COLUMN #{@db.cols.data_sql(col_data)};"
-        @db.query(sql)
-      end
-    end
-  end
-
   def create_indexes(index_arr, args = {})
     Baza::Driver::Mysql::Table.create_indexes(index_arr, args.merge(table_name: name, db: @db))
   end
@@ -184,10 +177,10 @@ class Baza::Driver::Mysql::Table < Baza::Table
       end
 
       sql << " UNIQUE" if index_data[:unique]
-      sql << " INDEX `#{db.escape_column(index_data.fetch(:name))}`"
+      sql << " INDEX #{db.sep_index}#{db.escape_index(index_data.fetch(:name))}#{db.sep_index}"
 
       if args[:on_table] || !args.key?(:on_table)
-        sql << " ON `#{db.escape_table(args.fetch(:table_name))}`"
+        sql << " ON #{db.sep_table}#{db.escape_table(args.fetch(:table_name))}#{db.sep_table}"
       end
 
       sql << " ("
@@ -197,7 +190,7 @@ class Baza::Driver::Mysql::Table < Baza::Table
         sql << ", " unless first
         first = false if first
 
-        sql << "`#{db.escape_column(col_name)}`"
+        sql << "#{db.sep_col}#{db.escape_column(col_name)}#{db.sep_col}"
       end
 
       sql << ")"
@@ -228,11 +221,6 @@ class Baza::Driver::Mysql::Table < Baza::Table
     end
   end
 
-  def truncate
-    @db.query("TRUNCATE `#{@db.escape_table(name)}`")
-    self
-  end
-
   def data
     ret = {
       name: name,
@@ -251,14 +239,10 @@ class Baza::Driver::Mysql::Table < Baza::Table
     ret
   end
 
-  def insert(data)
-    @db.insert(name, data)
-  end
-
   def clone(newname, args = {})
     raise "Invalid name." if newname.to_s.strip.empty?
 
-    sql = "CREATE TABLE `#{@db.escape_table(newname)}` ("
+    sql = "CREATE TABLE #{@db.sep_table}#{@db.escape_table(newname)}#{@db.sep_table} ("
     first = true
     pkey_found = false
     pkeys = []
@@ -281,7 +265,7 @@ class Baza::Driver::Mysql::Table < Baza::Table
 
       col_data[:storage] = args[:all_cols_storage] if args[:all_cols_storage]
 
-      sql << @db.cols.data_sql(col_data)
+      sql << @db.columns.data_sql(col_data)
     end
 
     unless pkeys.empty?
@@ -291,7 +275,7 @@ class Baza::Driver::Mysql::Table < Baza::Table
       pkeys.each do |pkey|
         sql << ", " unless first
         first = false if first
-        sql << "`#{@db.escape_column(pkey)}`"
+        sql << "#{@db.sep_col}#{@db.escape_column(pkey)}#{@db.sep_col}"
       end
 
       sql << ")"
@@ -307,7 +291,7 @@ class Baza::Driver::Mysql::Table < Baza::Table
 
 
     # Insert data of previous data in a single query.
-    @db.query("INSERT INTO `#{@db.escape_table(newname)}` SELECT * FROM `#{@db.escape_table(name)}`")
+    @db.query("INSERT INTO #{@db.sep_table}#{@db.escape_table(newname)}#{@db.sep_table} SELECT * FROM #{@db.sep_table}#{@db.escape_table(name)}#{@db.sep_table}")
 
 
     # Create indexes.
@@ -326,14 +310,14 @@ class Baza::Driver::Mysql::Table < Baza::Table
 
   # Returns the current engine of the table.
   def engine
-    @data[:engine]
+    @data.fetch(:ENGINE)
   end
 
   # Changes the engine for a table.
   def engine=(newengine)
-    raise "Invalid engine: '#{newengine}'." unless newengine.to_s.match(/^[A-z]+$/)
+    raise "Invalid engine: '#{newengine}'." unless newengine.to_s =~ /^[A-z]+$/
     @db.query("ALTER TABLE `#{@db.escape_table(name)}` ENGINE = #{newengine}") if engine.to_s != newengine.to_s
-    @data[:engine] = newengine
+    @data[:ENGINE] = newengine
   end
 
 private

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

@@ -7,7 +7,7 @@ class Baza::Driver::Mysql::Tables
   # Constructor. This should not be called manually.
   def initialize(args)
     @args = args
-    @db = @args[:db]
+    @db = @args.fetch(:db)
     @list_mutex = Monitor.new
     @list = Wref::Map.new
     @list_should_be_reloaded = true
@@ -22,9 +22,8 @@ class Baza::Driver::Mysql::Tables
   def [](table_name)
     table_name = table_name.to_s
 
-    if table = @list[table_name]
-      return table
-    end
+    table = @list[table_name]
+    return table if table
 
     list(name: table_name) do |table_i|
       return table_i if table_i.name == table_name
@@ -54,7 +53,7 @@ class Baza::Driver::Mysql::Tables
         unless obj
           obj = Baza::Driver::Mysql::Table.new(
             db: @db,
-            data: {name: name, engine: d_tables.fetch(:ENGINE)},
+            data: d_tables,
             tables: self
           )
           @list[name] = obj
@@ -75,36 +74,8 @@ class Baza::Driver::Mysql::Tables
     end
   end
 
-  CREATE_ALLOWED_KEYS = [:columns, :indexes, :temp, :return_sql]
-  # Creates a new table by the given name and data.
   def create(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 `#{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.cols.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)
-    end
-
-    sql << ")"
-
-    return [sql] if args && args[:return_sql]
-    @db.query(sql)
+    @db.current_database.create_table(name, data, args)
   end
 
 private