Migrate the database schema to SQLAlchemy

The new schema was generated with sqlacodegen and then manually adjusted
to fit schema/aur-schema.sql faithfully, both in the organisation of the
code and in the SQL generated by SQLAlchemy.

Initializing the database now requires the new tool aurweb.initdb.
References to aur-schema.sql have been updated and the old schema
dropped.

Signed-off-by: Lukas Fleischer <lfleischer@archlinux.org>

INSTALL

@@ -45,16 +45,16 @@ read the instructions below.
    if the defaults file does not exist) and adjust the configuration (pay
    attention to disable_http_login, enable_maintenance and aur_location).
 
-4) Create a new MySQL database and a user and import the aurweb SQL schema:
+4) Install Python modules and dependencies:
 
-    $ mysql -uaur -p AUR </srv/http/aurweb/schema/aur-schema.sql
-
-5) Install Python modules and dependencies:
-
-    # pacman -S python-mysql-connector python-pygit2 python-srcinfo
+    # pacman -S python-mysql-connector python-pygit2 python-srcinfo python-sqlalchemy
     # pacman -S python-bleach python-markdown
     # python3 setup.py install
 
+5) Create a new MySQL database and a user and import the aurweb SQL schema:
+
+    $ python -m aurweb.initdb
+
 6) Create a new user:
 
     # useradd -U -d /srv/http/aurweb -c 'AUR user' aur

TESTING

@@ -9,26 +9,27 @@ INSTALL.
 
     $ git clone git://git.archlinux.org/aurweb.git
 
-2) Install php and necessary modules:
+2) Install the necessary packages:
 
-    # pacman -S php php-sqlite sqlite words fortune-mod
+    # pacman -S --needed php php-sqlite sqlite words fortune-mod python python-sqlalchemy
 
    Ensure to enable the pdo_sqlite extension in php.ini.
 
-3) Prepare the testing database:
-
-    $ cd /path/to/aurweb/schema
-    $ make
-    $ ./gendummydata.py out.sql
-    $ sqlite3 ../aurweb.sqlite3 < aur-schema-sqlite.sql
-    $ sqlite3 ../aurweb.sqlite3 < out.sql
-
-4) Copy conf/config.defaults to conf/config and adjust the configuration
+3) Copy conf/config.defaults to conf/config and adjust the configuration
    (pay attention to disable_http_login, enable_maintenance and aur_location).
 
    Be sure to change backend to sqlite and name to the file location of your
    created test database.
 
+4) Prepare the testing database:
+
+    $ cd /path/to/aurweb/
+    $ python -m aurweb.initdb
+
+    $ cd /path/to/aurweb/schema
+    $ ./gendummydata.py out.sql
+    $ sqlite3 path/to/aurweb.sqlite3 < out.sql
+
 5) Run the PHP built-in web server:
 
    $ AUR_CONFIG='/path/to/aurweb/conf/config' php -S localhost:8080 -t /path/to/aurweb/web/html

aurweb/db.py

@@ -11,6 +11,33 @@ except ImportError:
 import aurweb.config
 
 
+def get_sqlalchemy_url():
+    """
+    Build an SQLAlchemy for use with create_engine based on the aurweb configuration.
+    """
+    import sqlalchemy
+    aur_db_backend = aurweb.config.get('database', 'backend')
+    if aur_db_backend == 'mysql':
+        return sqlalchemy.engine.url.URL(
+            'mysql+mysqlconnector',
+            username=aurweb.config.get('database', 'user'),
+            password=aurweb.config.get('database', 'password'),
+            host=aurweb.config.get('database', 'host'),
+            database=aurweb.config.get('database', 'name'),
+            query={
+                'unix_socket': aurweb.config.get('database', 'socket'),
+                'buffered': True,
+            },
+        )
+    elif aur_db_backend == 'sqlite':
+        return sqlalchemy.engine.url.URL(
+            'sqlite',
+            database=aurweb.config.get('database', 'name'),
+        )
+    else:
+        raise ValueError('unsupported database backend')
+
+
 class Connection:
     _conn = None
     _paramstyle = None

aurweb/initdb.py

+import aurweb.db
+import aurweb.schema
+
+import argparse
+import sqlalchemy
+
+
+def feed_initial_data(conn):
+    conn.execute(aurweb.schema.AccountTypes.insert(), [
+        {'ID': 1, 'AccountType': 'User'},
+        {'ID': 2, 'AccountType': 'Trusted User'},
+        {'ID': 3, 'AccountType': 'Developer'},
+        {'ID': 4, 'AccountType': 'Trusted User & Developer'},
+    ])
+    conn.execute(aurweb.schema.DependencyTypes.insert(), [
+        {'ID': 1, 'Name': 'depends'},
+        {'ID': 2, 'Name': 'makedepends'},
+        {'ID': 3, 'Name': 'checkdepends'},
+        {'ID': 4, 'Name': 'optdepends'},
+    ])
+    conn.execute(aurweb.schema.RelationTypes.insert(), [
+        {'ID': 1, 'Name': 'conflicts'},
+        {'ID': 2, 'Name': 'provides'},
+        {'ID': 3, 'Name': 'replaces'},
+    ])
+    conn.execute(aurweb.schema.RequestTypes.insert(), [
+        {'ID': 1, 'Name': 'deletion'},
+        {'ID': 2, 'Name': 'orphan'},
+        {'ID': 3, 'Name': 'merge'},
+    ])
+
+
+def run(args):
+    engine = sqlalchemy.create_engine(aurweb.db.get_sqlalchemy_url(),
+                                      echo=(args.verbose >= 1))
+    aurweb.schema.metadata.create_all(engine)
+    feed_initial_data(engine.connect())
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(
+        prog='python -m aurweb.initdb',
+        description='Initialize the aurweb database.')
+    parser.add_argument('-v', '--verbose', action='count', default=0,
+                        help='increase verbosity')
+    args = parser.parse_args()
+    run(args)

aurweb/schema.py

+from sqlalchemy import CHAR, Column, ForeignKey, Index, MetaData, String, TIMESTAMP, Table, Text, text
+from sqlalchemy.dialects.mysql import BIGINT, DECIMAL, INTEGER, TINYINT
+from sqlalchemy.ext.compiler import compiles
+
+
+@compiles(TINYINT, 'sqlite')
+def compile_tinyint_sqlite(type_, compiler, **kw):
+    """TINYINT is not supported on SQLite. Substitute it with INTEGER."""
+    return 'INTEGER'
+
+
+metadata = MetaData()
+
+# Define the Account Types for the AUR.
+AccountTypes = Table(
+    'AccountTypes', metadata,
+    Column('ID', TINYINT(unsigned=True), primary_key=True),
+    Column('AccountType', String(32), nullable=False, server_default=text("''")),
+    mysql_engine='InnoDB',
+)
+
+
+# User information for each user regardless of type.
+Users = Table(
+    'Users', metadata,
+    Column('ID', INTEGER(unsigned=True), primary_key=True),
+    Column('AccountTypeID', ForeignKey('AccountTypes.ID', ondelete="NO ACTION"), nullable=False, server_default=text("1")),
+    Column('Suspended', TINYINT(unsigned=True), nullable=False, server_default=text("0")),
+    Column('Username', String(32), nullable=False, unique=True),
+    Column('Email', String(254), nullable=False, unique=True),
+    Column('BackupEmail', String(254)),
+    Column('HideEmail', TINYINT(unsigned=True), nullable=False, server_default=text("0")),
+    Column('Passwd', String(255), nullable=False),
+    Column('Salt', CHAR(32), nullable=False, server_default=text("''")),
+    Column('ResetKey', CHAR(32), nullable=False, server_default=text("''")),
+    Column('RealName', String(64), nullable=False, server_default=text("''")),
+    Column('LangPreference', String(6), nullable=False, server_default=text("'en'")),
+    Column('Timezone', String(32), nullable=False, server_default=text("'UTC'")),
+    Column('Homepage', Text),
+    Column('IRCNick', String(32), nullable=False, server_default=text("''")),
+    Column('PGPKey', String(40)),
+    Column('LastLogin', BIGINT(unsigned=True), nullable=False, server_default=text("0")),
+    Column('LastLoginIPAddress', String(45)),
+    Column('LastSSHLogin', BIGINT(unsigned=True), nullable=False, server_default=text("0")),
+    Column('LastSSHLoginIPAddress', String(45)),
+    Column('InactivityTS', BIGINT(unsigned=True), nullable=False, server_default=text("0")),
+    Column('RegistrationTS', TIMESTAMP, nullable=False, server_default=text("CURRENT_TIMESTAMP")),
+    Column('CommentNotify', TINYINT(1), nullable=False, server_default=text("1")),
+    Column('UpdateNotify', TINYINT(1), nullable=False, server_default=text("0")),
+    Column('OwnershipNotify', TINYINT(1), nullable=False, server_default=text("1")),
+    Index('UsersAccountTypeID', 'AccountTypeID'),
+    mysql_engine='InnoDB',
+)
+
+
+# SSH public keys used for the aurweb SSH/Git interface.
+SSHPubKeys = Table(
+    'SSHPubKeys', metadata,
+    Column('UserID', ForeignKey('Users.ID', ondelete='CASCADE'), nullable=False),
+    Column('Fingerprint', String(44), primary_key=True),
+    Column('PubKey', String(4096), nullable=False),
+    mysql_engine='InnoDB',
+)
+
+
+# Track Users logging in/out of AUR web site.
+Sessions = Table(
+    'Sessions', metadata,
+    Column('UsersID', ForeignKey('Users.ID', ondelete='CASCADE'), nullable=False),
+    Column('SessionID', CHAR(32), nullable=False, unique=True),
+    Column('LastUpdateTS', BIGINT(unsigned=True), nullable=False),
+    mysql_engine='InnoDB',
+)
+
+
+# Information on package bases
+PackageBases = Table(
+    'PackageBases', metadata,
+    Column('ID', INTEGER(unsigned=True), primary_key=True),
+    Column('Name', String(255), nullable=False, unique=True),
+    Column('NumVotes', INTEGER(unsigned=True), nullable=False, server_default=text("0")),
+    Column('Popularity', DECIMAL(10, 6, unsigned=True), nullable=False, server_default=text("0")),
+    Column('OutOfDateTS', BIGINT(unsigned=True)),
+    Column('FlaggerComment', Text, nullable=False),
+    Column('SubmittedTS', BIGINT(unsigned=True), nullable=False),
+    Column('ModifiedTS', BIGINT(unsigned=True), nullable=False),
+    Column('FlaggerUID', ForeignKey('Users.ID', ondelete='SET NULL')),     # who flagged the package out-of-date?
+    # deleting a user will cause packages to be orphaned, not deleted
+    Column('SubmitterUID', ForeignKey('Users.ID', ondelete='SET NULL')),   # who submitted it?
+    Column('MaintainerUID', ForeignKey('Users.ID', ondelete='SET NULL')),  # User
+    Column('PackagerUID', ForeignKey('Users.ID', ondelete='SET NULL')),    # Last packager
+    Index('BasesMaintainerUID', 'MaintainerUID'),
+    Index('BasesNumVotes', 'NumVotes'),
+    Index('BasesPackagerUID', 'PackagerUID'),
+    Index('BasesSubmitterUID', 'SubmitterUID'),
+    mysql_engine='InnoDB',
+)
+
+
+# Keywords of package bases
+PackageKeywords = Table(
+    'PackageKeywords', metadata,
+    Column('PackageBaseID', ForeignKey('PackageBases.ID', ondelete='CASCADE'), primary_key=True, nullable=False),
+    Column('Keyword', String(255), primary_key=True, nullable=False, server_default=text("''")),
+    mysql_engine='InnoDB',
+)
+
+
+# Information about the actual packages
+Packages = Table(
+    'Packages', metadata,
+    Column('ID', INTEGER(unsigned=True), primary_key=True),
+    Column('PackageBaseID', ForeignKey('PackageBases.ID', ondelete='CASCADE'), nullable=False),
+    Column('Name', String(255), nullable=False, unique=True),
+    Column('Version', String(255), nullable=False, server_default=text("''")),
+    Column('Description', String(255)),
+    Column('URL', String(8000)),
+    mysql_engine='InnoDB',
+)
+
+
+# Information about licenses
+Licenses = Table(
+    'Licenses', metadata,
+    Column('ID', INTEGER(unsigned=True), primary_key=True),
+    Column('Name', String(255), nullable=False, unique=True),
+    mysql_engine='InnoDB',
+)
+
+
+# Information about package-license-relations
+PackageLicenses = Table(
+    'PackageLicenses', metadata,
+    Column('PackageID', ForeignKey('Packages.ID', ondelete='CASCADE'), primary_key=True, nullable=False),
+    Column('LicenseID', ForeignKey('Licenses.ID', ondelete='CASCADE'), primary_key=True, nullable=False),
+    mysql_engine='InnoDB',
+)
+
+
+# Information about groups
+Groups = Table(
+    'Groups', metadata,
+    Column('ID', INTEGER(unsigned=True), primary_key=True),
+    Column('Name', String(255), nullable=False, unique=True),
+    mysql_engine='InnoDB',
+)
+
+
+# Information about package-group-relations
+PackageGroups = Table(
+    'PackageGroups', metadata,
+    Column('PackageID', ForeignKey('Packages.ID', ondelete='CASCADE'), primary_key=True, nullable=False),
+    Column('GroupID', ForeignKey('Groups.ID', ondelete='CASCADE'), primary_key=True, nullable=False),
+    mysql_engine='InnoDB',
+)
+
+
+# Define the package dependency types
+DependencyTypes = Table(
+    'DependencyTypes', metadata,
+    Column('ID', TINYINT(unsigned=True), primary_key=True),
+    Column('Name', String(32), nullable=False, server_default=text("''")),
+    mysql_engine='InnoDB',
+)
+
+
+# Track which dependencies a package has
+PackageDepends = Table(
+    'PackageDepends', metadata,
+    Column('PackageID', ForeignKey('Packages.ID', ondelete='CASCADE'), nullable=False),
+    Column('DepTypeID', ForeignKey('DependencyTypes.ID', ondelete="NO ACTION"), nullable=False),
+    Column('DepName', String(255), nullable=False),
+    Column('DepDesc', String(255)),
+    Column('DepCondition', String(255)),
+    Column('DepArch', String(255)),
+    Index('DependsDepName', 'DepName'),
+    Index('DependsPackageID', 'PackageID'),
+    mysql_engine='InnoDB',
+)
+
+
+# Define the package relation types
+RelationTypes = Table(
+    'RelationTypes', metadata,
+    Column('ID', TINYINT(unsigned=True), primary_key=True),
+    Column('Name', String(32), nullable=False, server_default=text("''")),
+    mysql_engine='InnoDB',
+)
+
+
+# Track which conflicts, provides and replaces a package has
+PackageRelations = Table(
+    'PackageRelations', metadata,
+    Column('PackageID', ForeignKey('Packages.ID', ondelete='CASCADE'), nullable=False),
+    Column('RelTypeID', ForeignKey('RelationTypes.ID', ondelete="NO ACTION"), nullable=False),
+    Column('RelName', String(255), nullable=False),
+    Column('RelCondition', String(255)),
+    Column('RelArch', String(255)),
+    Index('RelationsPackageID', 'PackageID'),
+    Index('RelationsRelName', 'RelName'),
+    mysql_engine='InnoDB',
+)
+
+
+# Track which sources a package has
+PackageSources = Table(
+    'PackageSources', metadata,
+    Column('PackageID', ForeignKey('Packages.ID', ondelete='CASCADE'), nullable=False),
+    Column('Source', String(8000), nullable=False, server_default=text("'/dev/null'")),
+    Column('SourceArch', String(255)),
+    Index('SourcesPackageID', 'PackageID'),
+    mysql_engine='InnoDB',
+)
+
+
+# Track votes for packages
+PackageVotes = Table(
+    'PackageVotes', metadata,
+    Column('UsersID', ForeignKey('Users.ID', ondelete='CASCADE'), nullable=False),
+    Column('PackageBaseID', ForeignKey('PackageBases.ID', ondelete='CASCADE'), nullable=False),
+    Column('VoteTS', BIGINT(unsigned=True)),
+    Index('VoteUsersIDPackageID', 'UsersID', 'PackageBaseID', unique=True),
+    Index('VotesPackageBaseID', 'PackageBaseID'),
+    Index('VotesUsersID', 'UsersID'),
+    mysql_engine='InnoDB',
+)
+
+
+# Record comments for packages
+PackageComments = Table(
+    'PackageComments', metadata,
+    Column('ID', BIGINT(unsigned=True), primary_key=True),
+    Column('PackageBaseID', ForeignKey('PackageBases.ID', ondelete='CASCADE'), nullable=False),
+    Column('UsersID', ForeignKey('Users.ID', ondelete='SET NULL')),
+    Column('Comments', Text, nullable=False),
+    Column('RenderedComment', Text, nullable=False),
+    Column('CommentTS', BIGINT(unsigned=True), nullable=False, server_default=text("0")),
+    Column('EditedTS', BIGINT(unsigned=True)),
+    Column('EditedUsersID', ForeignKey('Users.ID', ondelete='SET NULL')),
+    Column('DelTS', BIGINT(unsigned=True)),
+    Column('DelUsersID', ForeignKey('Users.ID', ondelete='CASCADE')),
+    Column('PinnedTS', BIGINT(unsigned=True), nullable=False, server_default=text("0")),
+    Index('CommentsPackageBaseID', 'PackageBaseID'),
+    Index('CommentsUsersID', 'UsersID'),
+    mysql_engine='InnoDB',
+)
+
+
+# Package base co-maintainers
+PackageComaintainers = Table(
+    'PackageComaintainers', metadata,
+    Column('UsersID', ForeignKey('Users.ID', ondelete='CASCADE'), nullable=False),
+    Column('PackageBaseID', ForeignKey('PackageBases.ID', ondelete='CASCADE'), nullable=False),
+    Column('Priority', INTEGER(unsigned=True), nullable=False),
+    Index('ComaintainersPackageBaseID', 'PackageBaseID'),
+    Index('ComaintainersUsersID', 'UsersID'),
+    mysql_engine='InnoDB',
+)
+
+
+# Package base notifications
+PackageNotifications = Table(
+    'PackageNotifications', metadata,
+    Column('PackageBaseID', ForeignKey('PackageBases.ID', ondelete='CASCADE'), nullable=False),
+    Column('UserID', ForeignKey('Users.ID', ondelete='CASCADE'), nullable=False),
+    Index('NotifyUserIDPkgID', 'UserID', 'PackageBaseID', unique=True),
+    mysql_engine='InnoDB',
+)
+
+
+# Package name blacklist
+PackageBlacklist = Table(
+    'PackageBlacklist', metadata,
+    Column('ID', INTEGER(unsigned=True), primary_key=True),
+    Column('Name', String(64), nullable=False, unique=True),
+    mysql_engine='InnoDB',
+)
+
+
+# Providers in the official repositories
+OfficialProviders = Table(
+    'OfficialProviders', metadata,
+    Column('ID', INTEGER(unsigned=True), primary_key=True),
+    Column('Name', String(64), nullable=False),
+    Column('Repo', String(64), nullable=False),
+    Column('Provides', String(64), nullable=False),
+    Index('ProviderNameProvides', 'Name', 'Provides', unique=True),
+    mysql_engine='InnoDB',
+)
+
+
+# Define package request types
+RequestTypes = Table(
+    'RequestTypes', metadata,
+    Column('ID', TINYINT(unsigned=True), primary_key=True),
+    Column('Name', String(32), nullable=False, server_default=text("''")),
+    mysql_engine='InnoDB',
+)
+
+
+# Package requests
+PackageRequests = Table(
+    'PackageRequests', metadata,
+    Column('ID', BIGINT(unsigned=True), primary_key=True),
+    Column('ReqTypeID', ForeignKey('RequestTypes.ID', ondelete="NO ACTION"), nullable=False),
+    Column('PackageBaseID', ForeignKey('PackageBases.ID', ondelete='SET NULL')),
+    Column('PackageBaseName', String(255), nullable=False),
+    Column('MergeBaseName', String(255)),
+    Column('UsersID', ForeignKey('Users.ID', ondelete='SET NULL')),
+    Column('Comments', Text, nullable=False),
+    Column('ClosureComment', Text, nullable=False),
+    Column('RequestTS', BIGINT(unsigned=True), nullable=False, server_default=text("0")),
+    Column('ClosedTS', BIGINT(unsigned=True)),
+    Column('ClosedUID', ForeignKey('Users.ID', ondelete='SET NULL')),
+    Column('Status', TINYINT(unsigned=True), nullable=False, server_default=text("0")),
+    Index('RequestsPackageBaseID', 'PackageBaseID'),
+    Index('RequestsUsersID', 'UsersID'),
+    mysql_engine='InnoDB',
+)
+
+
+# Vote information
+TU_VoteInfo = Table(
+    'TU_VoteInfo', metadata,
+    Column('ID', INTEGER(unsigned=True), primary_key=True),
+    Column('Agenda', Text, nullable=False),
+    Column('User', String(32), nullable=False),
+    Column('Submitted', BIGINT(unsigned=True), nullable=False),
+    Column('End', BIGINT(unsigned=True), nullable=False),
+    Column('Quorum', DECIMAL(2, 2, unsigned=True), nullable=False),
+    Column('SubmitterID', ForeignKey('Users.ID', ondelete='CASCADE'), nullable=False),
+    Column('Yes', TINYINT(3, unsigned=True), nullable=False, server_default=text("'0'")),
+    Column('No', TINYINT(3, unsigned=True), nullable=False, server_default=text("'0'")),
+    Column('Abstain', TINYINT(3, unsigned=True), nullable=False, server_default=text("'0'")),
+    Column('ActiveTUs', TINYINT(3, unsigned=True), nullable=False, server_default=text("'0'")),
+    mysql_engine='InnoDB',
+)
+
+
+# Individual vote records
+TU_Votes = Table(
+    'TU_Votes', metadata,
+    Column('VoteID', ForeignKey('TU_VoteInfo.ID', ondelete='CASCADE'), nullable=False),
+    Column('UserID', ForeignKey('Users.ID', ondelete='CASCADE'), nullable=False),
+    mysql_engine='InnoDB',
+)
+
+
+# Malicious user banning
+Bans = Table(
+    'Bans', metadata,
+    Column('IPAddress', String(45), primary_key=True),
+    Column('BanTS', TIMESTAMP, nullable=False),
+    mysql_engine='InnoDB',
+)
+
+
+# Terms and Conditions
+Terms = Table(
+    'Terms', metadata,
+    Column('ID', INTEGER(unsigned=True), primary_key=True),
+    Column('Description', String(255), nullable=False),
+    Column('URL', String(8000), nullable=False),
+    Column('Revision', INTEGER(unsigned=True), nullable=False, server_default=text("1")),
+    mysql_engine='InnoDB',
+)
+
+
+# Terms and Conditions accepted by users
+AcceptedTerms = Table(
+    'AcceptedTerms', metadata,
+    Column('UsersID', ForeignKey('Users.ID', ondelete='CASCADE'), nullable=False),
+    Column('TermsID', ForeignKey('Terms.ID', ondelete='CASCADE'), nullable=False),
+    Column('Revision', INTEGER(unsigned=True), nullable=False, server_default=text("0")),
+    mysql_engine='InnoDB',
+)
+
+
+# Rate limits for API
+ApiRateLimit = Table(
+    'ApiRateLimit', metadata,
+    Column('IP', String(45), primary_key=True),
+    Column('Requests', INTEGER(11), nullable=False),
+    Column('WindowStart', BIGINT(20), nullable=False),
+    Index('ApiRateLimitWindowStart', 'WindowStart'),
+    mysql_engine='InnoDB',
+)

schema/Makefile

-aur-schema-sqlite.sql: aur-schema.sql
-	sed \
-		-e 's/ ENGINE = InnoDB//' \
-		-e 's/ [A-Z]* UNSIGNED NOT NULL AUTO_INCREMENT/ INTEGER NOT NULL/' \
-		-e 's/([0-9, ]*) UNSIGNED / UNSIGNED /' \
-		-e 's/ MySQL / SQLite /' \
-		$< >$@
-
-clean:
-	rm -rf aur-schema-sqlite.sql
-
-.PHONY: clean

schema/aur-schema.sql

--- The MySQL database layout for the AUR.  Certain data
--- is also included such as AccountTypes, etc.
---
-
--- Define the Account Types for the AUR.
---
-CREATE TABLE AccountTypes (
-	ID TINYINT UNSIGNED NOT NULL AUTO_INCREMENT,
-	AccountType VARCHAR(32) NOT NULL DEFAULT '',
-	PRIMARY KEY (ID)
-) ENGINE = InnoDB;
-INSERT INTO AccountTypes (ID, AccountType) VALUES (1, 'User');
-INSERT INTO AccountTypes (ID, AccountType) VALUES (2, 'Trusted User');
-INSERT INTO AccountTypes (ID, AccountType) VALUES (3, 'Developer');
-INSERT INTO AccountTypes (ID, AccountType) VALUES (4, 'Trusted User & Developer');
-
-
--- User information for each user regardless of type.
---
-CREATE TABLE Users (
-	ID INTEGER UNSIGNED NOT NULL AUTO_INCREMENT,
-	AccountTypeID TINYINT UNSIGNED NOT NULL DEFAULT 1,
-	Suspended TINYINT UNSIGNED NOT NULL DEFAULT 0,
-	Username VARCHAR(32) NOT NULL,
-	Email VARCHAR(254) NOT NULL,
-	BackupEmail VARCHAR(254) NULL DEFAULT NULL,
-	HideEmail TINYINT UNSIGNED NOT NULL DEFAULT 0,
-	Passwd VARCHAR(255) NOT NULL,
-	Salt CHAR(32) NOT NULL DEFAULT '',
-	ResetKey CHAR(32) NOT NULL DEFAULT '',
-	RealName VARCHAR(64) NOT NULL DEFAULT '',
-	LangPreference VARCHAR(6) NOT NULL DEFAULT 'en',
-	Timezone VARCHAR(32) NOT NULL DEFAULT 'UTC',
-	Homepage TEXT NULL DEFAULT NULL,
-	IRCNick VARCHAR(32) NOT NULL DEFAULT '',
-	PGPKey VARCHAR(40) NULL DEFAULT NULL,
-	LastLogin BIGINT UNSIGNED NOT NULL DEFAULT 0,
-	LastLoginIPAddress VARCHAR(45) NULL DEFAULT NULL,
-	LastSSHLogin BIGINT UNSIGNED NOT NULL DEFAULT 0,
-	LastSSHLoginIPAddress VARCHAR(45) NULL DEFAULT NULL,
-	InactivityTS BIGINT UNSIGNED NOT NULL DEFAULT 0,
-	RegistrationTS TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-	CommentNotify TINYINT(1) NOT NULL DEFAULT 1,
-	UpdateNotify TINYINT(1) NOT NULL DEFAULT 0,
-	OwnershipNotify TINYINT(1) NOT NULL DEFAULT 1,
-	PRIMARY KEY (ID),
-	UNIQUE (Username),
-	UNIQUE (Email),
-	FOREIGN KEY (AccountTypeID) REFERENCES AccountTypes(ID) ON DELETE NO ACTION
-) ENGINE = InnoDB;
-CREATE INDEX UsersAccountTypeID ON Users (AccountTypeID);
-
-