util.sql: Remove unused functions and unused commented code

This commit is contained in:
Matthew Wild 2015-05-30 22:23:19 +01:00
parent e909a53de5
commit bfba36b194

View file

@ -25,34 +25,9 @@ function is_column(x) return getmetatable(x)==column_mt; end
function is_index(x) return getmetatable(x)==index_mt; end
function is_table(x) return getmetatable(x)==table_mt; end
function is_query(x) return getmetatable(x)==query_mt; end
--function is_op(x) return getmetatable(x)==op_mt; end
--function expr(...) return setmetatable({...}, op_mt); end
function Integer(n) return "Integer()" end
function String(n) return "String()" end
--[[local ops = {
__add = function(a, b) return "("..a.."+"..b..")" end;
__sub = function(a, b) return "("..a.."-"..b..")" end;
__mul = function(a, b) return "("..a.."*"..b..")" end;
__div = function(a, b) return "("..a.."/"..b..")" end;
__mod = function(a, b) return "("..a.."%"..b..")" end;
__pow = function(a, b) return "POW("..a..","..b..")" end;
__unm = function(a) return "NOT("..a..")" end;
__len = function(a) return "COUNT("..a..")" end;
__eq = function(a, b) return "("..a.."=="..b..")" end;
__lt = function(a, b) return "("..a.."<"..b..")" end;
__le = function(a, b) return "("..a.."<="..b..")" end;
};
local functions = {
};
local cmap = {
[Integer] = Integer();
[String] = String();
};]]
function Column(definition)
return setmetatable(definition, column_mt);
end
@ -94,7 +69,6 @@ function index_mt:__tostring()
return s..' }';
-- return 'Index{ name="'..self.name..'", type="'..self.type..'" }'
end
--
local function urldecode(s) return s and (s:gsub("%%(%x%x)", function (c) return s_char(tonumber(c,16)); end)); end
local function parse_url(url)
@ -121,26 +95,6 @@ local function parse_url(url)
};
end
--[[local session = {};
function session.query(...)
local rets = {...};
local query = setmetatable({ __rets = rets, __filters }, query_mt);
return query;
end
--
local function db2uri(params)
return build_url{
scheme = params.driver,
user = params.username,
password = params.password,
host = params.host,
port = params.port,
path = params.database,
};
end]]
local engine = {};
function engine:connect()
if self.conn then return true; end
@ -339,45 +293,4 @@ function create_engine(self, params)
return engine_cache[url];
end
--[[Users = Table {
name="users";
Column { name="user_id", type=String(), primary_key=true };
};
print(Users)
print(Users.c.user_id)]]
--local engine = create_engine('postgresql://scott:tiger@localhost:5432/mydatabase');
--[[local engine = create_engine{ driver = "SQLite3", database = "./alchemy.sqlite" };
local i = 0;
for row in assert(engine:execute("select * from sqlite_master")):rows(true) do
i = i+1;
print(i);
for k,v in pairs(row) do
print("",k,v);
end
end
print("---")
Prosody = Table {
name="prosody";
Column { name="host", type="TEXT", nullable=false };
Column { name="user", type="TEXT", nullable=false };
Column { name="store", type="TEXT", nullable=false };
Column { name="key", type="TEXT", nullable=false };
Column { name="type", type="TEXT", nullable=false };
Column { name="value", type="TEXT", nullable=false };
Index { name="prosody_index", "host", "user", "store", "key" };
};
--print(Prosody);
assert(engine:transaction(function()
assert(Prosody:create(engine));
end));
for row in assert(engine:execute("select user from prosody")):rows(true) do
print("username:", row['username'])
end
--result.close();]]
return _M;