Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions hibernate-dialect-v6/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 1.5.x ##

- Disable ordinal SELECT item references (`ORDER BY 1`, `GROUP BY 1`) — YDB does not support them

## 1.5.3 ##

- Support `lower`, `upper` and `concat` functions
Expand Down
1 change: 1 addition & 0 deletions hibernate-dialect-v6/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

<groupId>tech.ydb.dialects</groupId>
<artifactId>hibernate-ydb-dialect</artifactId>
<!-- TODO: use actual version-->
<version>1.5.3</version>

<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,11 @@ public Exporter<ForeignKey> getForeignKeyExporter() {
return FOREIGN_KEY_EMPTY_EXPORTER;
}

@Override
public boolean supportsOrdinalSelectItemReference() {
return false;
}

@Override
public boolean supportsColumnCheck() {
return false;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package tech.ydb.hibernate.student;

import java.util.List;

import jakarta.persistence.Tuple;
import jakarta.persistence.criteria.*;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Configuration;
import org.hibernate.jpa.HibernateHints;
Expand Down Expand Up @@ -360,6 +363,56 @@ private static void checkCourses(List<Course> courses) {
assertEquals("Технологии Java", courses.get(5).getName());
}

@Test
void groupsOrderByGroupNameCriteriaTest() {
inTransaction(
session -> {
CriteriaBuilder cb = session.getCriteriaBuilder();
CriteriaQuery<String> cq = cb.createQuery(String.class);
Root<Group> group = cq.from(Group.class);

Path<String> name = group.get("name");

cq.select(name);
cq.orderBy(cb.asc(name));

List<String> results = session.createQuery(cq).getResultList();

assertEquals(List.of("M3238", "M3239", "M3435", "M3439"), results);
}
);
}

@Test
void studentsCountPerGroupCriteriaTest() {
inTransaction(
session -> {
CriteriaBuilder cb = session.getCriteriaBuilder();
CriteriaQuery<Tuple> cq = cb.createTupleQuery();
Root<Group> group = cq.from(Group.class);
Join<Group, Student> students = group.join("students");

Path<String> groupName = group.get("name");

cq.multiselect(groupName, cb.count(students));
cq.groupBy(groupName);
cq.orderBy(cb.asc(groupName));

List<Tuple> results = session.createQuery(cq).getResultList();

assertEquals(4, results.size());
assertEquals("M3238", results.get(0).get(0));
assertEquals(1L, results.get(0).get(1));
assertEquals("M3239", results.get(1).get(0));
assertEquals(1L, results.get(1).get(1));
assertEquals("M3435", results.get(2).get(0));
assertEquals(2L, results.get(2).get(1));
assertEquals("M3439", results.get(3).get(0));
assertEquals(2L, results.get(3).get(1));
}
);
}

@Test
void useAllHintsTogetherTest() {
/*
Expand Down
5 changes: 5 additions & 0 deletions hibernate-dialect-v7/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
TODO: use actual version
## 0.9.x ##

- Disable ordinal SELECT item references (`ORDER BY 1`, `GROUP BY 1`) — YDB does not support them

## 0.9.2 ##

- Support `concat` function
Expand Down
1 change: 1 addition & 0 deletions hibernate-dialect-v7/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

<groupId>tech.ydb.dialects</groupId>
<artifactId>hibernate-ydb-dialect-v7</artifactId>
<!-- TODO: use actual version-->
<version>0.9.2</version>

<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,11 @@ public Exporter<ForeignKey> getForeignKeyExporter() {
return FOREIGN_KEY_EMPTY_EXPORTER;
}

@Override
public boolean supportsOrdinalSelectItemReference() {
return false;
}

@Override
public boolean supportsColumnCheck() {
return false;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
package tech.ydb.hibernate.student;

import java.util.List;

import jakarta.persistence.Tuple;
import jakarta.persistence.criteria.*;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Configuration;
import org.hibernate.jpa.HibernateHints;
Expand Down Expand Up @@ -343,6 +346,56 @@ private static void checkCourses(List<Course> courses) {
assertEquals("Технологии Java", courses.get(5).getName());
}

@Test
void groupsOrderByGroupNameCriteriaTest() {
inTransaction(
session -> {
CriteriaBuilder cb = session.getCriteriaBuilder();
CriteriaQuery<String> cq = cb.createQuery(String.class);
Root<Group> group = cq.from(Group.class);

Path<String> name = group.get("name");

cq.select(name);
cq.orderBy(cb.asc(name));

List<String> results = session.createQuery(cq).getResultList();

assertEquals(List.of("M3238", "M3239", "M3435", "M3439"), results);
}
);
}

@Test
void studentsCountPerGroupCriteriaTest() {
inTransaction(
session -> {
CriteriaBuilder cb = session.getCriteriaBuilder();
CriteriaQuery<Tuple> cq = cb.createTupleQuery();
Root<Group> group = cq.from(Group.class);
Join<Group, Student> students = group.join("students");

Path<String> groupName = group.get("name");

cq.multiselect(groupName, cb.count(students));
cq.groupBy(groupName);
cq.orderBy(cb.asc(groupName));

List<Tuple> results = session.createQuery(cq).getResultList();

assertEquals(4, results.size());
assertEquals("M3238", results.get(0).get(0));
assertEquals(1L, results.get(0).get(1));
assertEquals("M3239", results.get(1).get(0));
assertEquals(1L, results.get(1).get(1));
assertEquals("M3435", results.get(2).get(0));
assertEquals(2L, results.get(2).get(1));
assertEquals("M3439", results.get(3).get(0));
assertEquals(2L, results.get(3).get(1));
}
);
}

@Test
void useAllHintsTogetherTest() {
/*
Expand Down
Loading