From: dms <dms@c11ca15a-4712-0410-83d8-924469b57eb5>
Date: Thu, 5 Dec 2002 16:35:24 +0000 (+0000)
Subject: - add channel to primary key.
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=17172c28b30c2ca68fa1477783d36f5a004f65fe;p=infobot.git

- add channel to primary key.
- forgot to commit this from Morten.  my bad.


git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk@726 c11ca15a-4712-0410-83d8-924469b57eb5
---

diff --git a/blootbot/setup/seen.sql b/blootbot/setup/seen.sql
index 20b4966..9221c2b 100644
--- a/blootbot/setup/seen.sql
+++ b/blootbot/setup/seen.sql
@@ -5,5 +5,5 @@ CREATE TABLE seen (
 	host VARCHAR(80) NOT NULL,
 	message TINYTEXT NOT NULL,
 
-	PRIMARY KEY (nick)
+	PRIMARY KEY (nick,channel)
 );
diff --git a/blootbot/setup/setup.pl b/blootbot/setup/setup.pl
index 22ad599..c7bc98b 100755
--- a/blootbot/setup/setup.pl
+++ b/blootbot/setup/setup.pl
@@ -3,8 +3,8 @@
 # written by the xk.
 ###
 
-require "src/core.pl";
 require "src/logger.pl";
+require "src/core.pl";
 require "src/modules.pl";
 require "src/Misc.pl";
 require "src/interface.pl";
@@ -18,7 +18,7 @@ my $dbname = $param{'DBName'};
 my $query;
 
 if ($dbname eq "") {
-  print "error: appears that teh config file was not loaded properly.\n";
+  print "error: appears that the config file was not loaded properly.\n";
   exit 1;
 }
 
@@ -42,22 +42,22 @@ if ($param{'DBType'} =~ /mysql/i) {
 	exit 1;
     }
 
-    &openDB("mysql", $adminuser, $adminpass);
+    &sqlOpenDB("mysql", "mysql", $adminuser, $adminpass);
 
     my $database_exists = 0;
-    foreach $database (&dbRawReturn("SHOW DATABASES")) {
+    foreach $database (&sqlRawReturn("SHOW DATABASES")) {
 	$database_exists++ if $database eq $param{DBName};
     }
     if ($database_exists) {
 	&status("Database '$param{DBName}' already exists. Continuing...");
     } else {
 	&status("Creating db ...");
-	&dbRaw("create(database)", "CREATE DATABASE $param{DBName}");
+	&sqlRaw("create(database)", "CREATE DATABASE $param{DBName}");
     }
 
     &status("--- Adding user information for user '$param{'SQLUser'}'");
 
-    if (!&dbGet("user","user", "user=".&dbQuote($param{'SQLUser'}) ) ) {
+    if (!&sqlSelect("user", "user", { 'user' => &sqlQuote($param{'SQLUser'}) })) {
 	&status("--- Adding user '$param{'SQLUser'}' $dbname/user table...");
 
 	$query = "INSERT INTO user VALUES ".
@@ -66,12 +66,12 @@ if ($param{'DBType'} =~ /mysql/i) {
 
 	$query .= "'Y','Y','Y','Y','Y','Y','N','N','N','N','N','N','N','N')";
 
-	&dbRaw("create(user)", $query);
+	&sqlRaw("create(user)", $query);
     } else {
 	&status("... user information already present.");
     }
 
-    if (!&dbGet("db","db","db=".&dbQuote($param{'SQLUser'}) ) ) {
+    if (!&sqlSelect("db", "db", { 'db' => &sqlQuote($param{'SQLUser'}) })) {
 	&status("--- Adding database information for database '$dbname'.");
 
 	$query = "INSERT INTO db VALUES ".
@@ -80,7 +80,7 @@ if ($param{'DBType'} =~ /mysql/i) {
 
 	$query .= "'Y','Y','Y','Y','Y','Y','Y','N','N','N')";
 
-	&dbRaw("create(db)", $query);
+	&sqlRaw("create(db)", $query);
     } else {
 	&status("... db info already present.");
     }
@@ -88,9 +88,9 @@ if ($param{'DBType'} =~ /mysql/i) {
     # flush.
     &status("Flushing privileges...");
     $query = "FLUSH PRIVILEGES";
-    &dbRaw("mysql(flush)", $query);
+    &sqlRaw("mysql(flush)", $query);
 }
 
 &status("Done.");
 
-&closeDB();
+&sqlCloseDB();