Fix for table being added to query twice, if it's added for security, and then for being in a where clause.

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/JoinsContext.java

@@ -111,13 +111,13 @@ public class JoinsContext
             if(join.getLeftTable().equals(tmpTable.getName()))
             {
                QueryJoin queryJoin = new ImplicitQueryJoinForSecurityLock().withJoinMetaData(join).withType(QueryJoin.Type.INNER);
-               this.queryJoins.add(queryJoin); // todo something else with aliases?  probably.
+               this.addQueryJoin(queryJoin);
                tmpTable = instance.getTable(join.getRightTable());
             }
             else if(join.getRightTable().equals(tmpTable.getName()))
             {
                QueryJoin queryJoin = new ImplicitQueryJoinForSecurityLock().withJoinMetaData(join.flip()).withType(QueryJoin.Type.INNER);
-               this.queryJoins.add(queryJoin); // todo something else with aliases?  probably.
+               this.addQueryJoin(queryJoin); //
                tmpTable = instance.getTable(join.getLeftTable());
             }
             else
@@ -145,6 +145,20 @@ public class JoinsContext
 
 
 
+   /*******************************************************************************
+    ** Add a query join to the list of query joins, and "process it"
+    **
+    ** use this method to add to the list, instead of ever adding directly, as it's
+    ** important do to that process step (and we've had bugs when it wasn't done).
+    *******************************************************************************/
+   private void addQueryJoin(QueryJoin queryJoin) throws QException
+   {
+      this.queryJoins.add(queryJoin);
+      processQueryJoin(queryJoin);
+   }
+
+
+
    /*******************************************************************************
     ** If there are any joins in the context that don't have a join meta data, see
     ** if we can find the JoinMetaData to use for them by looking at the main table's
@@ -236,8 +250,7 @@ public class JoinsContext
                                  QueryJoin queryJoinToAdd = makeQueryJoinFromJoinAndTableNames(nextTable, tmpTable, joinToAdd);
                                  queryJoinToAdd.setType(queryJoin.getType());
                                  addedAnyQueryJoins = true;
-                                 this.queryJoins.add(queryJoinToAdd); // todo something else with aliases?  probably.
+                                 this.addQueryJoin(queryJoin);
-                                 processQueryJoin(queryJoinToAdd);
                               }
                            }
 
@@ -410,8 +423,7 @@ public class JoinsContext
                QueryJoin queryJoin = makeQueryJoinFromJoinAndTableNames(mainTableName, filterTable, join);
                if(queryJoin != null)
                {
-                  this.queryJoins.add(queryJoin); // todo something else with aliases?  probably.
+                  this.addQueryJoin(queryJoin);
-                  processQueryJoin(queryJoin);
                   found = true;
                   break;
                }
@@ -420,8 +432,7 @@ public class JoinsContext
             if(!found)
             {
                QueryJoin queryJoin = new QueryJoin().withJoinTable(filterTable).withType(QueryJoin.Type.INNER);
-               this.queryJoins.add(queryJoin); // todo something else with aliases?  probably.
+               this.addQueryJoin(queryJoin);
-               processQueryJoin(queryJoin);
             }
          }
       }

qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSQueryAction.java

@@ -131,10 +131,10 @@ public class RDBMSQueryAction extends AbstractRDBMSAction implements QueryInterf
             }
          }
 
+         Long mark = System.currentTimeMillis();
+
          try
          {
-            Long mark = System.currentTimeMillis();
-
             //////////////////////////////////////////////
             // execute the query - iterate over results //
             //////////////////////////////////////////////
@@ -173,6 +173,11 @@ public class RDBMSQueryAction extends AbstractRDBMSAction implements QueryInterf
 
             return queryOutput;
          }
+         catch(Exception e)
+         {
+            logSQL(sql, params, mark);
+            throw (e);
+         }
          finally
          {
             if(needToCloseConnection)

qqq-backend-module-rdbms/src/test/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSQueryActionTest.java

@@ -1416,6 +1416,39 @@ public class RDBMSQueryActionTest extends RDBMSActionTest
 
 
 
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   @Test
+   void testRecordSecurityFromJoinTableAlsoImplicitlyInQuery() throws QException
+   {
+      QueryInput queryInput = new QueryInput();
+      queryInput.setTableName(TestUtils.TABLE_NAME_ORDER_LINE);
+
+      ///////////////////////////////////////////////////////////////////////////////////////////
+      // orders 1, 2, and 3 are from store 1, so their lines (5 in total) should be found.     //
+      // note, order 2 has the line with mis-matched store id - but, that shouldn't apply here //
+      ///////////////////////////////////////////////////////////////////////////////////////////
+      queryInput.setFilter(new QQueryFilter(new QFilterCriteria("order.id", QCriteriaOperator.IN, List.of(1, 2, 3, 4))));
+      QContext.setQSession(new QSession().withSecurityKeyValue(TestUtils.TABLE_NAME_STORE, 1));
+      assertThat(new QueryAction().execute(queryInput).getRecords()).hasSize(5);
+
+      ///////////////////////////////////////////////////////////////////
+      // order 4 should be the only one found this time (with 2 lines) //
+      ///////////////////////////////////////////////////////////////////
+      queryInput.setFilter(new QQueryFilter(new QFilterCriteria("order.id", QCriteriaOperator.IN, List.of(1, 2, 3, 4))));
+      QContext.setQSession(new QSession().withSecurityKeyValue(TestUtils.TABLE_NAME_STORE, 2));
+      assertThat(new QueryAction().execute(queryInput).getRecords()).hasSize(2);
+
+      ////////////////////////////////////////////////////////////////
+      // make sure we're also good if we explicitly join this table //
+      ////////////////////////////////////////////////////////////////
+      queryInput.withQueryJoin(new QueryJoin().withJoinTable(TestUtils.TABLE_NAME_ORDER).withSelect(true));
+      assertThat(new QueryAction().execute(queryInput).getRecords()).hasSize(2);
+   }
+
+
+
    /*******************************************************************************
     **
     *******************************************************************************/