[fea] revert prefetch

Author: mosquito

pypi_server/__init__.py

@@ -9,7 +9,7 @@
     ("Dmitry Orlov", "[email protected]")
 ]
 
-version_info = (0, 3, 7)
+version_info = (0, 3, 8)
 
 __version__ = ".".join(map(str, version_info))
 __author__ = ", ".join("{0} <{1}>".format(*author) for author in author_info)

pypi_server/db/packages.py

@@ -113,20 +113,7 @@ def files(self, version=None):
         if version:
             version = self.find_version(version)
 
-        if version:
-            versions = PackageVersion.select().where(
-                PackageFile.version == version,
-                PackageVersion.package == self
-            )
-        else:
-            versions = PackageVersion.select().where(
-                PackageVersion.hidden == False,
-                PackageVersion.package == self
-            )
-
-        packages = Package.select().where(Package.id == self.id)
-
-        files = PackageFile.select(
+        q = PackageFile.select(
             Package,
             PackageVersion,
             PackageFile
@@ -136,10 +123,15 @@ def files(self, version=None):
             Package
         ).where(
             Package.id == self.id
-        ).order_by(Package.name.asc())
+        )
+
+        if version:
+            q = q.where(PackageFile.version == version)
+        else:
+            q = q.where(PackageVersion.hidden == False)
 
         return sorted(
-            p.prefetch(files, packages, versions),
+            q.order_by(Package.name.asc()),
             key=lambda x: x.version.version,
             reverse=True,
         )
@@ -159,10 +151,7 @@ def versions(self, show_hidden=False):
             q = q.where(PackageVersion.hidden == False)
 
         return sorted(
-            p.prefetch(
                 q,
-                Package.select().where(Package.id == self.id),
-            ),
             key=lambda x: x.version,
             reverse=True
         )

pypi_server/templates/simple/files.html

@@ -5,7 +5,7 @@
 {% block "body" %}
     <h1>Files for {{ package }}</h1>
     {% for file in files %}
-    <a href="/simple/{{ file.package.name }}/{{ file.version.version }}/{{ file.basename }}#md5={{ file.md5 }}" rel="internal" class="file">{{ file.basename }}</a>
+    <a href="/simple/{{ package }}/{{ file.version.version }}/{{ file.basename }}#md5={{ file.md5 }}" rel="internal" class="file">{{ file.basename }}</a>
     {% end %}
 
 {% end %}