remove useless absolute qualifiers

This commit is contained in:
Loic Nageleisen 2017-03-03 15:06:16 +01:00
parent 448a342d5f
commit ee34b9c600

View file

@ -158,32 +158,32 @@ module Rebel::SQL
def create_table(table_name, desc) def create_table(table_name, desc)
<<-SQL <<-SQL
CREATE TABLE #{Rebel::SQL.name(table_name)} ( CREATE TABLE #{name(table_name)} (
#{Rebel::SQL.list(desc.map { |k, v| "#{Rebel::SQL.name(k)} #{v}" })} #{list(desc.map { |k, v| "#{name(k)} #{v}" })}
); );
SQL SQL
end end
def drop_table(table_name) def drop_table(table_name)
<<-SQL <<-SQL
DROP TABLE #{Rebel::SQL.name(table_name)}; DROP TABLE #{name(table_name)};
SQL SQL
end end
def select(*fields, from: nil, where: nil, inner: nil, left: nil, right: nil) def select(*fields, from: nil, where: nil, inner: nil, left: nil, right: nil)
<<-SQL <<-SQL
SELECT #{names(*fields)} FROM #{name(from)} SELECT #{names(*fields)} FROM #{name(from)}
#{Rebel::SQL.inner?(inner)} #{inner?(inner)}
#{Rebel::SQL.left?(left)} #{left?(left)}
#{Rebel::SQL.right?(right)} #{right?(right)}
#{Rebel::SQL.where?(where)}; #{where?(where)};
SQL SQL
end end
def insert_into(table_name, *rows) def insert_into(table_name, *rows)
<<-SQL <<-SQL
INSERT INTO #{Rebel::SQL.name(table_name)} (#{Rebel::SQL.names(*rows.first.keys)}) INSERT INTO #{name(table_name)} (#{names(*rows.first.keys)})
VALUES #{Rebel::SQL.list(rows.map { |r| "(#{Rebel::SQL.values(*r.values)})" })}; VALUES #{list(rows.map { |r| "(#{values(*r.values)})" })};
SQL SQL
end end
@ -191,28 +191,28 @@ module Rebel::SQL
raise ArgumentError if set.nil? raise ArgumentError if set.nil?
<<-SQL <<-SQL
UPDATE #{Rebel::SQL.name(table_name)} UPDATE #{name(table_name)}
SET #{Rebel::SQL.assign_clause(set)} SET #{assign_clause(set)}
#{Rebel::SQL.inner?(inner)} #{inner?(inner)}
#{Rebel::SQL.left?(left)} #{left?(left)}
#{Rebel::SQL.right?(right)} #{right?(right)}
#{Rebel::SQL.where?(where)}; #{where?(where)};
SQL SQL
end end
def delete_from(table_name, where: nil, inner: nil, left: nil, right: nil) def delete_from(table_name, where: nil, inner: nil, left: nil, right: nil)
<<-SQL <<-SQL
DELETE FROM #{Rebel::SQL.name(table_name)} DELETE FROM #{name(table_name)}
#{Rebel::SQL.inner?(inner)} #{inner?(inner)}
#{Rebel::SQL.left?(left)} #{left?(left)}
#{Rebel::SQL.right?(right)} #{right?(right)}
#{Rebel::SQL.where?(where)}; #{where?(where)};
SQL SQL
end end
def truncate(table_name) def truncate(table_name)
<<-SQL <<-SQL
TRUNCATE #{Rebel::SQL.name(table_name)}; TRUNCATE #{name(table_name)};
SQL SQL
end end
@ -321,7 +321,7 @@ module Rebel::SQL
end end
def where?(*clause) def where?(*clause)
clause.any? ? "WHERE #{Rebel::SQL.and_clause(*clause)}" : nil clause.any? ? "WHERE #{and_clause(*clause)}" : nil
end end
def inner?(join) def inner?(join)