mirror of
https://github.com/lloeki/rebel.git
synced 2025-12-06 10:04:39 +01:00
fix namespaced calling
This commit is contained in:
parent
17db89cbc4
commit
b698263f37
1 changed files with 32 additions and 32 deletions
|
|
@ -6,11 +6,11 @@ module Rebel::SQL
|
||||||
end
|
end
|
||||||
|
|
||||||
def create_table(table_name, desc)
|
def create_table(table_name, desc)
|
||||||
exec(SQL.create_table(table_name, desc))
|
exec(Rebel::SQL.create_table(table_name, desc))
|
||||||
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)
|
||||||
exec(SQL.select(*fields,
|
exec(Rebel::SQL.select(*fields,
|
||||||
from: from,
|
from: from,
|
||||||
where: where,
|
where: where,
|
||||||
inner: inner,
|
inner: inner,
|
||||||
|
|
@ -19,36 +19,36 @@ module Rebel::SQL
|
||||||
end
|
end
|
||||||
|
|
||||||
def insert_into(table_name, *rows)
|
def insert_into(table_name, *rows)
|
||||||
exec(SQL.insert_into(table_name, *rows))
|
exec(Rebel::SQL.insert_into(table_name, *rows))
|
||||||
end
|
end
|
||||||
|
|
||||||
def update(table_name, set: nil, where: nil, inner: nil, left: nil, right: nil)
|
def update(table_name, set: nil, where: nil, inner: nil, left: nil, right: nil)
|
||||||
exec(SQL.update(table_name, set: set, where: where, inner: inner, left: left, right: right))
|
exec(Rebel::SQL.update(table_name, set: set, where: where, inner: inner, left: left, right: right))
|
||||||
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)
|
||||||
exec(SQL.delete_from(table_name, where: where, inner: inner, left: left, right: right))
|
exec(Rebel::SQL.delete_from(table_name, where: where, inner: inner, left: left, right: right))
|
||||||
end
|
end
|
||||||
|
|
||||||
def truncate(table_name)
|
def truncate(table_name)
|
||||||
exec(SQL.truncate(table_name))
|
exec(Rebel::SQL.truncate(table_name))
|
||||||
end
|
end
|
||||||
|
|
||||||
def count(*n)
|
def count(*n)
|
||||||
SQL.count(*n)
|
Rebel::SQL.count(*n)
|
||||||
end
|
end
|
||||||
|
|
||||||
def join(table, on: nil)
|
def join(table, on: nil)
|
||||||
SQL.join(table, on: on)
|
Rebel::SQL.join(table, on: on)
|
||||||
end
|
end
|
||||||
|
|
||||||
def outer_join(table, on: nil)
|
def outer_join(table, on: nil)
|
||||||
SQL.outer_join(table, on: on)
|
Rebel::SQL.outer_join(table, on: on)
|
||||||
end
|
end
|
||||||
|
|
||||||
class Raw < String
|
class Raw < String
|
||||||
def as(n)
|
def as(n)
|
||||||
Raw.new(self + " AS #{SQL.name(n)}")
|
Raw.new(self + " AS #{Rebel::SQL.name(n)}")
|
||||||
end
|
end
|
||||||
|
|
||||||
def as?(n)
|
def as?(n)
|
||||||
|
|
@ -56,7 +56,7 @@ module Rebel::SQL
|
||||||
end
|
end
|
||||||
|
|
||||||
def on(clause)
|
def on(clause)
|
||||||
Raw.new(self + " ON #{SQL.and_clause(clause)}")
|
Raw.new(self + " ON #{Rebel::SQL.and_clause(clause)}")
|
||||||
end
|
end
|
||||||
|
|
||||||
def on?(clause)
|
def on?(clause)
|
||||||
|
|
@ -71,8 +71,8 @@ module Rebel::SQL
|
||||||
|
|
||||||
def create_table(table_name, desc)
|
def create_table(table_name, desc)
|
||||||
<<-SQL
|
<<-SQL
|
||||||
CREATE TABLE #{SQL.name(table_name)} (
|
CREATE TABLE #{Rebel::SQL.name(table_name)} (
|
||||||
#{SQL.list(desc.map { |k, v| "#{SQL.name(k)} #{v}" })}
|
#{Rebel::SQL.list(desc.map { |k, v| "#{Rebel::SQL.name(k)} #{v}" })}
|
||||||
);
|
);
|
||||||
SQL
|
SQL
|
||||||
end
|
end
|
||||||
|
|
@ -80,17 +80,17 @@ module Rebel::SQL
|
||||||
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)}
|
||||||
#{SQL.inner?(inner)}
|
#{Rebel::SQL.inner?(inner)}
|
||||||
#{SQL.left?(left)}
|
#{Rebel::SQL.left?(left)}
|
||||||
#{SQL.right?(right)}
|
#{Rebel::SQL.right?(right)}
|
||||||
#{SQL.where?(where)};
|
#{Rebel::SQL.where?(where)};
|
||||||
SQL
|
SQL
|
||||||
end
|
end
|
||||||
|
|
||||||
def insert_into(table_name, *rows)
|
def insert_into(table_name, *rows)
|
||||||
<<-SQL
|
<<-SQL
|
||||||
INSERT INTO #{SQL.name(table_name)} (#{SQL.names(*rows.first.keys)})
|
INSERT INTO #{Rebel::SQL.name(table_name)} (#{Rebel::SQL.names(*rows.first.keys)})
|
||||||
VALUES #{SQL.list(rows.map { |r| "(#{SQL.values(*r.values)})" })};
|
VALUES #{Rebel::SQL.list(rows.map { |r| "(#{Rebel::SQL.values(*r.values)})" })};
|
||||||
SQL
|
SQL
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -98,28 +98,28 @@ module Rebel::SQL
|
||||||
fail ArgumentError if set.nil?
|
fail ArgumentError if set.nil?
|
||||||
|
|
||||||
<<-SQL
|
<<-SQL
|
||||||
UPDATE #{SQL.name(table_name)}
|
UPDATE #{Rebel::SQL.name(table_name)}
|
||||||
SET #{SQL.assign_clause(set)}
|
SET #{Rebel::SQL.assign_clause(set)}
|
||||||
#{SQL.inner?(inner)}
|
#{Rebel::SQL.inner?(inner)}
|
||||||
#{SQL.left?(left)}
|
#{Rebel::SQL.left?(left)}
|
||||||
#{SQL.right?(right)}
|
#{Rebel::SQL.right?(right)}
|
||||||
#{SQL.where?(where)};
|
#{Rebel::SQL.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 #{SQL.name(table_name)}
|
DELETE FROM #{Rebel::SQL.name(table_name)}
|
||||||
#{SQL.inner?(inner)}
|
#{Rebel::SQL.inner?(inner)}
|
||||||
#{SQL.left?(left)}
|
#{Rebel::SQL.left?(left)}
|
||||||
#{SQL.right?(right)}
|
#{Rebel::SQL.right?(right)}
|
||||||
#{SQL.where?(where)};
|
#{Rebel::SQL.where?(where)};
|
||||||
SQL
|
SQL
|
||||||
end
|
end
|
||||||
|
|
||||||
def truncate(table_name)
|
def truncate(table_name)
|
||||||
<<-SQL
|
<<-SQL
|
||||||
TRUNCATE #{SQL.name(table_name)};
|
TRUNCATE #{Rebel::SQL.name(table_name)};
|
||||||
SQL
|
SQL
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -195,7 +195,7 @@ module Rebel::SQL
|
||||||
def where?(clause)
|
def where?(clause)
|
||||||
return "WHERE #{clause}" if clause.is_a?(Raw) || clause.is_a?(String)
|
return "WHERE #{clause}" if clause.is_a?(Raw) || clause.is_a?(String)
|
||||||
|
|
||||||
(clause && clause.any?) ? "WHERE #{SQL.and_clause(clause)}" : nil
|
(clause && clause.any?) ? "WHERE #{Rebel::SQL.and_clause(clause)}" : nil
|
||||||
end
|
end
|
||||||
|
|
||||||
def inner?(join)
|
def inner?(join)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue