Changeset 5047

Timestamp:

Aug 12, 2009, 12:38:34 PM (13 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1358: Left join is not generated when filtering on aliased property with association path

File:

• trunk/src/core/net/sf/basedb/core/ItemContext.java (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/ItemContext.java

@@ -1084 +1084 @@
             {
               String filterProperty = filter.getProperty();
+              if (filterProperty != null && !filterProperty.startsWith("£") && !filterProperty.startsWith("&"))
+              {
+                int lastDotIndex = filterProperty.lastIndexOf('.');
+                int firstDotIndex = filterProperty.indexOf('.');
+                if (lastDotIndex >= 0)
+                {
+                  filterProperty = filterProperty.substring(0, lastDotIndex);
+                  if (!filterProperty.startsWith("$") || lastDotIndex != firstDotIndex)
+                  {
+                    leftJoins.add(filterProperty);
+                  }
+                }
+              }
+              /*
               int dotIndex = filterProperty == null ? -1 : filterProperty.lastIndexOf(".");
-              if (dotIndex >= 0 && !filterProperty.startsWith("$") && !filterProperty.startsWith("£") && !filterProperty.startsWith("&"))
+              if (dotIndex >= 0)
               {
-                leftJoins.add(filterProperty.substring(0, dotIndex));
+                // Get rid of the part after the last dot
+                filterProperty = filterProperty.substring(0, dotIndex);
+                if (filterProperty.startsWith("$"))
+                {
+                  // If it is an aliased property we need at least one more dot
+                  
+                }
+                else if (!filterProperty.startsWith("£") && !filterProperty.startsWith("&"))
+                {
+                  leftJoins.add(filterProperty);
+                }
               }
+              */
             }
           }