wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use integer for availability instead of bool

Browse source
This commit is contained in:
Robin McCorkell 2015-09-10 22:01:02 +01:00 committed by Thomas Müller
parent 24d2cbf3de
commit 5ca690e2f8
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
db_structure.xml
View file

@ -104,8 +104,8 @@
<field> <field>
<name>available</name> <name>available</name>
<type>boolean</type> <type>integer</type>
<default>true</default> <default>1</default>
<notnull>true</notnull> <notnull>true</notnull>
</field> </field>

8
lib/private/files/cache/storage.php vendored
View file

@ -58,7 +58,8 @@ class Storage {
$this->numericId = $row['numeric_id']; $this->numericId = $row['numeric_id'];
} else { } else {
$connection = \OC_DB::getConnection(); $connection = \OC_DB::getConnection();
if ($connection->insertIfNotExist('*PREFIX*storages', ['id' => $this->storageId, 'available' => $isAvailable])) { $available = $isAvailable ? 1 : 0;
if ($connection->insertIfNotExist('*PREFIX*storages', ['id' => $this->storageId, 'available' => $available])) {
$this->numericId = \OC_DB::insertid('*PREFIX*storages'); $this->numericId = \OC_DB::insertid('*PREFIX*storages');
} else { } else {
if ($row = self::getStorageById($this->storageId)) { if ($row = self::getStorageById($this->storageId)) {
@ -141,7 +142,7 @@ class Storage {
public function getAvailability() { public function getAvailability() {
if ($row = self::getStorageById($this->storageId)) { if ($row = self::getStorageById($this->storageId)) {
return [ return [
'available' => $row['available'], 'available' => ($row['available'] === 1),
'last_checked' => $row['last_checked'] 'last_checked' => $row['last_checked']
]; ];
} else { } else {
@ -154,7 +155,8 @@ class Storage {
*/ */
public function setAvailability($isAvailable) { public function setAvailability($isAvailable) {
$sql = 'UPDATE `*PREFIX*storages` SET `available` = ?, `last_checked` = ? WHERE `id` = ?'; $sql = 'UPDATE `*PREFIX*storages` SET `available` = ?, `last_checked` = ? WHERE `id` = ?';
\OC_DB::executeAudited($sql, array($isAvailable, time(), $this->storageId)); $available = $isAvailable ? 1 : 0;
\OC_DB::executeAudited($sql, array($available, time(), $this->storageId));
} }
/** /**

2
version.php
View file

@ -23,7 +23,7 @@
// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number. // when updating major/minor version number.
$OC_Version = [8, 2, 0, 4]; $OC_Version = [8, 2, 0, 5];
// The human readable string // The human readable string
$OC_VersionString = '8.2 pre alpha'; $OC_VersionString = '8.2 pre alpha';