1 files changed, 25 insertions, 18 deletions

diff --git a/src/database.rs b/src/database.rs
index e620241..5854e81 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -17,39 +17,47 @@
  ** You should have received a copy of the GNU Affero General Public License
  ** along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
-#[deprecated(since = "0.3.0", note = "Please use v2 instead")]
+#[deprecated(since = "0.4.0", note = "Please use v3 instead")]
 #[allow(dead_code)]
-pub mod v1 {
+pub mod v2 {
     pub const CREATE_TABLES: &str = r#"
     CREATE TABLE "accounts" (
         "user"	TEXT NOT NULL,
         "password"	TEXT NOT NULL,
+        "uid" TEXT NOT NULL,
         PRIMARY KEY("user")
     );
 
-
     CREATE TABLE "auth_meta" (
         "key"	TEXT NOT NULL,
         "value"	TEXT NOT NULL,
         PRIMARY KEY("key")
     );
 
-    INSERT INTO "auth_meta" VALUES ('version', '1');
+    CREATE TABLE "repo" (
+        "uid"	TEXT NOT NULL,
+        "repos"	TEXT NOT NULL,
+        "expire"	INTEGER,
+        PRIMARY KEY("uid")
+    );
+
+    INSERT INTO "auth_meta" VALUES ('version', '2');
     "#;
 
     pub const DROP_TABLES: &str = r#"
 
     DROP TABLE "accounts";
 
-    DROP TABLE "auth_meta";
+    DROP TABLE "repo";
 
+    DROP TABLE "auth_meta";
     "#;
 
-    pub const VERSION: &str = "1";
+    pub const VERSION: &str = "2";
 }
 
 #[allow(dead_code)]
-pub mod v2 {
+pub mod v3 {
     pub const CREATE_TABLES: &str = r#"
     CREATE TABLE "accounts" (
         "user"	TEXT NOT NULL,
@@ -64,29 +72,28 @@ pub mod v2 {
         PRIMARY KEY("key")
     );
 
-    CREATE TABLE "repo" (
-        "uid"	TEXT NOT NULL,
-        "repos"	TEXT NOT NULL,
-        "expire"	INTEGER,
-        PRIMARY KEY("uid")
+    CREATE TABLE "repos" (
+        "repo"	TEXT NOT NULL,
+        "users" TEXT NOT NULL,
+        PRIMARY KEY("repo")
     );
 
-    INSERT INTO "auth_meta" VALUES ('version', '2');
+    INSERT INTO "auth_meta" VALUES ('version', '3');
     "#;
 
     pub const DROP_TABLES: &str = r#"
 
     DROP TABLE "accounts";
 
-    DROP TABLE "repo";
+    DROP TABLE "repos";
 
     DROP TABLE "auth_meta";
     "#;
 
-    pub const VERSION: &str = "2";
+    pub const VERSION: &str = "3";
 }
 
 #[allow(deprecated)]
-pub use v1 as previous;
-pub use v2 as current;
-pub use v2::VERSION;
+pub use v2 as previous;
+pub use v3 as current;
+pub use v3::VERSION;