add tenant-test table and start formulating sql-queries

bump version

Author: Gerald Unterrainer

pom.xml

@@ -17,7 +17,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>http-server</artifactId>
-	<version>0.2.9</version>
+	<version>0.2.10</version>
 	<name>HttpServer</name>
 	<packaging>jar</packaging>
 

src/main/java/info/unterrainer/commons/httpserver/daos/BasicJpqlDao.java

@@ -252,8 +252,6 @@ else if (!orderBy.isBlank())
 		if (type != null)
 			t = type;
 
-		if (query.contains("nullo.id"))
-			System.out.println("");
 		TypedQuery<T> q = em.createQuery(query, t);
 		if (lockPessimistic)
 			q.setLockMode(LockModeType.PESSIMISTIC_WRITE);
@@ -264,6 +262,20 @@ else if (!orderBy.isBlank())
 		return q;
 	}
 
+	private boolean isAllowed(final info.unterrainer.commons.httpserver.daos.QueryBuilder query,
+			final EntityManager em) {
+		String tenantReferenceField = "testId";
+		String tenantIdField = "tenantId";
+		Long tenantId = 55L;
+		BasicJpa tenantJpa = null;
+		getQuery(em, "o",
+				"RIGHT JOIN " + tenantJpa.getClass().getSimpleName() + " tenantTable on o.id = tenantTable."
+						+ tenantReferenceField,
+				"tenantTable." + tenantReferenceField + " IS NULL OR tenantTable." + tenantIdField + " = :tenantId",
+				null, type, null, false, null);
+		return true;
+	}
+
 	Query getCountQuery(final EntityManager em, final String selectClause, final String joinClause,
 			final String whereClause, final Map<String, Object> params, final Set<AsyncState> asyncStates) {
 		String query = "SELECT COUNT(" + selectClause + ") FROM %s AS o";

src/test/resources/db/info/unterrainer/commons/httpserver/changelog-1.xml

@@ -49,4 +49,36 @@
 		</createTable>
 	</changeSet>
 
+	<changeSet author="GUN" id="1.2">
+		<createTable tableName="test_permission"
+			remarks="Contains tenant-ids for test-entries.">
+			<column name="id" type="BIGINT" autoIncrement="true">
+				<constraints nullable="false" primaryKey="true"
+					primaryKeyName="pk_test_permission" unique="true"
+					uniqueConstraintName="uc_test_permission_id" />
+			</column>
+
+			<column name="testId" type="BIGINT">
+				<constraints nullable="true" />
+			</column>
+
+			<column name="tenantId" type="BIGINT">
+				<constraints nullable="true" />
+			</column>
+			
+			<column name="createdOn" type="TIMESTAMP(6)">
+				<constraints nullable="true" />
+			</column>
+			<column name="editedOn" type="TIMESTAMP(6)">
+				<constraints nullable="true" />
+			</column>
+		</createTable>
+		
+		<addForeignKeyConstraint
+			baseColumnNames="testId" baseTableName="test_permission"
+			constraintName="fk_test_permission_test_id"
+			referencedColumnNames="id" referencedTableName="test"
+			onDelete="CASCADE" onUpdate="RESTRICT" />
+	</changeSet>
+	
 </databaseChangeLog>