commit 8c6fbdc731f283e0cea172faa234f22fd484cee2 parent 1b3fedbf1f5279f1e0976d3d3d143dc3e2d63401 Author: Felicitus <felicitus@felicitus.org> Date: Wed, 4 Jan 2012 21:33:52 +0100 Force case-insensitive searches. MySQL worked before this patch, but PostgreSQL does case sensitive searches by default Diffstat:
9 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/backend/de/RaumZeitLabor/PartKeepr/Distributor/DistributorManager.php b/src/backend/de/RaumZeitLabor/PartKeepr/Distributor/DistributorManager.php @@ -24,8 +24,8 @@ class DistributorManager extends Singleton { $qb->select("st.id, st.name, st.url, st.email, st.comment, st.address")->from("de\RaumZeitLabor\PartKeepr\Distributor\Distributor","st"); if ($filter != "") { - $qb = $qb->where("st.name LIKE :filter"); - $qb->setParameter("filter", "%".$filter."%"); + $qb = $qb->where("LOWER(st.name) LIKE :filter"); + $qb->setParameter("filter", "%".strtolower($filter)."%"); } if ($limit > -1) { @@ -45,8 +45,8 @@ class DistributorManager extends Singleton { if ($filter != "") { - $totalQueryBuilder = $totalQueryBuilder->where("st.name LIKE :filter"); - $totalQueryBuilder->setParameter("filter", "%".$filter."%"); + $totalQueryBuilder = $totalQueryBuilder->where("LOWER(st.name) LIKE :filter"); + $totalQueryBuilder->setParameter("filter", "%".strtolower($filter)."%"); } $totalQuery = $totalQueryBuilder->getQuery(); diff --git a/src/backend/de/RaumZeitLabor/PartKeepr/Footprint/FootprintManager.php b/src/backend/de/RaumZeitLabor/PartKeepr/Footprint/FootprintManager.php @@ -27,8 +27,8 @@ class FootprintManager extends Singleton { ->leftJoin("f.category", "ca"); if ($filter != "") { - $qb = $qb->where("f.name LIKE :filter"); - $qb->setParameter("filter", "%".$filter."%"); + $qb = $qb->where("LOWER(f.name) LIKE :filter"); + $qb->setParameter("filter", "%".strtolower($filter)."%"); } if ($limit > -1) { @@ -48,8 +48,8 @@ class FootprintManager extends Singleton { if ($filter != "") { - $totalQueryBuilder = $totalQueryBuilder->where("f.name LIKE :filter"); - $totalQueryBuilder->setParameter("filter", "%".$filter."%"); + $totalQueryBuilder = $totalQueryBuilder->where("LOWER(f.name) LIKE :filter"); + $totalQueryBuilder->setParameter("filter", "%".strtolower($filter)."%"); } $totalQuery = $totalQueryBuilder->getQuery(); diff --git a/src/backend/de/RaumZeitLabor/PartKeepr/Manager/AbstractManager.php b/src/backend/de/RaumZeitLabor/PartKeepr/Manager/AbstractManager.php @@ -159,17 +159,17 @@ abstract class AbstractManager extends Singleton { if (is_array($filter->getFilterField())) { foreach ($filter->getFilterField() as $field) { - $aOrWhereFields[] = "q.".$field." LIKE :filter"; + $aOrWhereFields[] = "LOWER(q.".$field.") LIKE :filter"; } } else { - $aOrWhereFields[] = "q.".$filter->getFilterField()." LIKE :filter"; + $aOrWhereFields[] = "LOWER(q.".$filter->getFilterField().") LIKE :filter"; } foreach ($aOrWhereFields as $or) { $qb->orWhere($or); } - $qb->setParameter("filter", "%".$filter->getFilter()."%"); + $qb->setParameter("filter", "%".strtolower($filter->getFilter())."%"); } if ($filter->getFilterCallback() !== null) { diff --git a/src/backend/de/RaumZeitLabor/PartKeepr/Manufacturer/ManufacturerManager.php b/src/backend/de/RaumZeitLabor/PartKeepr/Manufacturer/ManufacturerManager.php @@ -24,8 +24,8 @@ class ManufacturerManager extends Singleton { $qb->select("st.id, st.name, st.url, st.email, st.comment, st.address")->from("de\RaumZeitLabor\PartKeepr\Manufacturer\Manufacturer","st"); if ($filter != "") { - $qb = $qb->where("st.name LIKE :filter"); - $qb->setParameter("filter", "%".$filter."%"); + $qb = $qb->where("LOWER(st.name) LIKE :filter"); + $qb->setParameter("filter", "%".strtolower($filter)."%"); } if ($limit > -1) { @@ -45,8 +45,8 @@ class ManufacturerManager extends Singleton { if ($filter != "") { - $totalQueryBuilder = $totalQueryBuilder->where("st.name LIKE :filter"); - $totalQueryBuilder->setParameter("filter", "%".$filter."%"); + $totalQueryBuilder = $totalQueryBuilder->where("LOWER(st.name) LIKE :filter"); + $totalQueryBuilder->setParameter("filter", "%".strtolower($filter)."%"); } $totalQuery = $totalQueryBuilder->getQuery(); diff --git a/src/backend/de/RaumZeitLabor/PartKeepr/Part/PartManager.php b/src/backend/de/RaumZeitLabor/PartKeepr/Part/PartManager.php @@ -48,8 +48,8 @@ class PartManager extends Singleton { $qb->where("1=1"); if ($filter != "") { - $qb = $qb->where("p.name LIKE :filter"); - $qb->setParameter("filter", "%".$filter."%"); + $qb = $qb->where("LOWER(p.name) LIKE :filter"); + $qb->setParameter("filter", "%".strtolower($filter)."%"); } if ($storageLocation !== null) { diff --git a/src/backend/de/RaumZeitLabor/PartKeepr/PartUnit/PartUnitManager.php b/src/backend/de/RaumZeitLabor/PartKeepr/PartUnit/PartUnitManager.php @@ -15,8 +15,8 @@ class PartUnitManager extends Singleton { $qb->select("st.id, st.name, st.shortName, st.is_default AS default")->from("de\RaumZeitLabor\PartKeepr\Part\PartUnit","st"); if ($filter != "") { - $qb = $qb->where("st.name LIKE :filter"); - $qb->setParameter("filter", "%".$filter."%"); + $qb = $qb->where("LOWER(st.name) LIKE :filter"); + $qb->setParameter("filter", "%".strtolower($filter)."%"); } if ($limit > -1) { @@ -48,8 +48,8 @@ class PartUnitManager extends Singleton { if ($filter != "") { - $totalQueryBuilder = $totalQueryBuilder->where("st.name LIKE :filter"); - $totalQueryBuilder->setParameter("filter", "%".$filter."%"); + $totalQueryBuilder = $totalQueryBuilder->where("LOWER(st.name) LIKE :filter"); + $totalQueryBuilder->setParameter("filter", "%".strtolower($filter)."%"); } $totalQuery = $totalQueryBuilder->getQuery(); diff --git a/src/backend/de/RaumZeitLabor/PartKeepr/StorageLocation/StorageLocationManager.php b/src/backend/de/RaumZeitLabor/PartKeepr/StorageLocation/StorageLocationManager.php @@ -15,8 +15,8 @@ class StorageLocationManager extends Singleton { $qb->select("st.id, st.name")->from("de\RaumZeitLabor\PartKeepr\StorageLocation\StorageLocation","st"); if ($filter != "") { - $qb = $qb->where("st.name LIKE :filter"); - $qb->setParameter("filter", "%".$filter."%"); + $qb = $qb->where("LOWER(st.name) LIKE :filter"); + $qb->setParameter("filter", "%".strtolower($filter)."%"); } if ($limit > -1) { @@ -36,8 +36,8 @@ class StorageLocationManager extends Singleton { if ($filter != "") { - $totalQueryBuilder = $totalQueryBuilder->where("st.name LIKE :filter"); - $totalQueryBuilder->setParameter("filter", "%".$filter."%"); + $totalQueryBuilder = $totalQueryBuilder->where("LOWER(st.name) LIKE :filter"); + $totalQueryBuilder->setParameter("filter", "%".strtolower($filter)."%"); } $totalQuery = $totalQueryBuilder->getQuery(); diff --git a/src/backend/de/RaumZeitLabor/PartKeepr/Unit/UnitManager.php b/src/backend/de/RaumZeitLabor/PartKeepr/Unit/UnitManager.php @@ -13,8 +13,8 @@ class UnitManager extends Singleton { $qb->select("u.id, u.name, u.symbol")->from("de\RaumZeitLabor\PartKeepr\Unit\Unit","u"); if ($filter != "") { - $qb = $qb->where("u.name LIKE :filter"); - $qb->setParameter("filter", "%".$filter."%"); + $qb = $qb->where("LOWER(u.name) LIKE :filter"); + $qb->setParameter("filter", "%".strtolower($filter)."%"); } if ($limit > -1) { @@ -34,8 +34,8 @@ class UnitManager extends Singleton { if ($filter != "") { - $totalQueryBuilder = $totalQueryBuilder->where("u.name LIKE :filter"); - $totalQueryBuilder->setParameter("filter", "%".$filter."%"); + $totalQueryBuilder = $totalQueryBuilder->where("LOWER(u.name) LIKE :filter"); + $totalQueryBuilder->setParameter("filter", "%".strtolower($filter)."%"); } $totalQuery = $totalQueryBuilder->getQuery(); diff --git a/src/backend/de/RaumZeitLabor/PartKeepr/User/UserManager.php b/src/backend/de/RaumZeitLabor/PartKeepr/User/UserManager.php @@ -26,8 +26,8 @@ class UserManager extends Singleton { $qb->select("st.id, st.username")->from("de\RaumZeitLabor\PartKeepr\User\User","st"); if ($filter != "") { - $qb = $qb->where("st.username LIKE :filter"); - $qb->setParameter("filter", "%".$filter."%"); + $qb = $qb->where("LOWER(st.username) LIKE :filter"); + $qb->setParameter("filter", "%".strtolower($filter)."%"); } if ($limit > -1) { @@ -47,8 +47,8 @@ class UserManager extends Singleton { if ($filter != "") { - $totalQueryBuilder = $totalQueryBuilder->where("st.username LIKE :filter"); - $totalQueryBuilder->setParameter("filter", "%".$filter."%"); + $totalQueryBuilder = $totalQueryBuilder->where("LOWER(st.username) LIKE :filter"); + $totalQueryBuilder->setParameter("filter", "%".strtolower($filter)."%"); } $totalQuery = $totalQueryBuilder->getQuery();