From: Kazunobu Raita <raita_kazunobu@cyberagent.co.jp>
Date: Sat, 22 Feb 2014 08:32:07 +0000 (+0900)
Subject: Fix a bug and limit 1 select when select first
X-Git-Tag: v1.3.0~18^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8fc18480283d9f9d8d4a82e7220a2b870bfa083f;p=iciql.git

Fix a bug and limit 1 select when select first
---

diff --git a/src/main/java/com/iciql/Query.java b/src/main/java/com/iciql/Query.java
index 5dc78a5..45de08b 100644
--- a/src/main/java/com/iciql/Query.java
+++ b/src/main/java/com/iciql/Query.java
@@ -95,7 +95,8 @@ public class Query<T> {
 	}
 
 	public T selectFirst() {
-		return select(false).get(0);
+		List<T> list = limit(1).select(false);
+		return list.isEmpty() ? null : list.get(0);
 	}
 
 	public List<T> selectDistinct() {
@@ -104,7 +105,7 @@ public class Query<T> {
 
 	@SuppressWarnings("unchecked")
 	public <X, Z> X selectFirst(Z x) {
-		List<X> list = (List<X>) select(x);
+		List<X> list = limit(1).select(x);
 		return list.isEmpty() ? null : list.get(0);
 	}