Skip to content

Commit b337337

Browse files
authored
Merge pull request #91 from qiaoyuang/main
Fix documents
2 parents e9b69ca + a915fb2 commit b337337

3 files changed

Lines changed: 12 additions & 16 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
### sqllin-driver
1414

1515
* **Breaking change**: Remove the deprecated API `CommonCursor#forEachRows`
16-
* **Breaking change**: the `getInt`, `getLong`, `getFloat` and `getDouble` will throw an exception when the value is NULl in SQLite
16+
* **Breaking change**: the `getInt`, `getLong`, `getFloat` and `getDouble` will throw an exception when the value is NULL in SQLite
1717
* Add a new public API: `CommonCursor#isNull`, for check if the value is NULL in SQLite
1818

1919
## v1.3.0 / 2024-04-21
@@ -187,7 +187,6 @@ a runtime exception. Thanks for [@nbransby](https://github.com/nbransby).
187187

188188
* Fix some bugs about unit tests
189189

190-
191190
### sqllin-dsl
192191

193192
* Add the `ON` clause support

README.md

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
中文版请见[这里](README_CN.md)
44

5-
SQLlin is a Kotlin Multiplatform SQLite library that based on DSL and KSP. You can write SQL statements with your Kotlin code and these can
6-
be verified by Kotlin compiler. Sample just like be this:
5+
SQLlin is an ORM library for Kotlin Multiplatform that based on DSL and KSP. It uses SQLite under the hood. You can write SQL
6+
statements with your Kotlin code and these can be verified by Kotlin compiler. Sample just like be this:
77

88
```kotlin
99
private val db by lazy { Database(name = "person.db", path = path, version = 1) }
@@ -44,10 +44,9 @@ The architecture design of SQLlin is shown in the figure:
4444

4545
![sqllin-architecture](sqllin-architecture.png)
4646

47-
SQLlin has two major parts: _sqllin-dsl_ and _sqllin-driver_. The _sqllin-driver_ is a common multiplatform SQLite low-level
48-
API, most of the time it is not recommended to use it directly. The _sqllin-dsl_ is the SQL statements DSL implementation and based on _sqllin-driver_.
49-
50-
The _sqllin-processor_ uses KSP to process annotations and generate code for use with _sqllin-dsl_.
47+
SQLlin has 3 major parts: _sqllin-dsl_, _sqllin-driver_ and _sqllin-processor_. The _sqllin-driver_ is a set of common multiplatform SQLite low-level
48+
APIs, most of the time it is not recommended to use it directly. The _sqllin-dsl_ is DSL implementations for SQL statements, it based on
49+
_sqllin-driver_. The _sqllin-processor_ uses KSP to process annotations and generate code for using with _sqllin-dsl_.
5150

5251
You can learn how to use _sqllin-dsl_ in these documentations:
5352

@@ -58,13 +57,13 @@ You can learn how to use _sqllin-dsl_ in these documentations:
5857
- [SQL Functions](./sqllin-dsl/doc/sql-functions.md)
5958
- [Advanced Query](./sqllin-dsl/doc/advanced-query.md)
6059

61-
I don't recommend use _sqllin-driver_ directly, but if you want to learn more about it, you can read:
60+
I don't recommend using _sqllin-driver_ directly, but if you want to learn more about it, you can read:
6261

6362
- [The sqllin-driver Basic Design and Usage](./sqllin-driver/README.md)
6463

6564
## R8/ProGuard
6665

67-
Due to _sqllin-dsl_'s deserialization based on [kotlinx.serialization](https://github.com/Kotlin/kotlinx.serialization), R8/ProGuard configuration please refer to
66+
Due to _sqllin-dsl_'s deserialization based on [kotlinx.serialization](https://github.com/Kotlin/kotlinx.serialization), the R8/ProGuard configuration please refer to
6867
[kotlinx.serialization#Android](https://github.com/Kotlin/kotlinx.serialization#Android).
6968

7069
## License

README_CN.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SQLlin
22

3-
SQLlin 是一款基于 DSL 以及 Kotlin 符号处理器(KSP) Kotlin Multiplatform SQLite 框架。它使你可以在你的 Kotlin 代码中编写能够被 Kotlin 编译器校验的 SQL
4-
语句。示例如下:
3+
SQLlin 是一款基于 DSL Kotlin 符号处理器(KSP)实现的 Kotlin Multiplatform ORM 框架,其底层使用 SQLite。你可以使用它在 Kotlin
4+
代码中编写能够被 Kotlin 编译器校验的 SQL 语句。示例如下:
55

66
```kotlin
77
private val db by lazy { Database(name = "person.db", path = path, version = 1) }
@@ -41,10 +41,8 @@ SQLlin 的架构设计如下图所示:
4141

4242
![sqllin-architecture](sqllin-architecture.png)
4343

44-
SQLlin 拥有两个主要部分:_sqllin-dsl__sqllin-driver__sqllin-driver_ 是一套通用的多平台 SQLite 低阶 API,大多数情况下不推荐直接使用。
45-
_sqllin-dsl_ 是 SQL 语句的 DSL 实现并且它基于 _sqllin-driver_
46-
47-
_sqllin-processor_ 使用 KSP 处理注解并生成用于和 _sqllin-dsl_ 配合使用的代码。
44+
SQLlin 拥有三个主要部分:_sqllin-dsl__sqllin-driver__sqllin-processor__sqllin-driver_ 是一套通用的多平台 SQLite 低阶 API,大多数情况下不推荐直接使用。
45+
_sqllin-dsl_ 是 SQL 语句的 DSL 实现并且它基于 _sqllin-driver__sqllin-processor_ 使用 KSP 处理注解并生成用于与 _sqllin-dsl_ 配合使用的代码。
4846

4947
你可以在下列文档中学习如何使用 _sqllin-dsl_
5048

0 commit comments

Comments
 (0)