Quellcode durchsuchen

Revert "fix for #4049 (#4050)"

This reverts commit f3b2d2eb20.
master
Viggodevries vor 2 Jahren
Ursprung
Commit
56e438ca1d
1 geänderte Dateien mit 11 neuen und 11 gelöschten Zeilen
  1. 11
    11
      src/oscar/apps/catalogue/expressions.py

+ 11
- 11
src/oscar/apps/catalogue/expressions.py Datei anzeigen

@@ -1,22 +1,22 @@
1 1
 from django.db.models.expressions import Subquery
2 2
 
3 3
 EXPAND_UPWARDS_CATEGORY_QUERY = """
4
-(SELECT `CATALOGUE_CATEGORY_JOIN`.`id` FROM `catalogue_category` AS `CATALOGUE_CATEGORY_BASE`
5
-LEFT JOIN `catalogue_category` AS `CATALOGUE_CATEGORY_JOIN` ON (
6
-    `CATALOGUE_CATEGORY_BASE`.`path` LIKE `CATALOGUE_CATEGORY_JOIN`.`path` || '%%%%'
7
-    AND `CATALOGUE_CATEGORY_BASE`.`depth` >= `CATALOGUE_CATEGORY_JOIN`.`depth`
4
+(SELECT "CATALOGUE_CATEGORY_JOIN"."id" FROM "catalogue_category" AS "CATALOGUE_CATEGORY_BASE"
5
+LEFT JOIN "catalogue_category" AS "CATALOGUE_CATEGORY_JOIN" ON (
6
+    "CATALOGUE_CATEGORY_BASE"."path" LIKE "CATALOGUE_CATEGORY_JOIN"."path" || '%%%%'
7
+    AND "CATALOGUE_CATEGORY_BASE"."depth" >= "CATALOGUE_CATEGORY_JOIN"."depth"
8 8
 )
9
-WHERE `CATALOGUE_CATEGORY_BASE`.`id` IN (%(subquery)s))
9
+WHERE "CATALOGUE_CATEGORY_BASE"."id" IN (%(subquery)s))
10 10
 """
11 11
 
12 12
 
13 13
 EXPAND_DOWNWARDS_CATEGORY_QUERY = """
14
-(SELECT `CATALOGUE_CATEGORY_JOIN`.`id` FROM `catalogue_category` AS `CATALOGUE_CATEGORY_BASE` 
15
-LEFT JOIN `catalogue_category` AS `CATALOGUE_CATEGORY_JOIN` ON (
16
-    `CATALOGUE_CATEGORY_JOIN`.`path` LIKE `CATALOGUE_CATEGORY_BASE`.`path` || '%%%%' 
17
-    AND `CATALOGUE_CATEGORY_BASE`.`depth` <= `CATALOGUE_CATEGORY_JOIN`.`depth`
18
-) 
19
-WHERE `CATALOGUE_CATEGORY_BASE`.`id` IN (%(subquery)s))
14
+(SELECT "CATALOGUE_CATEGORY_JOIN"."id" FROM "catalogue_category" AS "CATALOGUE_CATEGORY_BASE"
15
+LEFT JOIN "catalogue_category" AS "CATALOGUE_CATEGORY_JOIN" ON (
16
+    "CATALOGUE_CATEGORY_JOIN"."path" LIKE "CATALOGUE_CATEGORY_BASE"."path" || '%%%%'
17
+    AND "CATALOGUE_CATEGORY_BASE"."depth" <= "CATALOGUE_CATEGORY_JOIN"."depth"
18
+)
19
+WHERE "CATALOGUE_CATEGORY_BASE"."id" IN (%(subquery)s))
20 20
 """
21 21
 
22 22
 

Laden…
Abbrechen
Speichern