		`@@ -417,7 +417,6 @@`
		`primaryjoin="projects.c.id==user_projects.c.project_id",`
		`secondaryjoin="and_(users.c.id==user_projects.c.user_id,\`
		`user_projects.c.access=='admin')",`
		`- backref="co_projects_admins",`
		`viewonly=True,`
		`)`

		`@@ -428,7 +427,6 @@`
		`secondaryjoin="and_(users.c.id==user_projects.c.user_id,\`
		`or_(user_projects.c.access=='commit',\`
		`user_projects.c.access=='admin'))",`
		`- backref="co_projects_committers",`
		`viewonly=True,`
		`)`

		`@@ -453,7 +451,6 @@`
		`primaryjoin="projects.c.id==projects_groups.c.project_id",`
		`secondaryjoin="and_(pagure_group.c.id==projects_groups.c.group_id,\`
		`projects_groups.c.access=='admin')",`
		`- backref="projects_admin_groups",`
		`order_by="PagureGroup.group_name.asc()",`
		`viewonly=True,`
		`)`
		`@@ -465,7 +462,6 @@`
		`secondaryjoin="and_(pagure_group.c.id==projects_groups.c.group_id,\`
		`or_(projects_groups.c.access=='admin',\`
		`projects_groups.c.access=='commit'))",`
		`- backref="projects_committer_groups",`
		`order_by="PagureGroup.group_name.asc()",`
		`viewonly=True,`
		`)`

		`@@ -2439,7 +2439,7 @@`
		`model.User.user == private,`
		`)`
		`)`
		`- sub_q2 = session.query(model.Project.id).filter(`
		`+ sub_q2 = session.query(sqlalchemy.distinct(model.Project.id)).filter(`
		`# User got admin or commit right`
		`sqlalchemy.and_(`
		`model.Project.private == True, # noqa: E712`
		`@@ -2452,7 +2452,7 @@`
		`),`
		`)`
		`)`
		`- sub_q3 = session.query(model.Project.id).filter(`
		`+ sub_q3 = session.query(sqlalchemy.distinct(model.Project.id)).filter(`
		`# User created a group that has admin or commit right`
		`sqlalchemy.and_(`
		`model.Project.private == True, # noqa: E712`
		`@@ -2467,7 +2467,7 @@`
		`),`
		`)`
		`)`
		`- sub_q4 = session.query(model.Project.id).filter(`
		`+ sub_q4 = session.query(sqlalchemy.distinct(model.Project.id)).filter(`
		`# User is part of a group that has admin or commit right`
		`sqlalchemy.and_(`
		`model.Project.private == True, # noqa: E712`
		`@@ -2494,14 +2494,25 @@`
		`model.PagureGroup.group_name.notin_(exclude_groups)`
		`)`

		`- projects = projects.filter(`
		`- model.Project.id.in_(`
		`- subquery0.union(sub_q1)`
		`- .union(sub_q2)`
		`- .union(sub_q3)`
		`- .union(sub_q4)`
		`+ private_repo_subq = (`
		`+ subquery0.union(sub_q1).union(sub_q2).union(sub_q3).union(sub_q4)`
		`+ )`
		`+`
		`+ # There is something going on here, we shouldn't have to invoke/call`
		`+ # the sub-query, it should work fine with:`
		`+ # model.Project.id.in_(private_repo_subq.subquery())`
		`+ # however, it does not. Either something gets really confused with`
		`+ # sqlite or the generated SQL is broken`
		`+ # The issues seems to be with the unions in the subquery just above.`
		`+ # Since we can't quite get this to work, let's bite the bullet and go`
		`+ # with this approach, but damn I don't like it!`
		`+ # This issue appeared with sqlalchemy 1.3.0 and is still present in`
		`+ # 1.3.13 tested today.`
		`+ private_repos = private_repo_subq.all()`
		`+ if private_repos:`
		`+ projects = projects.filter(`
		`+ model.Project.id.in_(list(set(zip(*private_repos)))[0])`
		`)`
		`- )`

		`if fork is not None:`
		`if fork is True:`
		`@@ -2532,7 +2543,7 @@`
		`projects = projects.filter(model.Project.namespace == namespace)`

		`query = session.query(model.Project).filter(`
		`- model.Project.id.in_(projects.subquery())`
		`+ model.Project.id.in_(projects.as_scalar())`
		`)`

		`if sort == "latest":`

		`@@ -27,11 +27,7 @@`
		`requests`
		`six`
		`# sqlalchemy minimum 0.8`
		`- # sqlalchemy 1.3.0 is causing issues on the pip container leading`
		`- # test_pagure_lib.py to raise a:`
		`- # "(sqlite3.OperationalError) no such column: users.user"`
		`- # in test_search_projects_private line 319`
		`- sqlalchemy < 1.3.0`
		`+ sqlalchemy >= 0.8`
		`# 1.4.0 is broken, 1.4.0-post-1 works but gives odd results on newer setuptools`
		`# the latest version 1.5.0 is also known to work`
		`straight.plugin`

pagure

Source Code

Documentation

#4460 Make pagure work with recent sqlalchemy versions Merged 4 years ago by pingou. Opened 5 years ago by pingou. fix_sqlalchemy into master

Metadata

Flags

Changes Summary 3

#4460 Make pagure work with recent sqlalchemy versions

Merged 4 years ago by pingou. Opened 5 years ago by pingou.

fix_sqlalchemy into master