kavin/Piped-Backend
1
0
Fork 0
mirror of https://github.com/TeamPiped/Piped-Backend.git synced 2025-01-06 01:20:28 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #560 from TeamPiped/renovate/hibernate-core

Browse Source 
Update hibernate core to v6.2.1.Final
This commit is contained in:
Kavin 2023-04-26 12:03:31 +01:00 committed by GitHub
commit 73fa1edf25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -31,8 +31,8 @@ dependencies {
implementation 'io.activej:activej-launchers-http:5.4.3' implementation 'io.activej:activej-launchers-http:5.4.3'
implementation 'org.hsqldb:hsqldb:2.7.1' implementation 'org.hsqldb:hsqldb:2.7.1'
implementation 'org.postgresql:postgresql:42.6.0' implementation 'org.postgresql:postgresql:42.6.0'
implementation 'org.hibernate:hibernate-core:6.1.7.Final' implementation 'org.hibernate:hibernate-core:6.2.1.Final'
implementation 'org.hibernate:hibernate-hikaricp:6.1.7.Final' implementation 'org.hibernate:hibernate-hikaricp:6.2.1.Final'
implementation 'com.zaxxer:HikariCP:5.0.1' implementation 'com.zaxxer:HikariCP:5.0.1'
implementation 'org.springframework.security:spring-security-crypto:6.0.3' implementation 'org.springframework.security:spring-security-crypto:6.0.3'
implementation 'commons-logging:commons-logging:1.2' implementation 'commons-logging:commons-logging:1.2'

8
src/main/java/me/kavin/piped/server/handlers/auth/FeedHandlers.java
View File

@ -109,14 +109,14 @@ public class FeedHandlers {
CriteriaQuery<Video> criteria = cb.createQuery(Video.class); CriteriaQuery<Video> criteria = cb.createQuery(Video.class);
var root = criteria.from(Video.class); var root = criteria.from(Video.class);
root.fetch("channel", JoinType.RIGHT); root.fetch("channel", JoinType.RIGHT);
var subquery = criteria.subquery(User.class); var subquery = criteria.subquery(String.class);
var subroot = subquery.from(User.class); var subroot = subquery.from(User.class);
subquery.select(subroot.get("subscribed_ids")) subquery.select(subroot.get("subscribed_ids"))
.where(cb.equal(subroot.get("id"), user.getId())); .where(cb.equal(subroot.get("id"), user.getId()));
criteria.select(root) criteria.select(root)
.where( .where(
root.get("channel").in(subquery) root.get("channel").get("uploader_id").in(subquery)
) )
.orderBy(cb.desc(root.get("uploaded"))); .orderBy(cb.desc(root.get("uploaded")));
@ -162,14 +162,14 @@ public class FeedHandlers {
CriteriaQuery<Video> criteria = cb.createQuery(Video.class); CriteriaQuery<Video> criteria = cb.createQuery(Video.class);
var root = criteria.from(Video.class); var root = criteria.from(Video.class);
root.fetch("channel", JoinType.RIGHT); root.fetch("channel", JoinType.RIGHT);
var subquery = criteria.subquery(User.class); var subquery = criteria.subquery(String.class);
var subroot = subquery.from(User.class); var subroot = subquery.from(User.class);
subquery.select(subroot.get("subscribed_ids")) subquery.select(subroot.get("subscribed_ids"))
.where(cb.equal(subroot.get("id"), user.getId())); .where(cb.equal(subroot.get("id"), user.getId()));
criteria.select(root) criteria.select(root)
.where( .where(
root.get("channel").in(subquery) root.get("channel").get("uploader_id").in(subquery)
) )
.orderBy(cb.desc(root.get("uploaded"))); .orderBy(cb.desc(root.get("uploaded")));