summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-11-20 02:50:43 -0800
committerEvan Prodromou <evan@status.net>2009-11-20 02:50:43 -0800
commit224d82793c769c06d1e4f39c19cd5f2e9cf519b0 (patch)
tree4e80725739ecae1a196f7f5517b33060d6fe3518 /db
parentc0d4e0990ff4dfaa8eb6b8864be7bb07ea64551d (diff)
Revert "Added 'login' command that gives you a link that can be used to login to the website"
This reverts commit b9d40f723bce8e01ddcbbb989bd7035b92cd9af8. Conflicts: actions/login.php classes/statusnet.ini db/08to09.sql db/08to09_pg.sql db/statusnet_pg.sql lib/command.php lib/commandinterpreter.php
Diffstat (limited to 'db')
-rw-r--r--db/08to09.sql11
-rw-r--r--db/08to09_pg.sql12
-rw-r--r--db/statusnet.sql10
-rw-r--r--db/statusnet_pg.sql12
4 files changed, 3 insertions, 42 deletions
diff --git a/db/08to09.sql b/db/08to09.sql
index 64640f4ce..8d463fab4 100644
--- a/db/08to09.sql
+++ b/db/08to09.sql
@@ -72,13 +72,4 @@ create table location_namespace (
created datetime not null comment 'date the record was created',
modified timestamp comment 'date this record was modified'
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table login_token (
- user_id integer not null comment 'user owning this token' references user (id),
- token char(32) not null comment 'token useable for logging in',
- created datetime not null comment 'date this record was created',
- modified timestamp comment 'date this record was modified',
-
- constraint primary key (user_id)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; \ No newline at end of file
diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql
index 7aaf3a7a0..de6a82209 100644
--- a/db/08to09_pg.sql
+++ b/db/08to09_pg.sql
@@ -39,15 +39,6 @@ create table profile_role (
);
-create table login_token (
- user_id integer not null /* comment 'user owning this token'*/ references "user" (id),
- token char(32) not null /* comment 'token useable for logging in'*/,
- created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/,
- modified timestamp /* comment 'date this record was modified'*/,
-
- primary key (user_id)
-);
-
DROP index fave_user_id_idx;
CREATE index fave_user_id_idx on fave (user_id,modified);
@@ -58,5 +49,4 @@ DROP index subscription_subscribed_idx;
CREATE index subscription_subscribed_idx ON subscription (subscribed,created);
DROP index notice_profile_id_idx;
-CREATE index notice_profile_id_idx ON notice (profile_id,created,id);
-
+CREATE index notice_profile_id_idx ON notice (profile_id,created,id); \ No newline at end of file
diff --git a/db/statusnet.sql b/db/statusnet.sql
index 18abcdfdb..f7b3b113b 100644
--- a/db/statusnet.sql
+++ b/db/statusnet.sql
@@ -575,13 +575,3 @@ create table location_namespace (
modified timestamp comment 'date this record was modified'
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
-create table login_token (
- user_id integer not null comment 'user owning this token' references user (id),
- token char(32) not null comment 'token useable for logging in',
- created datetime not null comment 'date this record was created',
- modified timestamp comment 'date this record was modified',
-
- constraint primary key (user_id)
-) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
-
diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql
index 927925753..27b189e28 100644
--- a/db/statusnet_pg.sql
+++ b/db/statusnet_pg.sql
@@ -568,14 +568,4 @@ create table profile_role (
primary key (profile_id, role)
-);
-
-create table login_token (
- user_id integer not null /* comment 'user owning this token'*/ references "user" (id),
- token char(32) not null /* comment 'token useable for logging in'*/,
- created timestamp not null DEFAULT CURRENT_TIMESTAMP /* comment 'date this record was created'*/,
- modified timestamp /* comment 'date this record was modified'*/,
-
- primary key (user_id)
-);
-
+); \ No newline at end of file