tonyair/silverstripe-sqlite3
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-sqlite3 synced 2024-09-28 04:15:58 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX: Updated sqlite3 module to work in SS3 while still supporting SS2.4.

Browse Source
This commit is contained in:
Sam Minnee 2011-12-17 12:05:42 +13:00
parent 61820b08de
commit bac4aac13f
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/SQLite3Database.php
View File

@ -901,8 +901,14 @@ class SQLite3Database extends SS_Database {
// Generate initial queries and base table names // Generate initial queries and base table names
$baseClasses = array('SiteTree' => '', 'File' => ''); $baseClasses = array('SiteTree' => '', 'File' => '');
$queries = array();
foreach($classesToSearch as $class) { foreach($classesToSearch as $class) {
$queries[$class] = singleton($class)->extendedSQL($notMatch . $match[$class] . $extraFilters[$class], ""); // SS 2.4 and 3.0
if(class_exists('DataList')) {
$queries[$class] = DataList::create($class)->where($notMatch . $match[$class] . $extraFilters[$class], "")->dataQuery()->query();
} else {
$queries[$class] = singleton($class)->extendedSQL($notMatch . $match[$class] . $extraFilters[$class], "");
}
$baseClasses[$class] = reset($queries[$class]->from); $baseClasses[$class] = reset($queries[$class]->from);
} }
@ -934,16 +940,18 @@ class SQLite3Database extends SS_Database {
foreach($records as $record) foreach($records as $record)
$objects[] = new $record['ClassName']($record); $objects[] = new $record['ClassName']($record);
if(isset($objects)) $doSet = new DataObjectSet($objects); // SS3
else $doSet = new DataObjectSet();
if(class_exists('PaginatedList')) { if(class_exists('PaginatedList')) {
if(isset($objects)) $doSet = new ArrayList($objects);
else $doSet = new ArrayList();
$list = new PaginatedList($doSet); $list = new PaginatedList($doSet);
$list->setPageStart($start); $list->setPageStart($start);
$list->setPageLEngth($pageLength); $list->setPageLEngth($pageLength);
$list->setTotalItems($totalCount); $list->setTotalItems($totalCount);
return $list; return $list;
} else { } else {
if(isset($objects)) $doSet = new DataObjectSet($objects);
else $doSet = new DataObjectSet();
$doSet->setPageLimits($start, $pageLength, $totalCount); $doSet->setPageLimits($start, $pageLength, $totalCount);
return $doSet; return $doSet;
} }