[project @ Add NOT NULL constraints to SQL stores]

2 files changed, 20 insertions, 14 deletions

diff --git a/Auth/OpenID/MySQLStore.php b/Auth/OpenID/MySQLStore.php
index 8ae32b2..eb08af0 100644
--- a/Auth/OpenID/MySQLStore.php
+++ b/Auth/OpenID/MySQLStore.php
@@ -24,20 +24,20 @@ class Auth_OpenID_MySQLStore extends Auth_OpenID_SQLStore {
     {
         $this->sql['nonce_table'] =
             "CREATE TABLE %s (\n".
-            "  server_url VARCHAR(2047),\n".
-            "  timestamp INTEGER,\n".
-            "  salt CHAR(40),\n".
+            "  server_url VARCHAR(2047) NOT NULL,\n".
+            "  timestamp INTEGER NOT NULL,\n".
+            "  salt CHAR(40) NOT NULL,\n".
             "  UNIQUE (server_url(255), timestamp, salt)\n".
             ") ENGINE=InnoDB";
 
         $this->sql['assoc_table'] =
             "CREATE TABLE %s (\n".
-            "  server_url BLOB,\n".
-            "  handle VARCHAR(255),\n".
-            "  secret BLOB,\n".
-            "  issued INTEGER,\n".
-            "  lifetime INTEGER,\n".
-            "  assoc_type VARCHAR(64),\n".
+            "  server_url BLOB NOT NULL,\n".
+            "  handle VARCHAR(255) NOT NULL,\n".
+            "  secret BLOB NOT NULL,\n".
+            "  issued INTEGER NOT NULL,\n".
+            "  lifetime INTEGER NOT NULL,\n".
+            "  assoc_type VARCHAR(64) NOT NULL,\n".
             "  PRIMARY KEY (server_url(255), handle)\n".
             ") ENGINE=InnoDB";
 
diff --git a/Auth/OpenID/PostgreSQLStore.php b/Auth/OpenID/PostgreSQLStore.php
index c7d19f3..69d95e7 100644
--- a/Auth/OpenID/PostgreSQLStore.php
+++ b/Auth/OpenID/PostgreSQLStore.php
@@ -23,13 +23,19 @@ class Auth_OpenID_PostgreSQLStore extends Auth_OpenID_SQLStore {
     function setSQL()
     {
         $this->sql['nonce_table'] =
-            "CREATE TABLE %s (server_url VARCHAR(2047), timestamp INTEGER, ".
-            "salt CHAR(40), UNIQUE (server_url, timestamp, salt))";
+            "CREATE TABLE %s (server_url VARCHAR(2047) NOT NULL, ".
+                             "timestamp INTEGER NOT NULL, ".
+                             "salt CHAR(40) NOT NULL, ".
+                "UNIQUE (server_url, timestamp, salt))";
 
         $this->sql['assoc_table'] =
-            "CREATE TABLE %s (server_url VARCHAR(2047), handle VARCHAR(255), ".
-            "secret BYTEA, issued INTEGER, lifetime INTEGER, ".
-            "assoc_type VARCHAR(64), PRIMARY KEY (server_url, handle), ".
+            "CREATE TABLE %s (server_url VARCHAR(2047) NOT NULL, ". 
+                             "handle VARCHAR(255) NOT NULL, ".
+                             "secret BYTEA NOT NULL, ".
+                             "issued INTEGER NOT NULL, ".
+                             "lifetime INTEGER NOT NULL, ".
+                             "assoc_type VARCHAR(64) NOT NULL, ".
+            "PRIMARY KEY (server_url, handle), ".
             "CONSTRAINT secret_length_constraint CHECK ".
             "(LENGTH(secret) <= 128))";