Applied small adjustments and reorganized DB library code.

 -- Removed "ON UPDATE" from sessions.uid column FK
 -- Fixed dbSessionCheck to work as described
 -- Merged DB/Sessions.pm into DB/Users.pm

2 files changed, 33 insertions, 44 deletions

diff --git a/lib/VNDB/DB/Sessions.pm b/lib/VNDB/DB/Sessions.pm
deleted file mode 100644
index 031c5ac3..00000000
--- a/lib/VNDB/DB/Sessions.pm
+++ /dev/null
@@ -1,43 +0,0 @@
-
-package VNDB::DB::Sessions;
-
-use strict;
-use warnings;
-use Exporter 'import';
-
-our @EXPORT = qw| dbSessionAdd dbSessionDel dbSessionCheck |;
-
-
-# uid, 40 character session token, expiration time (int)
-sub dbSessionAdd {
-  my($s, @o) = @_;
-  $s->dbExec(q|INSERT INTO sessions (uid, token, expiration) VALUES(?, ?, ?)|,
-    @o[0..2]);
-}
-
-
-# Deletes session(s) from the database
-# If no token is supplied, all sessions for the uid are destroyed
-# uid, token (optional)
-sub dbSessionDel {
-  my($s, @o) = @_;
-  if (defined $o[1]) {
-    $s->dbExec(q|DELETE FROM sessions WHERE uid = ? AND token = ?|,
-      @o[0..1]);
-  } else {
-    $s->dbExec(q|DELETE FROM sessions WHERE uid = ?|,
-      $o[0]);
-  }
-}
-
-
-# Queries the database for the validity of a session
-# Returns 1 if corresponding session found, 0 if not
-# uid, token
-sub dbSessionCheck {
-  my($s, @o) = @_;
-  return $s->dbRow(q|SELECT count(uid) AS count FROM sessions WHERE uid = ? AND token = ? LIMIT 1|, @o);
-}
-
-
-1;
diff --git a/lib/VNDB/DB/Users.pm b/lib/VNDB/DB/Users.pm
index d5cdcc6c..1ea8daf5 100644
--- a/lib/VNDB/DB/Users.pm
+++ b/lib/VNDB/DB/Users.pm
@@ -5,7 +5,7 @@ use strict;
 use warnings;
 use Exporter 'import';
 
-our @EXPORT = qw|dbUserGet dbUserEdit dbUserAdd dbUserDel|;
+our @EXPORT = qw|dbUserGet dbUserEdit dbUserAdd dbUserDel dbSessionAdd dbSessionDel dbSessionCheck|;
 
 
 # %options->{ username passwd mail order uid ip registered search results page what }
@@ -111,4 +111,36 @@ sub dbUserDel {
 }
 
 
+# uid, 40 character session token, expiration time (int)
+sub dbSessionAdd {
+  my($s, @o) = @_;
+  $s->dbExec(q|INSERT INTO sessions (uid, token, expiration) VALUES(?, ?, ?)|,
+    @o[0..2]);
+}
+
+
+# Deletes session(s) from the database
+# If no token is supplied, all sessions for the uid are destroyed
+# uid, token (optional)
+sub dbSessionDel {
+  my($s, @o) = @_;
+  if (defined $o[1]) {
+    $s->dbExec(q|DELETE FROM sessions WHERE uid = ? AND token = ?|,
+      @o[0..1]);
+  } else {
+    $s->dbExec(q|DELETE FROM sessions WHERE uid = ?|,
+      $o[0]);
+  }
+}
+
+
+# Queries the database for the validity of a session
+# Returns 1 if corresponding session found, 0 if not
+# uid, token
+sub dbSessionCheck {
+  my($s, @o) = @_;
+  return $s->dbRow(q|SELECT count(uid) AS count FROM sessions WHERE uid = ? AND token = ? LIMIT 1|, @o)->{count}||0;
+}
+
+
 1;