[Pypi-checkins] r751 - in branches/tarek-pep-345-support: . tools

[tarek.ziade]

Author: tarek.ziade
Date: Sun Mar 21 03:59:03 2010
New Revision: 751

Modified:
   branches/tarek-pep-345-support/pkgbase_schema.sql
   branches/tarek-pep-345-support/tools/sql-migrate-20100313.sql
Log:
requires_python is now a field in the release table

Modified: branches/tarek-pep-345-support/pkgbase_schema.sql
==============================================================================
--- branches/tarek-pep-345-support/pkgbase_schema.sql	(original)
+++ branches/tarek-pep-345-support/pkgbase_schema.sql	Sun Mar 21 03:59:03 2010
@@ -54,33 +54,33 @@
 CREATE INDEX rego_otk_otk_idx ON rego_otk(otk);
 
 -- Table structure for table: rego_otk
-CREATE TABLE rego_otk ( 
-   name TEXT REFERENCES users, 
+CREATE TABLE rego_otk (
+   name TEXT REFERENCES users,
    otk TEXT,
    date TIMESTAMP );
 CREATE INDEX rego_otk_name_idx ON rego_otk(name);
 
 
 -- Table structure for table: journals
-CREATE TABLE journals ( 
-   name TEXT, 
-   version TEXT, 
-   action TEXT, 
-   submitted_date TIMESTAMP, 
-   submitted_by TEXT REFERENCES users, 
+CREATE TABLE journals (
+   name TEXT,
+   version TEXT,
+   action TEXT,
+   submitted_date TIMESTAMP,
+   submitted_by TEXT REFERENCES users,
    submitted_from TEXT
 );
 CREATE INDEX journals_name_idx ON journals(name);
 CREATE INDEX journals_version_idx ON journals(version);
-CREATE INDEX journals_latest_releases ON 
-  journals(submitted_date, name, version) 
+CREATE INDEX journals_latest_releases ON
+  journals(submitted_date, name, version)
   WHERE version IS NOT NULL AND action='new release';
-CREATE INDEX journals_changelog ON 
+CREATE INDEX journals_changelog ON
   journals(submitted_date, name, version, action);
 
 -- Table structure for table: packages
-CREATE TABLE packages ( 
-   name TEXT PRIMARY KEY, 
+CREATE TABLE packages (
+   name TEXT PRIMARY KEY,
    stable_version TEXT,
    normalized_name TEXT,
    autohide BOOLEAN DEFAULT TRUE,
@@ -137,6 +137,7 @@
    keywords TEXT,
    platform TEXT,
    download_url TEXT,
+   requires_python TEXT,
    cheesecake_installability_id INTEGER REFERENCES cheesecake_main_indices,
    cheesecake_documentation_id INTEGER REFERENCES cheesecake_main_indices,
    cheesecake_code_kwalitee_id INTEGER REFERENCES cheesecake_main_indices,
@@ -151,7 +152,7 @@
 -- 0 if there is no parent on that level (each node is its
 -- own parent)
 CREATE TABLE trove_classifiers (
-   id INTEGER PRIMARY KEY, 
+   id INTEGER PRIMARY KEY,
    classifier TEXT UNIQUE,
    l2 INTEGER,
    l3 INTEGER,
@@ -215,17 +216,6 @@
 CREATE INDEX rel_obs_version_id_idx ON release_obsoletes(version);
 CREATE INDEX rel_obs_name_version_idx ON release_obsoletes (name,version);
 
--- Table structure for table: release_requires_python
-CREATE TABLE release_requires_python (
-   name TEXT,
-   version TEXT,
-   specifier TEXT,
-   FOREIGN KEY (name, version) REFERENCES releases (name, version) ON UPDATE CASCADE
-);
-CREATE INDEX rel_req_python_name_idx ON release_requires_python(name);
-CREATE INDEX rel_req_python_version_id_idx ON release_requires_python(version);
-CREATE INDEX rel_req_python_name_version_idx ON release_requires_python(name,version);
-
 -- Table structure for table: release_requires_external
 CREATE TABLE release_requires_external (
    name TEXT,
@@ -285,7 +275,7 @@
 -- python version is only first two digits
 -- actual file path is constructed <py version>/<a-z>/<name>/<filename>
 -- we remember filename because it can differ
-CREATE TABLE release_files ( 
+CREATE TABLE release_files (
    name TEXT,
    version TEXT,
    python_version TEXT,
@@ -304,10 +294,10 @@
 
 
 -- Table structure for table: package_urls
-CREATE TABLE release_urls ( 
+CREATE TABLE release_urls (
    name TEXT,
    version TEXT,
-   url TEXT, 
+   url TEXT,
    packagetype TEXT,
    FOREIGN KEY (name, version) REFERENCES releases (name, version) ON UPDATE CASCADE
 );
@@ -327,9 +317,9 @@
 
 -- Table structure for table: roles
 -- Note: roles are Maintainer, Admin, Owner
-CREATE TABLE roles ( 
-   role_name TEXT, 
-   user_name TEXT REFERENCES users, 
+CREATE TABLE roles (
+   role_name TEXT,
+   user_name TEXT REFERENCES users,
    package_name TEXT REFERENCES packages ON UPDATE CASCADE
 );
 CREATE INDEX roles_pack_name_idx ON roles(package_name);
@@ -348,7 +338,7 @@
 -- Table structure for table: timestamps
 -- Note: stamp_name is ftp, http
 CREATE TABLE browse_tally (
-   trove_id INTEGER PRIMARY KEY,	
+   trove_id INTEGER PRIMARY KEY,
    tally INTEGER
 );
 

Modified: branches/tarek-pep-345-support/tools/sql-migrate-20100313.sql
==============================================================================
--- branches/tarek-pep-345-support/tools/sql-migrate-20100313.sql	(original)
+++ branches/tarek-pep-345-support/tools/sql-migrate-20100313.sql	Sun Mar 21 03:59:03 2010
@@ -1,3 +1,6 @@
+-- New fields
+ALTER TABLE release ADD COLUMN requires_python TEXT;
+
 --
 -- New tables
 --