baza 0.0.35 → 0.0.36

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

@@ -5,7 +5,7 @@ class Baza::Driver::Mysql::Database < Baza::Database
   end
 
   def drop
-    sql = "DROP DATABASE `#{@db.escape_database(name)}`"
+    sql = "DROP DATABASE #{@db.quote_database(name)}"
     @db.query(sql)
     self
   end
@@ -17,7 +17,7 @@ class Baza::Driver::Mysql::Database < Baza::Database
 
     sql = "CREATE"
     sql << " TEMPORARY" if data[:temp]
-    sql << " TABLE #{db.sep_table}#{@db.escape_table(name)}#{db.sep_table} ("
+    sql << " TABLE #{@db.quote_table(name)} ("
 
     first = true
     data[:columns].each do |col_data|
@@ -66,10 +66,10 @@ private
     @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)}`")
+      @db.query("ALTER TABLE #{@db.quote_database(name_was)}.#{@db.quote_table(table.name)} RENAME #{@db.quote_database(name)}.#{@db.quote_table(table.name)}")
     end
 
-    @db.query("DROP DATABASE `#{@db.escape_database(name_was)}`")
+    @db.query("DROP DATABASE #{@db.quote_database(name_was)}")
 
     @name = new_name
     @name_was = new_name

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

@@ -6,7 +6,7 @@ class Baza::Driver::Mysql::Databases
   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}"
+    sql << " #{@db.quote_table(args.fetch(:name))}"
 
     @db.query(sql)
     true
@@ -40,13 +40,13 @@ class Baza::Driver::Mysql::Databases
     end
 
     previous_db_name = @db.current_database_name
-    @db.query("USE #{@db.sep_database}#{@db.escape_database(name)}#{@db.sep_database}")
+    @db.query("USE #{@db.quote_database(name)}")
 
     if block_given?
       begin
         yield
       ensure
-        @db.query("USE #{@db.sep_database}#{@db.escape_database(previous_db_name)}#{@db.sep_database}")
+        @db.query("USE #{@db.quote_database(previous_db_name)}")
       end
     end
 

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

@@ -11,8 +11,8 @@ class Baza::Driver::Mysql::ForeignKey < Baza::ForeignKey
 
   def drop
     @db.query("
-      ALTER TABLE `#{@db.escape_table(table_name)}`
-      DROP FOREIGN KEY `#{@db.escape_table(name)}`
+      ALTER TABLE #{@db.quote_table(table_name)}
+      DROP FOREIGN KEY #{@db.quote_table(name)}
     ")
     true
   end

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

@@ -70,7 +70,7 @@ class Baza::Driver::Mysql::Index < Baza::Index
   end
 
   def reload
-    data = @db.query("SHOW INDEX FROM `#{@db.escape_table(@table_name)}` WHERE `Key_name` = '#{@db.esc(name)}'").fetch
+    data = @db.query("SHOW INDEX FROM #{@db.quote_table(@table_name)} WHERE #{@db.quote_column("Key_name")} = #{@db.quote_value(name)}").fetch
     raise Baza::Errors::IndexNotFound unless data
     @data = data
     self

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

@@ -17,7 +17,7 @@ class Baza::Driver::Mysql::Sql::Column
 
     data[:maxlength] = 255 if type == :varchar && data[:maxlength].to_s.strip.empty?
 
-    sql = "#{Baza::Driver::Mysql::SEPARATOR_COLUMN}#{Baza::Driver::Mysql.escape_column(data.fetch(:name))}#{Baza::Driver::Mysql::SEPARATOR_COLUMN} #{type}"
+    sql = "#{Baza::Driver::Mysql.quote_column(data.fetch(:name))} #{type}"
     sql << "(#{data[:maxlength]})" if data[:maxlength]
     sql << " PRIMARY KEY" if data[:primarykey]
     sql << " AUTO_INCREMENT" if data[:autoincr]
@@ -26,11 +26,11 @@ class Baza::Driver::Mysql::Sql::Column
     if data.key?(:default_func)
       sql << " DEFAULT #{data[:default_func]}"
     elsif data.key?(:default) && !data[:default].nil?
-      sql << " DEFAULT #{Baza::Driver::Mysql.sqlval(data.fetch(:default))}"
+      sql << " DEFAULT #{Baza::Driver::Mysql.quote_value(data.fetch(:default))}"
     end
 
-    sql << " COMMENT '#{Baza::Driver::Mysql.escape(data.fetch(:comment))}'" if data.key?(:comment)
-    sql << " AFTER #{Baza::Driver::Mysql::SEPARATOR_COLUMN}#{Baza::Driver::Mysql.escape_column(data.fetch(:after))}#{Baza::Driver::Mysql::SEPARATOR_COLUMN}" if data[:after] && !data[:first]
+    sql << " COMMENT #{Baza::Driver::Mysql.quote_value(data.fetch(:comment))}" if data.key?(:comment)
+    sql << " AFTER #{Baza::Driver::Mysql.quote_column(data.fetch(:after))}" if data[:after] && !data[:first]
     sql << " FIRST" if data[:first]
     sql << " STORAGE #{data[:storage].to_s.upcase}" if data[:storage]
 

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

@@ -27,10 +27,10 @@ class Baza::Driver::Mysql::Sql::CreateIndexes
       end
 
       sql << " UNIQUE" if index_data[:unique]
-      sql << " INDEX #{Baza::Driver::Mysql::SEPARATOR_INDEX}#{Baza::Driver::Mysql.escape_index(index_data.fetch(:name))}#{Baza::Driver::Mysql::SEPARATOR_INDEX}"
+      sql << " INDEX #{Baza::Driver::Mysql.quote_index(index_data.fetch(:name))}"
 
       if @on_table || @on_table.nil?
-        sql << " ON #{Baza::Driver::Mysql::SEPARATOR_TABLE}#{Baza::Driver::Mysql.escape_table(@table_name)}#{Baza::Driver::Mysql::SEPARATOR_TABLE}"
+        sql << " ON #{Baza::Driver::Mysql.quote_table(@table_name)}"
       end
 
       sql << " ("
@@ -40,7 +40,7 @@ class Baza::Driver::Mysql::Sql::CreateIndexes
         sql << ", " unless first
         first = false if first
 
-        sql << "#{Baza::Driver::Mysql::SEPARATOR_COLUMN}#{Baza::Driver::Mysql.escape_column(col_name)}#{Baza::Driver::Mysql::SEPARATOR_COLUMN}"
+        sql << Baza::Driver::Mysql.quote_column(col_name)
       end
 
       sql << ")"

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

@@ -9,7 +9,7 @@ class Baza::Driver::Mysql::Sql::CreateTable
   def sql
     sql = "CREATE"
     sql << " TEMPORARY" if @temporary
-    sql << " TABLE #{Baza::Driver::Mysql::SEPARATOR_TABLE}#{Baza::Driver::Mysql.escape_table(@name)}#{Baza::Driver::Mysql::SEPARATOR_TABLE} ("
+    sql << " TABLE #{Baza::Driver::Mysql.quote_table(@name)} ("
 
     first = true
     @columns.each do |col_data|

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

@@ -30,7 +30,7 @@ class Baza::Driver::Mysql::Table < Baza::Table
     raise "Cant drop native table: '#{name}'" if native?
 
     @db.with_database(database_name) do
-      @db.query("DROP TABLE `#{@db.escape_table(name)}`")
+      @db.query("DROP TABLE #{@db.quote_table(name)}")
     end
 
     @tables.__send__(:remove_from_list, self)
@@ -45,7 +45,7 @@ class Baza::Driver::Mysql::Table < Baza::Table
   end
 
   def optimize
-    @db.query("OPTIMIZE TABLE `#{@db.escape_table(name)}`")
+    @db.query("OPTIMIZE TABLE #{@db.quote_table(name)}")
     self
   end
 
@@ -65,7 +65,7 @@ class Baza::Driver::Mysql::Table < Baza::Table
   def columns(args = nil)
     @db.columns
     ret = []
-    sql = "SHOW FULL COLUMNS FROM `#{@db.escape_table(name)}`"
+    sql = "SHOW FULL COLUMNS FROM #{@db.quote_table(name)}"
     sql << " WHERE `Field` = '#{@db.esc(args.fetch(:name))}'" if args && args.key?(:name)
 
     @db.q(sql) do |d_cols|
@@ -108,11 +108,11 @@ class Baza::Driver::Mysql::Table < Baza::Table
         INFORMATION_SCHEMA.KEY_COLUMN_USAGE
 
       WHERE
-        REFERENCED_TABLE_SCHEMA = '#{@db.escape_database(@db.current_database_name)}' AND
-        TABLE_NAME = '#{@db.escape_table(name)}'
+        REFERENCED_TABLE_SCHEMA = #{@db.quote_value(@db.current_database_name)} AND
+        TABLE_NAME = #{@db.quote_value(name)}
     "
 
-    sql << " AND CONSTRAINT_NAME = '#{@db.escape(args.fetch(:name))}'" if args[:name]
+    sql << " AND CONSTRAINT_NAME = #{@db.quote_value(args.fetch(:name))}" if args[:name]
 
     result = [] unless block_given?
 
@@ -143,8 +143,8 @@ class Baza::Driver::Mysql::Table < Baza::Table
   def indexes(args = nil, &blk)
     ret = {}
 
-    sql = "SHOW INDEX FROM `#{@db.escape_table(name)}`"
-    sql << " WHERE `Key_name` = '#{@db.esc(args.fetch(:name))}'" if args && args.key?(:name)
+    sql = "SHOW INDEX FROM #{@db.quote_table(name)}"
+    sql << " WHERE #{@db.quote_column("Key_name")} = #{@db.quote_value(args.fetch(:name))}" if args && args.key?(:name)
 
     @db.query(sql) do |d_indexes|
       next if d_indexes[:Key_name] == "PRIMARY"
@@ -218,10 +218,10 @@ class Baza::Driver::Mysql::Table < Baza::Table
       end
 
       sql << " UNIQUE" if index_data[:unique]
-      sql << " INDEX #{db.sep_index}#{db.escape_index(index_data.fetch(:name))}#{db.sep_index}"
+      sql << " INDEX #{db.quote_index(index_data.fetch(:name))}"
 
       if args[:on_table] || !args.key?(:on_table)
-        sql << " ON #{db.sep_table}#{db.escape_table(args.fetch(:table_name))}#{db.sep_table}"
+        sql << " ON #{db.quote_table(args.fetch(:table_name))}"
       end
 
       sql << " ("
@@ -231,7 +231,7 @@ class Baza::Driver::Mysql::Table < Baza::Table
         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 << ")"
@@ -247,7 +247,7 @@ class Baza::Driver::Mysql::Table < Baza::Table
     oldname = name
 
     @tables.__send__(:remove_from_list, self)
-    @db.query("ALTER TABLE `#{@db.escape_table(oldname)}` RENAME TO `#{@db.escape_table(newname)}`")
+    @db.query("ALTER TABLE #{@db.quote_table(oldname)} RENAME TO #{@db.quote_table(newname)}")
 
     @data[:name] = newname
     @name = newname
@@ -283,7 +283,7 @@ class Baza::Driver::Mysql::Table < Baza::Table
   def clone(newname, args = {})
     raise "Invalid name." if newname.to_s.strip.empty?
 
-    sql = "CREATE TABLE #{@db.sep_table}#{@db.escape_table(newname)}#{@db.sep_table} ("
+    sql = "CREATE TABLE #{@db.quote_table(newname)} ("
     first = true
     pkey_found = false
     pkeys = []
@@ -316,7 +316,7 @@ class Baza::Driver::Mysql::Table < Baza::Table
       pkeys.each do |pkey|
         sql << ", " unless first
         first = false if first
-        sql << "#{@db.sep_col}#{@db.escape_column(pkey)}#{@db.sep_col}"
+        sql << @db.quote_column(pkey)
       end
 
       sql << ")"
@@ -332,7 +332,7 @@ class Baza::Driver::Mysql::Table < Baza::Table
 
 
     # Insert data of previous data in a single query.
-    @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}")
+    @db.query("INSERT INTO #{@db.quote_table(newname)} SELECT * FROM #{@db.quote_table(name)}")
 
 
     # Create indexes.
@@ -357,7 +357,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]+$/
-    @db.query("ALTER TABLE `#{@db.escape_table(name)}` ENGINE = #{newengine}") if engine.to_s != newengine.to_s
+    @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_java.rb

@@ -105,7 +105,7 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
     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 ("
@@ -127,7 +127,7 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
             sql << ","
           end
 
-          sql << @db.sqlval(val)
+          sql << @db.quote_value(val)
         end
       else
         hash.each do |_key, val|
@@ -137,7 +137,7 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
             sql << ","
           end
 
-          sql << @db.sqlval(val)
+          sql << @db.quote_value(val)
         end
       end
     end

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

@@ -19,7 +19,7 @@ class Baza::Driver::Pg::Column < Baza::Column
     other_table = other_column.table
 
     sql = "
-      ALTER TABLE #{@db.escape_table(table_name)}
+      ALTER TABLE #{@db.quote_table(table_name)}
       ADD CONSTRAINT #{@db.escape_table(fk_name)}
       FOREIGN KEY (#{@db.escape_table(name)})
       REFERENCES #{@db.escape_table(other_table.name)} (#{@db.escape_column(other_column.name)})
@@ -66,7 +66,7 @@ class Baza::Driver::Pg::Column < Baza::Column
   end
 
   def drop
-    @db.query("ALTER TABLE #{@db.sep_table}#{@db.escape_table(table_name)}#{@db.sep_table} DROP COLUMN #{@db.sep_col}#{@db.escape_column(name)}#{@db.sep_col}")
+    @db.query("ALTER TABLE #{@db.quote_table(table_name)} DROP COLUMN #{@db.quote_column(name)}")
     nil
   end
 
@@ -78,7 +78,7 @@ class Baza::Driver::Pg::Column < Baza::Column
 
   def change(data)
     if data.key?(:name) && data.fetch(:name).to_s != name
-      @db.query("#{alter_table_sql} RENAME #{col_escaped} TO #{@db.sep_col}#{@db.escape_column(data.fetch(:name))}#{@db.sep_col}")
+      @db.query("#{alter_table_sql} RENAME #{@db.quote_column(name)} TO #{@db.quote_column(data.fetch(:name))}")
       @name = data.fetch(:name).to_s
     end
 
@@ -126,19 +126,11 @@ class Baza::Driver::Pg::Column < Baza::Column
 
 private
 
-  def col_escaped
-    "#{@db.sep_col}#{@db.escape_column(name)}#{@db.sep_col}"
-  end
-
-  def table_escaped
-    "#{@db.sep_table}#{@db.escape_table(table_name)}#{@db.sep_table}"
-  end
-
   def alter_table_sql
-    "ALTER TABLE #{table_escaped}"
+    "ALTER TABLE #{@db.quote_table(table_name)}"
   end
 
   def alter_column_sql
-    "#{alter_table_sql} ALTER COLUMN #{col_escaped}"
+    "#{alter_table_sql} ALTER COLUMN #{@db.quote_column(name)}"
   end
 end

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

@@ -32,7 +32,7 @@ class Baza::Driver::Pg::Columns
 
     data[:maxlength] = 255 if type == :varchar && !data.key?(:maxlength)
 
-    sql = "#{@db.sep_col}#{@db.escape_column(data.fetch(:name))}#{@db.sep_col} #{type}"
+    sql = "#{@db.quote_column(data.fetch(:name))} #{type}"
     sql << "(#{maxlength})" if maxlength
     sql << " PRIMARY KEY" if data[:primarykey]
     sql << " NOT NULL" if data.key?(:null) && !data[:null]
@@ -40,11 +40,11 @@ class Baza::Driver::Pg::Columns
     if data.key?(:default_func)
       sql << " DEFAULT #{data[:default_func]}"
     elsif data.key?(:default) && data[:default]
-      sql << " DEFAULT #{@db.sqlval(data.fetch(:default))}"
+      sql << " DEFAULT #{@db.quote_value(data.fetch(:default))}"
     end
 
-    sql << " COMMENT '#{@db.escape(data.fetch(:comment))}'" if data.key?(:comment)
-    sql << " AFTER #{@db.sep_col}#{@db.escape_column(data.fetch(:after))}#{@db.sep_col}" if data[:after] && !data[:first]
+    sql << " COMMENT #{@db.quote_value(data.fetch(:comment))}" if data.key?(:comment)
+    sql << " AFTER #{@db.quote_column(data.fetch(:after))}" if data[:after] && !data[:first]
     sql << " FIRST" if data[:first]
     sql << " STORAGE #{data[:storage].to_s.upcase}" if data[:storage]
 

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

@@ -31,10 +31,10 @@ class Baza::Driver::Pg::CreateIndexSqlCreator
     raise "No columns was given on index: '#{index_data.fetch(:name)}'." if !index_data[:columns] || index_data[:columns].empty?
 
     sql << " UNIQUE" if index_data[:unique]
-    sql << " INDEX #{@db.sep_index}#{@db.escape_index(index_data.fetch(:name))}#{@db.sep_index}"
+    sql << " INDEX #{@db.quote_index(index_data.fetch(:name))}"
 
     if args[:on_table] || !args.key?(:on_table)
-      sql << " ON #{@db.sep_table}#{@db.escape_table(args.fetch(:table_name))}#{@db.sep_table}"
+      sql << " ON #{@db.quote_table(args.fetch(:table_name))}"
     end
 
     sql << " ("
@@ -43,7 +43,7 @@ class Baza::Driver::Pg::CreateIndexSqlCreator
     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/pg/database.rb

@@ -7,7 +7,7 @@ class Baza::Driver::Pg::Database < Baza::Database
   def drop
     with_cloned_conn_and_terminated_connections do |cloned_conn|
       # Drop the database
-      cloned_conn.query("DROP DATABASE #{db.sep_database}#{db.escape_database(name)}#{db.sep_database}")
+      cloned_conn.query("DROP DATABASE #{db.quote_database(name)}")
     end
 
     self
@@ -65,7 +65,7 @@ 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(name)}#{db.sep_database}")
+      cloned_conn.query("ALTER DATABASE #{db.quote_database(name_was)} RENAME TO #{db.quote_database(name)}")
     end
 
     @name = new_name.to_s
@@ -78,8 +78,8 @@ private
     # 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_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()")
+      cloned_conn.query("REVOKE CONNECT ON DATABASE #{db.quote_database(name_was)} FROM public") unless name_changed?
+      cloned_conn.query("SELECT pid, pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = #{@db.quote_value(name_was)} AND pid != pg_backend_pid()")
 
       yield cloned_conn
     end

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

@@ -22,7 +22,7 @@ class Baza::Driver::Pg::Databases
       end
     end
 
-    @db.query("CREATE DATABASE #{@db.sep_database}#{@db.escape_table(args.fetch(:name))}#{@db.sep_database}")
+    @db.query("CREATE DATABASE #{@db.quote_table(args.fetch(:name))}")
     true
   end
 

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

@@ -11,8 +11,8 @@ class Baza::Driver::Pg::ForeignKey < Baza::ForeignKey
 
   def drop
     @db.query("
-      ALTER TABLE #{@db.escape_table(table_name)}
-      DROP CONSTRAINT #{@db.escape_table(name)}
+      ALTER TABLE #{@db.quote_table(table_name)}
+      DROP CONSTRAINT #{@db.quote_table(name)}
     ")
     true
   end

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

@@ -24,7 +24,7 @@ class Baza::Driver::Pg::Index < Baza::Index
   end
 
   def rename(new_name)
-    @db.query("ALTER INDEX #{@db.sep_index}#{@db.escape_index(name)}#{@db.sep_index} RENAME TO #{@db.sep_index}#{@db.escape_index(new_name)}#{@db.sep_index}")
+    @db.query("ALTER INDEX #{@db.quote_index(name)} RENAME TO #{@db.quote_index(new_name)}")
     @name = new_name.to_s
     self
   end

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

@@ -9,7 +9,7 @@ class Baza::Driver::Pg::Table < Baza::Table
 
   def drop
     @db.with_database(database_name) do
-      @db.query("DROP TABLE \"#{@db.escape_table(name)}\"")
+      @db.query("DROP TABLE #{@db.quote_table(name)}")
     end
   end
 
@@ -72,7 +72,7 @@ class Baza::Driver::Pg::Table < Baza::Table
   end
 
   def truncate
-    @db.query("TRUNCATE #{@db.sep_table}#{@db.escape_table(name)}#{@db.sep_table} RESTART IDENTITY")
+    @db.query("TRUNCATE #{@db.quote_table(name)} RESTART IDENTITY")
     self
   end
 
@@ -164,7 +164,7 @@ class Baza::Driver::Pg::Table < Baza::Table
   end
 
   def rename(new_name)
-    @db.query("ALTER TABLE #{@db.sep_table}#{@db.escape_table(name)}#{@db.sep_table} RENAME TO #{@db.sep_table}#{@db.escape_table(new_name)}#{@db.sep_table}")
+    @db.query("ALTER TABLE #{@db.quote_table(name)} RENAME TO #{@db.quote_table(new_name)}")
     @name = new_name.to_s
     self
   end
@@ -184,13 +184,13 @@ class Baza::Driver::Pg::Table < Baza::Table
 
   def rows_count
     @db.databases.with_database(database_name) do
-      sql = "SELECT COUNT(*) AS count FROM #{@db.sep_table}#{@db.escape_table(name)}#{@db.sep_table}"
+      sql = "SELECT COUNT(*) AS count FROM #{@db.quote_table(name)}"
       return @db.query(sql).fetch.fetch(:count).to_i
     end
   end
 
   def optimize
-    @db.query("VACUUM #{@db.sep_table}#{@db.escape_table(name)}#{@db.sep_table}")
+    @db.query("VACUUM #{@db.quote_table(name)}")
     self
   end
 
@@ -220,13 +220,13 @@ class Baza::Driver::Pg::Table < Baza::Table
 private
 
   def clone_insert_from_original_table(newname, columns_list)
-    sql_clone = "INSERT INTO #{@db.sep_table}#{@db.escape_table(newname)}#{@db.sep_table} ("
+    sql_clone = "INSERT INTO #{@db.quote_table(newname)} ("
 
     first = true
     columns_list.each do |column_data|
       sql_clone << "," unless first
       first = false if first
-      sql_clone << "#{@db.sep_col}#{@db.escape_column(column_data.fetch(:name))}#{@db.sep_col}"
+      sql_clone << @db.quote_column(column_data.fetch(:name))
     end
 
     sql_clone << ") SELECT "
@@ -235,10 +235,10 @@ private
     columns_list.each do |column_data|
       sql_clone << "," unless first
       first = false if first
-      sql_clone << "#{@db.sep_col}#{@db.escape_column(column_data.fetch(:name))}#{@db.sep_col}"
+      sql_clone << @db.quote_column(column_data.fetch(:name))
     end
 
-    sql_clone << " FROM #{@db.sep_table}#{@db.escape_table(name)}#{@db.sep_table}"
+    sql_clone << " FROM #{@db.quote_table(name)}"
 
     @db.query(sql_clone)
   end