- 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/blootbot@726 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/setup/seen.sql b/setup/seen.sql
index 20b49665520987652256abf23b02c4491b01a615..9221c2b3515397a9203a4dd68a398d12c55b1d58 100644 (file)
--- a/setup/seen.sql
+++ b/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/setup/setup.pl b/setup/setup.pl
index 22ad599bc39ebeb2c1d65e601bd0dfeaa4872593..c7bc98b3c88e6c7f566d623836592c0a3b4753f1 100755 (executable)
--- a/setup/setup.pl
+++ b/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();