From 059c96c19507d0d20f9622f6d56b875291aeb8a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
<grubba@grubba.org>
Date: Thu, 6 Mar 1997 22:19:11 +0100
Subject: [PATCH] Updated to the new modulesystem.
Rev: lib/include/sql.h:1.2
Rev: lib/include/sql.pre.pike:1.7(DEAD)
---
.gitattributes | 1 -
lib/include/sql.h | 1 +
lib/include/sql.pre.pike | 327 ---------------------------------------
3 files changed, 1 insertion(+), 328 deletions(-)
delete mode 100644 lib/include/sql.pre.pike
diff --git a/.gitattributes b/.gitattributes
index 9e4b819952..1a28991a07 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,7 +9,6 @@ testfont binary
# Files containing CVS ids follow.
# Remove the corresponding line before committing
# changes to these files.
-/lib/include/sql.pre.pike foreign_ident
/lib/modules/LR.pmod/Grammar_parser.pmod foreign_ident
/lib/modules/LR.pmod/item.pike foreign_ident
/lib/modules/LR.pmod/kernel.pike foreign_ident
diff --git a/lib/include/sql.h b/lib/include/sql.h
index e69de29bb2..9314578174 100644
--- a/lib/include/sql.h
+++ b/lib/include/sql.h
@@ -0,0 +1 @@
+import Sql;
diff --git a/lib/include/sql.pre.pike b/lib/include/sql.pre.pike
deleted file mode 100644
index 0c5f358804..0000000000
--- a/lib/include/sql.pre.pike
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * $Id: sql.pre.pike,v 1.6 1997/01/15 19:58:44 grubba Exp $
- *
- * Implements the generic parts of the SQL-interface
- *
- * Henrik Grubbstr�m 1996-01-09
- */
-
-/* Needed for regexp() */
-#include <simulate.h>
-/* Needed for map() */
-#include <array.h>
-
-#define throw_error(X) throw(({ (X), backtrace() }))
-
-class sql_result {
- object|array master_res;
- int index;
-
- void create(object|array res)
- {
- if (!(master_res = res) || (!arrayp(res) && !objectp(res))) {
- throw_error("Bad arguments to Sql_result()\n");
- }
- index = 0;
- }
-
- int num_rows()
- {
- if (arrayp(master_res)) {
- return(sizeof(master_res));
- }
- return(master_res->num_rows());
- }
-
- int num_fields()
- {
- if (arrayp(master_res)) {
- return(sizeof(master_res[0]));
- }
- return(master_res->num_fields());
- }
-
- int eof()
- {
- if (arrayp(master_res)) {
- return(index >= sizeof(master_res));
- }
- return(master_res->eof());
- }
-
- array(mapping(string:mixed)) fetch_fields()
- {
- if (arrayp(master_res)) {
- /* Only supports the name field */
- array(mapping(string:mixed)) res = allocate(sizeof(master_res));
- int index = 0;
-
- foreach(sort(indices(master_res)), string name) {
- res[index++] = ([ "name": name ]);
- }
- return(res);
- }
- return(master_res->fetch_fields());
- }
-
- void seek(int skip)
- {
- if (skip < 0) {
- throw_error("seek(): Argument 1 not positive\n");
- }
- if (arrayp(master_res)) {
- index += skip;
- } else if (functionp(master_res->seek)) {
- master_res->seek(index);
- } else {
- while (skip--) {
- master_res->fetch_row();
- }
- }
- }
-
- int|array(string|int) fetch_row()
- {
- if (arrayp(master_res)) {
- array res;
-
- if (index >= sizeof(master_res)) {
- return(0);
- }
- sort(indices(master_res[index]), res = values(master_res[index]));
- return(res);
- }
- return (master_res->fetch_row());
- }
-}
-
-class sql {
- object master_sql;
-
- void create(void|string|object host, void|string db,
- void|string user, void|string password)
- {
- if (objectp(host)) {
- master_sql = host;
- if ((user && user != "") || (password && password != "")) {
- throw_error("Sql(): Only the database argument is supported when "
- "first argument is an object\n");
- }
- if (db && db != "") {
- master_sql->select_db(db);
- }
- return;
- } else {
- foreach(regexp(indices(master()->programs), "/precompiled/sql/.*"),
- string program_name) {
- if (sizeof(program_name / "_result") == 1) {
- array(mixed) err;
-
- err = catch {
- if (password && password != "") {
- master_sql = ((program)program_name)(host||"", db||"",
- user||"", password);
- } else if (user && user != "") {
- master_sql = ((program)program_name)(host||"", db||"", user);
- } else if (db && db != "") {
- master_sql = ((program)program_name)(host||"", db);
- } else if (host && host != "") {
- master_sql = ((program)program_name)(host);
- } else {
- master_sql = ((program)program_name)();
- }
- return;
- };
- }
- }
- }
-
- throw_error("Sql(): Couldn't connect to database\n");
- }
-
- static private array(mapping(string:mixed)) res_obj_to_array(object res_obj)
- {
- if (res_obj) {
- /* Not very efficient, but sufficient */
- array(mapping(string:mixed)) res = ({});
- array(string) fieldnames;
- array(mixed) row;
-
- fieldnames = map(res_obj->fetch_fields(),
- lambda (mapping(string:mixed) m) {
- return(m->name); /* Hope this is unique */
- } );
-
- while (row = res_obj->fetch_row()) {
- res += ({ mkmapping(fieldnames, row) });
- }
- return(res);
- } else {
- return(0);
- }
- }
-
- int|string error()
- {
- return(master_sql->error());
- }
-
- void select_db(string db) {
- master_sql->select_db(db);
- }
-
- array(mapping(string:mixed)) query(string s)
- {
- object res_obj;
-
- if (functionp(master_sql->query)) {
- return(master_sql->query(s));
- }
- return(res_obj_to_array(master_sql->big_query(s)));
- }
-
- object big_query(string q)
- {
- if (functionp(master_sql->big_query)) {
- return(((program)"/precompiled/sql_result")(master_sql->big_query(q)));
- }
- return(((program)"/precompiled/sql_result")(master_sql->query(q)));
- }
-
- void create_db(string db)
- {
- master_sql->create_db(db);
- }
-
- void drop_db(string db)
- {
- master_sql->drop_db(db);
- }
-
- void shutdown()
- {
- if (functionp(master_sql->shutdown)) {
- master_sql->shutdown();
- } else {
- throw_error("sql->shutdown(): Not supported by this database\n");
- }
- }
-
- void reload()
- {
- if (functionp(master_sql->reload)) {
- master_sql->reload();
- } else {
- /* Probably safe to make this a NOOP */
- }
- }
-
- string server_info()
- {
- if (functionp(master_sql->server_info)) {
- return(master_sql->server_info());
- }
- return("Unknown SQL-server");
- }
-
- string host_info()
- {
- if (functionp(master_sql->host_info)) {
- return(master_sql->host_info());
- }
- return("Unknown connection to host");
- }
-
- array(string) list_dbs(string|void wild)
- {
- array(string)|array(mapping(string:mixed))|object res;
-
- if (functionp(master_sql->list_dbs)) {
- if (objectp(res = master_sql->list_dbs())) {
- res = res_obj_to_array(res);
- }
- } else {
- res = query("show databases");
- }
- if (sizeof(res) && mappingp(res[0])) {
- res = map(res, lambda (mapping m) {
- return(values(m)[0]); /* Hope that there's only one field */
- } );
- }
- if (wild) {
- res = regexp(res, replace(wild, ({ "%", "_" }), ({ ".*", "." }) ));
- }
- return(res);
- }
-
- array(string) list_tables(string|void wild)
- {
- array(string)|array(mapping(string:mixed))|object res;
-
- if (functionp(master_sql->list_tables)) {
- if (objectp(res = master_sql->list_tables())) {
- res = res_obj_to_array(res);
- }
- } else {
- res = query("show tables");
- }
- if (sizeof(res) && mappingp(res[0])) {
- res = map(res, lambda (mapping m) {
- return(values(m)[0]); /* Hope that there's only one field */
- } );
- }
- if (wild) {
- res = regexp(res, replace(wild, ({ "%", "_" }), ({ ".*", "." }) ));
- }
- return(res);
- }
-
- array(mapping(string:mixed)) list_fields(string table, string|void wild)
- {
- array(mapping(string:mixed))|object res;
-
- if (functionp(master_sql->list_fields)) {
- if (objectp(res = master_sql->list_fields(table))) {
- res = res_obj_to_array(res);
- }
- if (wild) {
- /* Not very efficient, but... */
- res = filter(res, lambda (mapping m, string re) {
- return(sizeof(regexp( ({ m->name }), re)));
- }, replace(wild, ({ "%", "_" }), ({ ".*", "." }) ) );
- }
- return(res);
- }
- if (wild) {
- res = query("show fields from \'" + table +
- "\' like \'" + wild + "\'");
- } else {
- res = query("show fields from \'" + table + "\'");
- }
- res = map(res, lambda (mapping m, string table) {
- foreach(indices(m), string str) {
- /* Add the lower case variants */
- string low_str = lower_case(str);
- if (low_str != str && !m[low_str]) {
- m[low_str] = m[str];
- m_delete(m, str); /* Remove duplicate */
- }
- }
- if ((!m->name) && m->field) {
- m["name"] = m->field;
- m_delete(m, "field"); /* Remove duplicate */
- }
- if (!m->table) {
- m["table"] = table;
- }
- return(m);
- }, table);
- return(res);
- }
-}
-
-void create()
-{
- master()->add_precompiled_program("/precompiled/sql", sql);
- master()->add_precompiled_program("/precompiled/sql_result", sql_result);
-}
--
GitLab