Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
zhaoyufei133
litepal
提交
f40237df
L
litepal
项目概览
zhaoyufei133
/
litepal
与 Fork 源项目一致
从无法访问的项目Fork
通知
4
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
litepal
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
f40237df
编写于
9月 28, 2020
作者:
G
guolindev
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/master'
上级
db5f621c
a2b69531
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
62 addition
and
38 deletion
+62
-38
README.md
README.md
+3
-2
core/build.gradle
core/build.gradle
+26
-26
core/src/main/java/org/litepal/crud/DataHandler.java
core/src/main/java/org/litepal/crud/DataHandler.java
+1
-0
sample/src/androidTest/java/com/litepaltest/test/LitePalTestCase.java
...ndroidTest/java/com/litepaltest/test/LitePalTestCase.java
+4
-1
sample/src/androidTest/java/com/litepaltest/test/crud/query/QueryBasicKotlinTest.kt
...a/com/litepaltest/test/crud/query/QueryBasicKotlinTest.kt
+2
-2
sample/src/androidTest/java/com/litepaltest/test/crud/query/QueryClusterKotlinTest.kt
...com/litepaltest/test/crud/query/QueryClusterKotlinTest.kt
+7
-7
sample/src/androidTest/java/com/litepaltest/test/crud/save/SaveTest.java
...oidTest/java/com/litepaltest/test/crud/save/SaveTest.java
+19
-0
未找到文件。
README.md
浏览文件 @
f40237df
...
...
@@ -22,7 +22,7 @@ Edit your **build.gradle** file and add below dependency.
```
groovy
dependencies
{
implementation
'org.litepal.guolindev:core:3.2.
1
'
implementation
'org.litepal.guolindev:core:3.2.
2
'
}
```
...
...
@@ -451,9 +451,10 @@ If you find any bug when using LitePal, please report **[here](https://github.co
## Change logs
### 3.2.
1
### 3.2.
2
*
Support database index by adding @Column(index = true) on field.
*
Adding return value for
**runInTransaction()**
function for Kotlin.
*
Fix known bugs.
### 3.1.1
*
Support transaction.
...
...
core/build.gradle
浏览文件 @
f40237df
...
...
@@ -28,29 +28,29 @@ dependencies {
implementation
"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
apply
plugin:
'com.novoda.bintray-release'
allprojects
{
tasks
.
withType
(
Javadoc
)
{
options
.
addStringOption
(
'Xdoclint:none'
,
'-quiet'
)
options
.
addStringOption
(
'encoding'
,
'UTF-8'
)
}
}
buildscript
{
repositories
{
jcenter
()
}
dependencies
{
classpath
'com.novoda:bintray-release:0.9.2'
}
}
publish
{
userOrg
=
'sinyu890807'
groupId
=
'org.litepal.guolindev'
artifactId
=
'core'
publishVersion
=
'3.2.1'
desc
=
'An Android library that allows developers to use SQLite database extremely easy'
website
=
'https://github.com/LitePalFramework/LitePal'
}
\ No newline at end of file
//apply plugin: 'com.novoda.bintray-release'
//
//allprojects {
// tasks.withType(Javadoc) {
// options.addStringOption('Xdoclint:none', '-quiet')
// options.addStringOption('encoding', 'UTF-8')
// }
//}
//
//buildscript {
// repositories {
// jcenter()
// }
// dependencies {
// classpath 'com.novoda:bintray-release:0.9.2'
// }
//}
//
//publish {
// userOrg = 'sinyu890807'
// groupId = 'org.litepal.guolindev'
// artifactId = 'core'
// publishVersion = '3.2.2'
// desc = 'An Android library that allows developers to use SQLite database extremely easy'
// website = 'https://github.com/LitePalFramework/LitePal'
//}
\ No newline at end of file
core/src/main/java/org/litepal/crud/DataHandler.java
浏览文件 @
f40237df
...
...
@@ -1320,6 +1320,7 @@ abstract class DataHandler extends LitePalBase {
private
void
setToModelByReflection
(
Object
modelInstance
,
Field
field
,
int
columnIndex
,
String
getMethodName
,
Cursor
cursor
)
throws
NoSuchMethodException
,
InvocationTargetException
,
IllegalAccessException
{
Class
<?>
cursorClass
=
cursor
.
getClass
();
if
(
cursor
.
isNull
(
columnIndex
))
return
;
Method
method
=
cursorClass
.
getMethod
(
getMethodName
,
int
.
class
);
Object
value
=
method
.
invoke
(
cursor
,
columnIndex
);
if
(
field
.
getType
()
==
boolean
.
class
||
field
.
getType
()
==
Boolean
.
class
)
{
...
...
sample/src/androidTest/java/com/litepaltest/test/LitePalTestCase.java
浏览文件 @
f40237df
...
...
@@ -135,7 +135,10 @@ public class LitePalTestCase {
do
{
long
id
=
cursor
.
getLong
(
cursor
.
getColumnIndexOrThrow
(
"id"
));
String
bookName
=
cursor
.
getString
(
cursor
.
getColumnIndexOrThrow
(
"bookname"
));
int
pages
=
cursor
.
getInt
(
cursor
.
getColumnIndexOrThrow
(
"pages"
));
Integer
pages
=
null
;
if
(!
cursor
.
isNull
(
cursor
.
getColumnIndexOrThrow
(
"pages"
)))
{
pages
=
cursor
.
getInt
(
cursor
.
getColumnIndexOrThrow
(
"pages"
));
}
double
price
=
cursor
.
getDouble
(
cursor
.
getColumnIndexOrThrow
(
"price"
));
char
level
=
cursor
.
getString
(
cursor
.
getColumnIndexOrThrow
(
"level"
)).
charAt
(
0
);
short
isbn
=
cursor
.
getShort
(
cursor
.
getColumnIndexOrThrow
(
"isbn"
));
...
...
sample/src/androidTest/java/com/litepaltest/test/crud/query/QueryBasicKotlinTest.kt
浏览文件 @
f40237df
...
...
@@ -96,7 +96,7 @@ class QueryBasicKotlinTest : LitePalTestCase() {
val
realBook
=
realBooks
[
i
]
assertEquals
(
expectBook
.
id
,
realBook
.
id
)
assertEquals
(
expectBook
.
bookName
,
realBook
.
bookName
)
assertEquals
(
expectBook
.
pages
,
realBook
.
pages
)
assertEquals
(
expectBook
.
pages
as
Int
?,
realBook
.
pages
as
Int
?
)
assertEquals
(
expectBook
.
price
,
realBook
.
price
)
assertEquals
(
expectBook
.
area
,
realBook
.
area
)
assertEquals
(
expectBook
.
isbn
,
realBook
.
isbn
)
...
...
@@ -113,7 +113,7 @@ class QueryBasicKotlinTest : LitePalTestCase() {
val
realFirstBook
=
LitePal
.
findFirst
<
Book
>()
assertEquals
(
expectedFirstBook
.
id
,
realFirstBook
!!
.
id
)
assertEquals
(
expectedFirstBook
.
bookName
,
realFirstBook
.
bookName
)
assertEquals
(
expectedFirstBook
.
pages
,
realFirstBook
.
pages
)
assertEquals
(
expectedFirstBook
.
pages
as
Int
?,
realFirstBook
.
pages
as
Int
?
)
assertEquals
(
expectedFirstBook
.
price
,
realFirstBook
.
price
)
assertEquals
(
expectedFirstBook
.
area
,
realFirstBook
.
area
)
assertEquals
(
expectedFirstBook
.
isbn
,
realFirstBook
.
isbn
)
...
...
sample/src/androidTest/java/com/litepaltest/test/crud/query/QueryClusterKotlinTest.kt
浏览文件 @
f40237df
...
...
@@ -114,7 +114,7 @@ class QueryClusterKotlinTest : LitePalTestCase() {
if
(
i
==
0
)
{
assertEquals
(
firstBook
!!
.
isSaved
,
book
.
isSaved
)
assertEquals
(
firstBook
.
bookName
,
book
.
bookName
)
assertEquals
(
firstBook
.
pages
,
book
.
pages
)
assertEquals
(
firstBook
.
pages
as
Int
?,
book
.
pages
as
Int
?
)
assertEquals
(
firstBook
.
isPublished
,
book
.
isPublished
)
assertEquals
(
firstBook
.
price
,
book
.
price
)
assertEquals
(
firstBook
.
area
,
book
.
area
)
...
...
@@ -125,7 +125,7 @@ class QueryClusterKotlinTest : LitePalTestCase() {
if
(
i
==
books
.
size
-
1
)
{
assertEquals
(
lastBook
!!
.
isSaved
,
book
.
isSaved
)
assertEquals
(
lastBook
.
bookName
,
book
.
bookName
)
assertEquals
(
lastBook
.
pages
,
book
.
pages
)
assertEquals
(
lastBook
.
pages
as
Int
?,
book
.
pages
as
Int
?
)
assertEquals
(
lastBook
.
isPublished
,
book
.
isPublished
)
assertEquals
(
lastBook
.
price
,
book
.
price
)
assertEquals
(
lastBook
.
area
,
book
.
area
)
...
...
@@ -148,7 +148,7 @@ class QueryClusterKotlinTest : LitePalTestCase() {
if
(
i
==
0
)
{
assertEquals
(
inverseFirstBook
!!
.
isSaved
,
book
.
isSaved
)
assertEquals
(
inverseFirstBook
.
bookName
,
book
.
bookName
)
assertEquals
(
inverseFirstBook
.
pages
,
book
.
pages
)
assertEquals
(
inverseFirstBook
.
pages
as
Int
?,
book
.
pages
as
Int
?
)
assertEquals
(
inverseFirstBook
.
isPublished
,
book
.
isPublished
)
assertEquals
(
inverseFirstBook
.
price
,
book
.
price
)
assertEquals
(
inverseFirstBook
.
area
,
book
.
area
)
...
...
@@ -159,7 +159,7 @@ class QueryClusterKotlinTest : LitePalTestCase() {
if
(
i
==
books
.
size
-
1
)
{
assertEquals
(
inverseLastBook
!!
.
isSaved
,
book
.
isSaved
)
assertEquals
(
inverseLastBook
.
bookName
,
book
.
bookName
)
assertEquals
(
inverseLastBook
.
pages
,
book
.
pages
)
assertEquals
(
inverseLastBook
.
pages
as
Int
?,
book
.
pages
as
Int
?
)
assertEquals
(
inverseLastBook
.
isPublished
,
book
.
isPublished
)
assertEquals
(
inverseLastBook
.
price
,
book
.
price
)
assertEquals
(
inverseLastBook
.
area
,
book
.
area
)
...
...
@@ -179,7 +179,7 @@ class QueryClusterKotlinTest : LitePalTestCase() {
val
firstBook
=
LitePal
.
findFirst
<
Book
>()
assertTrue
(
firstBook
!!
.
isSaved
)
assertEquals
(
firstBook
.
bookName
,
book
.
bookName
)
assertEquals
(
firstBook
.
pages
,
book
.
pages
)
assertEquals
(
firstBook
.
pages
as
Int
?,
book
.
pages
as
Int
?
)
assertEquals
(
firstBook
.
isPublished
,
book
.
isPublished
)
assertEquals
(
firstBook
.
area
,
book
.
area
)
assertEquals
(
firstBook
.
price
,
book
.
price
)
...
...
@@ -193,7 +193,7 @@ class QueryClusterKotlinTest : LitePalTestCase() {
val
lastBook
=
LitePal
.
findLast
(
Book
::
class
.
java
)
assertTrue
(
lastBook
!!
.
isSaved
)
assertEquals
(
lastBook
.
bookName
,
book
.
bookName
)
assertEquals
(
lastBook
.
pages
,
book
.
pages
)
assertEquals
(
lastBook
.
pages
as
Int
?,
book
.
pages
as
Int
?
)
assertEquals
(
lastBook
.
isPublished
,
book
.
isPublished
)
assertEquals
(
lastBook
.
area
,
book
.
area
)
assertEquals
(
lastBook
.
price
,
book
.
price
)
...
...
@@ -213,7 +213,7 @@ class QueryClusterKotlinTest : LitePalTestCase() {
val
expectedBooks
=
getBooks
(
null
,
null
,
null
,
null
,
null
,
null
,
null
)
val
expectedBook
=
expectedBooks
[
1
]
assertEquals
(
expectedBook
.
bookName
,
book
.
bookName
)
assertEquals
(
expectedBook
.
pages
,
book
.
pages
)
assertEquals
(
expectedBook
.
pages
as
Int
?,
book
.
pages
as
Int
?
)
assertEquals
(
expectedBook
.
isPublished
,
book
.
isPublished
)
assertEquals
(
expectedBook
.
area
,
book
.
area
)
assertEquals
(
expectedBook
.
price
,
book
.
price
)
...
...
sample/src/androidTest/java/com/litepaltest/test/crud/save/SaveTest.java
浏览文件 @
f40237df
...
...
@@ -2,6 +2,7 @@ package com.litepaltest.test.crud.save;
import
android.support.test.filters.SmallTest
;
import
com.litepaltest.model.Book
;
import
com.litepaltest.model.Cellphone
;
import
com.litepaltest.model.Classroom
;
import
com.litepaltest.model.Computer
;
...
...
@@ -20,6 +21,7 @@ import java.util.ArrayList;
import
java.util.List
;
import
java.util.UUID
;
import
static
junit
.
framework
.
Assert
.
assertNotNull
;
import
static
junit
.
framework
.
TestCase
.
assertEquals
;
import
static
junit
.
framework
.
TestCase
.
assertFalse
;
import
static
junit
.
framework
.
TestCase
.
assertNull
;
...
...
@@ -245,4 +247,21 @@ public class SaveTest extends LitePalTestCase {
assertEquals
(
Long
.
MAX_VALUE
,
idCardFromDB
.
getSerial
());
}
@Test
public
void
testNullValue
()
{
Book
book
=
new
Book
();
book
.
setBookName
(
"First Line of Android"
);
assertTrue
(
book
.
save
());
Book
bookFromDB
=
LitePal
.
find
(
Book
.
class
,
book
.
getId
());
assertNotNull
(
bookFromDB
);
assertNull
(
bookFromDB
.
getPages
());
// pages should be null cause it's Integer type and assign no value.
book
.
setPages
(
123
);
// assign pages
assertTrue
(
book
.
save
());
bookFromDB
=
LitePal
.
find
(
Book
.
class
,
book
.
getId
());
assertNotNull
(
bookFromDB
);
assertNotNull
(
bookFromDB
.
getPages
());
// now we should be pages value.
assertEquals
(
Integer
.
valueOf
(
123
),
book
.
getPages
());
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录