Merge pull request #217 from release-engineering/ambiguous-table

Use unambiguous names when selecting more of the Brew tables
redhat-exd-rebuilds · Nov 12, 2018 · 02547fb · 02547fb
2 parents 31c979b + eba05ce
commit 02547fb
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/scrapers/errata.py b/scrapers/errata.py
@@ -211,10 +211,10 @@ def get_koji_build(self, build_id):
         """
         sql = """\
             SELECT
-                build.extra,
-                package.name as package_name
-            FROM build
-            LEFT JOIN package ON build.pkg_id = package.id
+                brew.build.extra,
+                brew.package.name as package_name
+            FROM brew.build
+            LEFT JOIN brew.package ON brew.build.pkg_id = brew.package.id
             WHERE build.id = {0};
             """.format(build_id)
 

diff --git a/scrapers/koji.py b/scrapers/koji.py
@@ -144,22 +144,22 @@ def get_build_info(self, build_ids):
 
         sql_query = """
                 SELECT
-                events.time as creation_time,
-                build.completion_time,
-                build.epoch,
-                build.extra,
-                build.id,
+                brew.events.time as creation_time,
+                brew.build.completion_time,
+                brew.build.epoch,
+                brew.build.extra,
+                brew.build.id,
                 brew.users.name as owner_name,
                 brew.users.krb_principal as owner_username,
-                package.name as package_name,
-                build.release,
-                build.start_time,
-                build.state,
-                build.task_id,
-                build.version
-            FROM build
-            LEFT JOIN events ON build.create_event = events.id
-            LEFT JOIN package ON build.pkg_id = package.id
+                brew.package.name as package_name,
+                brew.build.release,
+                brew.build.start_time,
+                brew.build.state,
+                brew.build.task_id,
+                brew.build.version
+            FROM brew.build
+            LEFT JOIN brew.events ON brew.build.create_event = brew.events.id
+            LEFT JOIN brew.package ON brew.build.pkg_id = brew.package.id
             LEFT JOIN brew.users ON build.owner = brew.users.id
         """