From b97b94ae29aac599214cb449582cfa2878bff36a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Borcz?= Date: Thu, 28 Mar 2019 23:07:59 +0100 Subject: [PATCH] Fix more than one current student (#311) Fix #309 --- .travis.yml | 8 ++++---- .../java/io/github/wulkanowy/data/db/dao/StudentDao.kt | 4 ++-- .../wulkanowy/data/repositories/student/StudentLocal.kt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 56c648589..b32619317 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,10 @@ cache: - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ -#branches: -# only: -# - master -# - 0.7.x +branches: + only: + - master + - 0.7.x android: licenses: diff --git a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt index c0c054c88..8110bb696 100644 --- a/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt +++ b/app/src/main/java/io/github/wulkanowy/data/db/dao/StudentDao.kt @@ -25,8 +25,8 @@ interface StudentDao { @Query("SELECT * FROM Students") fun loadAll(): Maybe> - @Query("UPDATE Students SET is_current = 1 WHERE student_id = :studentId") - fun updateCurrent(studentId: Int) + @Query("UPDATE Students SET is_current = 1 WHERE id = :id") + fun updateCurrent(id: Long) @Query("UPDATE Students SET is_current = 0") fun resetCurrent() diff --git a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt index e05e72234..7bbd283fb 100644 --- a/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt +++ b/app/src/main/java/io/github/wulkanowy/data/repositories/student/StudentLocal.kt @@ -35,7 +35,7 @@ class StudentLocal @Inject constructor( return Completable.fromCallable { studentDb.run { resetCurrent() - updateCurrent(student.studentId) + updateCurrent(student.id) } } }