diff options
| -rw-r--r-- | pkgbase_schema.sql | 3 | ||||
| -rw-r--r-- | store.py | 7 | ||||
| -rw-r--r-- | tools/sql-migrate-20070713.sql | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/pkgbase_schema.sql b/pkgbase_schema.sql index d2c5675..b93adde 100644 --- a/pkgbase_schema.sql +++ b/pkgbase_schema.sql @@ -30,8 +30,7 @@ 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 - journals(submitted_date, name, version, action) - WHERE version IS NOT NULL; + journals(submitted_date, name, version, action); -- Table structure for table: packages CREATE TABLE packages ( @@ -550,8 +550,7 @@ class Store: safe_execute(cursor, ''' select name,version,submitted_date,action from journals j - where j.version is not NULL - and j.submitted_date > %s + where j.submitted_date > %s ''', (time.strftime('%Y-%m-%d %H:%M:%S +0000', time.gmtime(since)),)) return Result(('name', 'version', 'submitted_date', 'action'), cursor.fetchall()) @@ -1064,8 +1063,8 @@ class Store: date = time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime()) safe_execute(cursor, '''insert into journals ( name, version, action, submitted_date, submitted_by, - submitted_from) values (%s, NULL, %s, %s, %s, %s)''', - (name, 'add %s file %s'%(pyversion, filename), date, + submitted_from) values (%s, %s, %s, %s, %s, %s)''', + (name, version, 'add %s file %s'%(pyversion, filename), date, self.username, self.userip)) def list_files(self, name, version): diff --git a/tools/sql-migrate-20070713.sql b/tools/sql-migrate-20070713.sql index b5cdb56..2639011 100644 --- a/tools/sql-migrate-20070713.sql +++ b/tools/sql-migrate-20070713.sql @@ -1 +1 @@ -create index journals_changelog on journals(submitted_date, name, version, action) where version is not null; +create index journals_changelog on journals(submitted_date, name, version, action); |