baza 0.0.35 → 0.0.36

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

@@ -46,7 +46,7 @@ class Baza::Driver::Pg::Tables < Baza::Tables
 
     create_table_sql = "CREATE"
     create_table_sql << " TEMPORARY" if data[:temp]
-    create_table_sql << " TABLE #{db.sep_table}#{db.escape_table(table_name)}#{db.sep_table} ("
+    create_table_sql << " TABLE #{db.quote_table(table_name)} ("
 
     first = true
     data.fetch(:columns).each do |col_data|

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

@@ -108,7 +108,7 @@ class Baza::Driver::Sqlite3::Column < Baza::Column
   end
 
   def reload
-    @db.q("PRAGMA table_info(`#{@db.escape_table(table_name)}`)") do |data|
+    @db.q("PRAGMA table_info(#{@db.quote_table(table_name)})") do |data|
       next unless data.fetch(:name) == name
       @data = data
       @type = nil

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

@@ -39,7 +39,7 @@ class Baza::Driver::Sqlite3::Columns
     if data.key?(:default_func)
       sql << " DEFAULT #{data[:default_func]}"
     elsif data.key?(:default) && data[:default] != false
-      sql << " DEFAULT #{@db.sqlval(data.fetch(:default))}"
+      sql << " DEFAULT #{@db.quote_value(data.fetch(:default))}"
     end
 
     sql

data/lib/baza/driver/sqlite3/index.rb

@@ -53,7 +53,7 @@ class Baza::Driver::Sqlite3::Index < Baza::Index
 
   def reload
     data = nil
-    @db.query("PRAGMA index_list(`#{@db.escape_table(name)}`)") do |d_indexes|
+    @db.query("PRAGMA index_list(#{@db.quote_table(name)})") do |d_indexes|
       next unless d_indexes.fetch(:name) == name
       data = d_indexes
       break

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

@@ -90,7 +90,7 @@ class Baza::Driver::Sqlite3::Table < Baza::Table
     @db.columns
     ret = []
 
-    @db.query("PRAGMA table_info(`#{@db.escape_table(name)}`)") do |d_cols|
+    @db.query("PRAGMA table_info(#{@db.quote_table(name)})") do |d_cols|
       column_name = d_cols.fetch(:name)
       obj = @list.get(column_name)
 
@@ -283,7 +283,7 @@ class Baza::Driver::Sqlite3::Table < Baza::Table
     @db.indexes
     ret = [] unless block_given?
 
-    @db.query("PRAGMA index_list(`#{@db.escape_table(name)}`)") do |d_indexes|
+    @db.query("PRAGMA index_list(#{@db.quote_table(name)})") do |d_indexes|
       next if d_indexes[:Key_name] == "PRIMARY"
       obj = @indexes_list.get(d_indexes[:name])
 
@@ -333,13 +333,13 @@ class Baza::Driver::Sqlite3::Table < Baza::Table
 
       sql = "CREATE"
       sql << " UNIQUE" if index_data[:unique]
-      sql << " INDEX #{@db.sep_index}#{@db.escape_column(index_name)}#{@db.sep_index} ON #{@db.sep_table}#{@db.escape_table(name)}#{@db.sep_table} ("
+      sql << " INDEX #{@db.quote_index(index_name)} ON #{@db.quote_table(name)} ("
 
       first = true
       index_data.fetch(:columns).each do |col_name|
         sql << ", " unless first
         first = false if first
-        sql << "#{@db.sep_col}#{@db.escape_column(col_name)}#{@db.sep_col}"
+        sql << @db.quote_column(col_name)
       end
 
       sql << ")"

data/lib/baza/driver/tiny.rb

@@ -1,22 +1,19 @@
 class Baza::Driver::Tiny < Baza::BaseSqlDriver
-  SEPARATOR_DATABASE = "`".freeze
-  SEPARATOR_TABLE = "".freeze
-  SEPARATOR_COLUMN = "".freeze
+  SEPARATOR_DATABASE = "[".freeze
+  SEPARATOR_TABLE = "[".freeze
+  SEPARATOR_COLUMN = "[".freeze
+  SEPARATOR_INDEX = "[".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
 
@@ -24,6 +21,48 @@ class Baza::Driver::Tiny < Baza::BaseSqlDriver
     @client.close
   end
 
+  def escape(value)
+    @client.escape(value)
+  end
+
+  def self.escape_identifier(string)
+    string = string.to_s
+    raise "Invalid column-string: #{string}" if string.include?("[") || string.include?("]")
+    string
+  end
+
+  def self.escape_database(name)
+    escape_identifier(name)
+  end
+
+  def self.escape_column(name)
+    escape_identifier(name)
+  end
+
+  def self.escape_index(name)
+    escape_identifier(name)
+  end
+
+  def self.escape_table(name)
+    escape_identifier(name)
+  end
+
+  def escape_database(name)
+    self.class.escape_identifier(name)
+  end
+
+  def escape_column(name)
+    self.class.escape_identifier(name)
+  end
+
+  def escape_index(name)
+    self.class.escape_identifier(name)
+  end
+
+  def escape_table(name)
+    self.class.escape_identifier(name)
+  end
+
   def insert(table_name, data, args = {})
     sql = Baza::SqlQueries::GenericInsert.new({
       db: @db,
@@ -39,4 +78,40 @@ class Baza::Driver::Tiny < Baza::BaseSqlDriver
     result = @client.execute(sql)
     Baza::Driver::Tiny::Result.new(result)
   end
+
+  def self.quote_identifier(name)
+    "[#{escape_database(name)}]"
+  end
+
+  def self.quote_database(database_name)
+    quote_identifier(database_name)
+  end
+
+  def self.quote_column(column_name)
+    quote_identifier(column_name)
+  end
+
+  def self.quote_index(index_name)
+    quote_identifier(index_name)
+  end
+
+  def self.quote_table(table_name)
+    quote_identifier(table_name)
+  end
+
+  def quote_database(database_name)
+    self.class.quote_identifier(database_name)
+  end
+
+  def quote_column(column_name)
+    self.class.quote_identifier(column_name)
+  end
+
+  def quote_index(index_name)
+    self.class.quote_identifier(index_name)
+  end
+
+  def quote_table(table_name)
+    self.class.quote_identifier(table_name)
+  end
 end

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

@@ -3,7 +3,23 @@ class Baza::Driver::Tiny::Result < Baza::ResultBase
     @result = result.to_a
   end
 
-  def each(*args, &blk)
-    @result.each(*args, &blk)
+  def each(&blk)
+    enum.each(&blk)
+  end
+
+  def fetch
+    enum.next
+  rescue StopIteration
+    nil
+  end
+
+private
+
+  def enum
+    @enum ||= Enumerator.new do |yielder|
+      @result.each do |result|
+        yielder << result
+      end
+    end
   end
 end

data/lib/baza/idquery.rb

@@ -85,8 +85,8 @@ private
 
   # Spawns a new database-result to read from.
   def new_res
-    table_esc = "#{@db.sep_table}#{@db.escape_table(@args[:table])}#{@db.sep_table}"
-    col_esc = "#{@db.sep_col}#{@db.escape_column(@args[:col])}#{@db.sep_col}"
+    table_esc = @db.quote_table(@args.fetch(:table))
+    col_esc = @db.quote_column(@args.fetch(:col))
     ids = @ids.shift(@args[:size])
 
     if ids.empty?
@@ -94,7 +94,7 @@ private
       return nil
     end
 
-    ids_sql = ids.map { |id| "#{@db.sep_val}#{@db.esc(id)}#{@db.sep_val}" }.join(",")
+    ids_sql = ids.map { |id| @db.quote_value(id) }.join(",")
     query_str = "SELECT * FROM #{table_esc} WHERE #{table_esc}.#{col_esc} IN (#{ids_sql})"
     puts "Query: #{query_str}" if @debug
 

data/lib/baza/mysql_base_driver.rb

@@ -37,7 +37,7 @@ class Baza::MysqlBaseDriver < Baza::BaseSqlDriver
     keys.each do |col_name|
       sql << "," unless first
       first = false if first
-      sql << "`#{escape_column(col_name)}`"
+      sql << quote_column(col_name)
     end
 
     sql << ") VALUES ("
@@ -59,7 +59,7 @@ class Baza::MysqlBaseDriver < Baza::BaseSqlDriver
             sql << ","
           end
 
-          sql << @db.sqlval(val)
+          sql << @db.quote_value(val)
         end
       else
         hash.each do |_key, val|
@@ -69,7 +69,7 @@ class Baza::MysqlBaseDriver < Baza::BaseSqlDriver
             sql << ","
           end
 
-          sql << @db.sqlval(val)
+          sql << @db.quote_value(val)
         end
       end
     end

data/lib/baza/sql_queries/generic_insert.rb

@@ -21,7 +21,7 @@ class Baza::SqlQueries::GenericInsert
   end
 
   def to_sql
-    sql = "INSERT INTO #{@db.sep_table}#{@db.escape_table(@table_name)}#{@db.sep_table}"
+    sql = "INSERT INTO #{@db.quote_table(@table_name)}"
 
     if !@data || @data.empty?
       sql << " #{sql_default_values}"
@@ -55,7 +55,7 @@ private
         sql << ", "
       end
 
-      sql << "#{@db.sep_col}#{@db.escape_column(key)}#{@db.sep_col}"
+      sql << @db.quote_column(key)
     end
 
     sql << ")"
@@ -73,7 +73,7 @@ private
         sql << ", "
       end
 
-      quoted = @db.sqlval(value)
+      quoted = @db.quote_value(value)
       quoted = convert_line_breaks(quoted) if @replace_line_breaks
 
       sql << quoted

data/lib/baza/sql_queries/generic_update.rb

@@ -16,13 +16,13 @@ class Baza::SqlQueries::GenericUpdate
   end
 
   def to_sql
-    sql = "UPDATE #{@db.sep_col}#{@db.escape_table(@table_name)}#{@db.sep_col} SET "
+    sql = "UPDATE #{@db.quote_table(@table_name)} SET "
 
     first = true
     @data.each do |key, value|
       sql << ", " unless first
       first = false if first
-      sql << "#{@db.sep_col}#{@db.escape_column(key)}#{@db.sep_col} = #{@db.sqlval(value)}"
+      sql << "#{@db.quote_column(key)} = #{@db.quote_value(value)}"
     end
 
     sql << " WHERE #{@db.sql_make_where(@terms)}" if @terms && !@terms.empty?

data/lib/baza/sql_queries/mysql_upsert.rb

@@ -9,7 +9,7 @@ class Baza::SqlQueries::MysqlUpsert
   def execute
     procedure_name = "baza_upsert_#{SecureRandom.hex(5)}"
 
-    sql = "CREATE PROCEDURE `#{@db.escape_table(procedure_name)}` () BEGIN\n"
+    sql = "CREATE PROCEDURE #{@db.quote_table(procedure_name)} () BEGIN\n"
     sql << "\tIF EXISTS(#{select_query}) THEN\n"
     sql << "\t\t#{update_sql};\n"
     sql << "\tELSE\n"
@@ -20,9 +20,9 @@ class Baza::SqlQueries::MysqlUpsert
     @db.query(sql)
 
     begin
-      @db.query("CALL `#{@db.escape_table(procedure_name)}`")
+      @db.query("CALL #{@db.quote_table(procedure_name)}")
     ensure
-      @db.query("DROP PROCEDURE `#{@db.escape_table(procedure_name)}`")
+      @db.query("DROP PROCEDURE #{@db.quote_table(procedure_name)}")
     end
   end
 
@@ -30,13 +30,13 @@ private
 
   def select_query
     sql = ""
-    sql << "SELECT * FROM #{@db.sep_table}#{@db.escape_table(@table_name)}#{@db.sep_table} WHERE"
+    sql << "SELECT * FROM #{@db.quote_table(@table_name)} WHERE"
 
     first = true
     @terms.each do |column, value|
       sql << " AND" unless first
       first = false if first
-      sql << " #{@db.sep_col}#{@db.escape_column(column)}#{@db.sep_col} = #{@db.sqlval(value)}"
+      sql << " #{@db.quote_column(column)} = #{@db.quote_value(value)}"
     end
 
     sql

data/lib/baza/sql_queries/mysql_upsert_duplicate_key.rb

@@ -15,14 +15,14 @@ class Baza::SqlQueries::MysqlUpsertDuplicateKey
     first = true
 
     if @return_id
-      sql << " #{@db.sep_col}#{@db.escape_column(primary_key_column_name)}#{@db.sep_col} = LAST_INSERT_ID(#{@db.sep_col}#{@db.escape_column(primary_key_column_name)}#{@db.sep_col})"
+      sql << " #{@db.quote_column(primary_key_column_name)} = LAST_INSERT_ID(#{@db.quote_column(primary_key_column_name)})"
       first = false
     end
 
     @updates.each do |key, value|
       sql << "," unless first
       first = false if first
-      sql << " #{@db.sep_col}#{@db.escape_column(key)}#{@db.sep_col} = #{@db.sqlval(value)}"
+      sql << " #{@db.quote_column(key)} = #{@db.quote_value(value)}"
     end
 
     sql
@@ -52,6 +52,6 @@ private
   end
 
   def last_insert_sql
-    "SELECT LAST_INSERT_ID() AS `id` FROM #{@db.sep_table}#{@db.escape_table(@table_name)}#{@db.sep_table}"
+    "SELECT LAST_INSERT_ID() AS #{@db.quote_column("id")} FROM #{@db.quote_table(@table_name)}"
   end
 end

data/lib/baza/sql_queries/postgres_upsert_duplicate_key.rb

@@ -65,14 +65,14 @@ private
       sql << ", " unless first
       first = false if first
 
-      sql << "#{@db.sep_col}#{@db.escape_column(column_name)}#{@db.sep_col}"
+      sql << @db.quote_column(column_name)
     end
 
     sql
   end
 
   def insert_sql
-    sql = "INSERT INTO #{@db.sep_table}#{@db.escape_table(@table_name)}#{@db.sep_table} ("
+    sql = "INSERT INTO #{@db.quote_table(@table_name)} ("
 
     combined_data = @updates.merge(@terms)
 
@@ -80,7 +80,7 @@ private
     combined_data.each_key do |column_name|
       sql << ", " unless first
       first = false if first
-      sql << "#{@db.sep_col}#{@db.escape_column(column_name)}#{@db.sep_col}"
+      sql << @db.quote_column(column_name)
     end
 
     sql << ") VALUES ("
@@ -89,7 +89,7 @@ private
     combined_data.each_value do |value|
       sql << ", " unless first
       first = false if first
-      sql << @db.sqlval(value).to_s
+      sql << @db.quote_value(value).to_s
     end
 
     sql << ")"
@@ -97,7 +97,7 @@ private
   end
 
   def update_sql
-    "UPDATE #{@db.sep_table}#{@db.escape_table(@table_name)}#{@db.sep_table} #{update_set_sql} #{update_where_sql}"
+    "UPDATE #{@db.quote_table(@table_name)} #{update_set_sql} #{update_where_sql}"
   end
 
   def update_set_sql
@@ -107,7 +107,7 @@ private
     @updates.each do |key, value|
       sql << ", " unless first
       first = false if first
-      sql << "#{@db.sep_col}#{@db.escape_column(key)}#{@db.sep_col} = #{@db.sqlval(value)}"
+      sql << "#{@db.quote_column(key)} = #{@db.quote_value(value)}"
     end
 
     sql
@@ -120,7 +120,7 @@ private
     @terms.each do |key, value|
       sql << " AND " unless first
       first = false if first
-      sql << "#{@db.sep_col}#{@db.escape_column(key)}#{@db.sep_col} = #{@db.sqlval(value)}"
+      sql << "#{@db.quote_column(key)} = #{@db.quote_value(value)}"
     end
 
     sql

data/lib/baza/sql_queries/select.rb

@@ -126,9 +126,9 @@ private
         first = false if first
 
         if select.is_a?(Symbol)
-          select << " #{@db.sep_col}#{@db.escape_column(select)}#{@db.sep_col}"
+          select << " #{@db.quote_column(select)}"
         else
-          select << @db.sqlval(select)
+          select << @db.quote_value(select)
         end
       end
     end
@@ -143,7 +143,7 @@ private
     @froms.each do |from|
       sql << "," unless first
       first = false if first
-      sql << " #{@db.sep_table}#{@db.escape_table(from)}#{@db.sep_table}"
+      sql << " #{@db.quote_table(from)}"
     end
 
     sql
@@ -167,12 +167,12 @@ private
 
       if where.is_a?(Hash)
         where.each do |key, value|
-          sql << "#{@db.sep_col}#{@db.escape_column(key)}#{@db.sep_col} = #{@db.sqlval(value)}"
+          sql << "#{@db.quote_column(key)} = #{@db.quote_value(value)}"
         end
       elsif where.is_a?(String)
         sql_arg = where.clone
         args.each do |arg|
-          sql_arg.sub!("?", @db.sqlval(arg))
+          sql_arg.sub!("?", @db.quote_value(arg))
         end
 
         sql << sql_arg
@@ -192,10 +192,10 @@ private
     unless @count
       if @page
         @per_page ||= 30
-        sql = "LIMIT #{@db.sqlval(@per_page)} OFFSET #{@per_page * (current_page - 1)}"
+        sql = "LIMIT #{@db.quote_value(@per_page)} OFFSET #{@per_page * (current_page - 1)}"
       elsif @limit
-        sql = "LIMIT #{@db.sqlval(@limit)}"
-        sql << ", #{@db.sqlval(@offset)}" if @offset
+        sql = "LIMIT #{@db.quote_value(@limit)}"
+        sql << ", #{@db.quote_value(@offset)}" if @offset
       end
     end