Skip to content

Commit

Permalink
0.7.69
Browse files Browse the repository at this point in the history
  • Loading branch information
babyfish-ct committed May 25, 2023
1 parent bd6e378 commit 7048624
Show file tree
Hide file tree
Showing 19 changed files with 75 additions and 59 deletions.
8 changes: 4 additions & 4 deletions doc/docs/jimmer-core/draft.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ Due to the existence of Annotation Processor/KSP plugin in the gradle configurat
```groovy title="build.gradle"
dependencies {
implementation 'org.babyfish.jimmer:jimmer-core:0.7.67'
implementation 'org.babyfish.jimmer:jimmer-core:0.7.69'
// highlight-next-line
annotationProcessor 'org.babyfish.jimmer:jimmer-apt:0.7.67'
annotationProcessor 'org.babyfish.jimmer:jimmer-apt:0.7.69'
// This annotation processor generates source code
// for INTERFACEs marked by
// `@org.babyfish.jimmer.Immutable` or
Expand All @@ -84,9 +84,9 @@ plugins {
}
dependencies {

implementation("org.babyfish.jimmer:jimmer-core-kotlin:0.7.67")
implementation("org.babyfish.jimmer:jimmer-core-kotlin:0.7.69")
// highlight-next-line
ksp("org.babyfish.jimmer:jimmer-ksp:0.7.67")
ksp("org.babyfish.jimmer:jimmer-ksp:0.7.69")
// The ksp plugin generates source code
// for INTERFACEs marked by
// `@org.babyfish.jimmer.Immutable` or
Expand Down
16 changes: 8 additions & 8 deletions doc/docs/jimmer-core/usage.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import TabItem from '@theme/TabItem';
```groovy title="build.gradle"
depdencies {
implementation 'org.babyfish.jimmer:jimmer-core:0.7.67'
annotationProcessor 'org.babyfish.jimmer:jimmer-apt:0.7.67'
implementation 'org.babyfish.jimmer:jimmer-core:0.7.69'
annotationProcessor 'org.babyfish.jimmer:jimmer-apt:0.7.69'
}
```

Expand All @@ -27,7 +27,7 @@ depdencies {
<dependency>
<groupId>org.babyfish.jimmer</groupId>
<artifactId>jimmer-core</artifactId>
<version>0.7.67</version>
<version>0.7.69</version>
</dependency>
</dependencies>

Expand All @@ -42,7 +42,7 @@ depdencies {
<path>
<groupId>org.babyfish.jimmer</groupId>
<artifactId>jimmer-apt</artifactId>
<version>0.7.67</version>
<version>0.7.69</version>
</path>
</annotationProcessorPaths>
</configuration>
Expand All @@ -64,10 +64,10 @@ plugins {
dependencies {

// Step2: Add jimmer-core-kotlin
implementation("org.babyfish.jimmer:jimmer-core-kotlin:0.7.67")
implementation("org.babyfish.jimmer:jimmer-core-kotlin:0.7.69")

// Step3: Apply ksp plugin
ksp("org.babyfish.jimmer:jimmer-ksp:0.7.67")
ksp("org.babyfish.jimmer:jimmer-ksp:0.7.69")
}

// Step4: Add generated sources into compile path.
Expand All @@ -87,7 +87,7 @@ kotlin {
<dependency>
<groupId>org.babyfish.jimmer</groupId>
<artifactId>jimmer-core-kotlin</artifactId>
<version>0.7.67</version>
<version>0.7.69</version>
</dependency>

<build>
Expand Down Expand Up @@ -129,7 +129,7 @@ kotlin {
<dependency>
<groupId>org.babyfish.jimmer</groupId>
<artifactId>jimmer-ksp</artifactId>
<version>0.7.67</version>
<version>0.7.69</version>
</dependency>
</dependencies>
</plugin>
Expand Down
16 changes: 8 additions & 8 deletions doc/docs/jimmer-sql/basic/usage.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ If you want more details on using jimmer in a non-spring environment, you can co
```groovy title="build.gradle"
depdencies {
implementation 'org.babyfish.jimmer:jimmer-sql:0.7.67'
annotationProcessor 'org.babyfish.jimmer:jimmer-apt:0.7.67'
implementation 'org.babyfish.jimmer:jimmer-sql:0.7.69'
annotationProcessor 'org.babyfish.jimmer:jimmer-apt:0.7.69'
runtimeOnly 'com.h2database:h2:2.1.212'
}
Expand All @@ -44,7 +44,7 @@ depdencies {
<dependency>
<groupId>org.babyfish.jimmer</groupId>
<artifactId>jimmer-sql</artifactId>
<version>0.7.67</version>
<version>0.7.69</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
Expand All @@ -65,7 +65,7 @@ depdencies {
<path>
<groupId>org.babyfish.jimmer</groupId>
<artifactId>jimmer-apt</artifactId>
<version>0.7.67</version>
<version>0.7.69</version>
</path>
</annotationProcessorPaths>
</configuration>
Expand All @@ -87,10 +87,10 @@ plugins {
depdencies {

// Step2: Add jimmer-sql-kotlin
implementation("org.babyfish.jimmer:jimmer-sql-kotlin:0.7.67")
implementation("org.babyfish.jimmer:jimmer-sql-kotlin:0.7.69")

// Step3: Apply ksp plugin
ksp("org.babyfish.jimmer:jimmer-ksp:0.7.67")
ksp("org.babyfish.jimmer:jimmer-ksp:0.7.69")

runtimeOnly("com.h2database:h2:2.1.212")

Expand All @@ -114,7 +114,7 @@ kotlin {
<dependency>
<groupId>org.babyfish.jimmer</groupId>
<artifactId>jimmer-sql-kotlin</artifactId>
<version>0.7.67</version>
<version>0.7.69</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
Expand Down Expand Up @@ -162,7 +162,7 @@ kotlin {
<dependency>
<groupId>org.babyfish.jimmer</groupId>
<artifactId>jimmer-ksp</artifactId>
<version>0.7.67</version>
<version>0.7.69</version>
</dependency>
</dependencies>
</plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ interface TreeNode {
```groovy title="build.gradle"
dependencies {
implementation 'org.babyfish.jimmer:jimmer-core:0.7.67'
implementation 'org.babyfish.jimmer:jimmer-core:0.7.69'
// highlight-next-line
annotationProcessor 'org.babyfish.jimmer:jimmer-apt:0.7.67'
annotationProcessor 'org.babyfish.jimmer:jimmer-apt:0.7.69'
// This annotation processor generates source code
// for INTERFACEs marked by
// `@org.babyfish.jimmer.Immutable` or
Expand All @@ -84,9 +84,9 @@ plugins {
}
dependencies {

implementation("org.babyfish.jimmer:jimmer-core-kotlin:0.7.67")
implementation("org.babyfish.jimmer:jimmer-core-kotlin:0.7.69")
// highlight-next-line
ksp("org.babyfish.jimmer:jimmer-ksp:0.7.67")
ksp("org.babyfish.jimmer:jimmer-ksp:0.7.69")
// The ksp plugin generates source code
// for INTERFACEs marked by
// `@org.babyfish.jimmer.Immutable` or
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import TabItem from '@theme/TabItem';
```groovy title="build.gradle"
depdencies {
implementation 'org.babyfish.jimmer:jimmer-core:0.7.67'
annotationProcessor 'org.babyfish.jimmer:jimmer-apt:0.7.67'
implementation 'org.babyfish.jimmer:jimmer-core:0.7.69'
annotationProcessor 'org.babyfish.jimmer:jimmer-apt:0.7.69'
runtimeOnly 'com.h2database:h2:2.1.212'
}
Expand All @@ -29,7 +29,7 @@ depdencies {
<dependency>
<groupId>org.babyfish.jimmer</groupId>
<artifactId>jimmer-core</artifactId>
<version>0.7.67</version>
<version>0.7.69</version>
</dependency>
</dependencies>

Expand All @@ -44,7 +44,7 @@ depdencies {
<path>
<groupId>org.babyfish.jimmer</groupId>
<artifactId>jimmer-apt</artifactId>
<version>0.7.67</version>
<version>0.7.69</version>
</path>
</annotationProcessorPaths>
</configuration>
Expand All @@ -66,10 +66,10 @@ plugins {
depdencies {

// 第二步: 添加jimmer-core-kotlin
implementation("org.babyfish.jimmer:jimmer-core-kotlin:0.7.67")
implementation("org.babyfish.jimmer:jimmer-core-kotlin:0.7.69")

// 第三步: 应用ksp插件
ksp("org.babyfish.jimmer:jimmer-ksp:0.7.67")
ksp("org.babyfish.jimmer:jimmer-ksp:0.7.69")

...ommit other dependency...
}
Expand All @@ -91,7 +91,7 @@ kotlin {
<dependency>
<groupId>org.babyfish.jimmer</groupId>
<artifactId>jimmer-core-kotlin</artifactId>
<version>0.7.67</version>
<version>0.7.69</version>
</dependency>

<build>
Expand Down Expand Up @@ -133,7 +133,7 @@ kotlin {
<dependency>
<groupId>org.babyfish.jimmer</groupId>
<artifactId>jimmer-ksp</artifactId>
<version>0.7.67</version>
<version>0.7.69</version>
</dependency>
</dependencies>
</plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ jimmer-sql内容相对较多,后续文章会逐步讲解。本文对其部分
```groovy title="build.gradle"
depdencies {
implementation 'org.babyfish.jimmer:jimmer-sql:0.7.67'
annotationProcessor 'org.babyfish.jimmer:jimmer-apt:0.7.67'
implementation 'org.babyfish.jimmer:jimmer-sql:0.7.69'
annotationProcessor 'org.babyfish.jimmer:jimmer-apt:0.7.69'
runtimeOnly 'com.h2database:h2:2.1.212'
}
Expand All @@ -44,7 +44,7 @@ depdencies {
<dependency>
<groupId>org.babyfish.jimmer</groupId>
<artifactId>jimmer-sql</artifactId>
<version>0.7.67</version>
<version>0.7.69</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
Expand All @@ -65,7 +65,7 @@ depdencies {
<path>
<groupId>org.babyfish.jimmer</groupId>
<artifactId>jimmer-apt</artifactId>
<version>0.7.67</version>
<version>0.7.69</version>
</path>
</annotationProcessorPaths>
</configuration>
Expand All @@ -87,10 +87,10 @@ plugins {
depdencies {

// 第二步: 添加jimmer-sql-kotlin
implementation("org.babyfish.jimmer:jimmer-sql-kotlin:0.7.67")
implementation("org.babyfish.jimmer:jimmer-sql-kotlin:0.7.69")

// 第三步: 应用ksp插件
ksp("org.babyfish.jimmer:jimmer-ksp:0.7.67")
ksp("org.babyfish.jimmer:jimmer-ksp:0.7.69")

runtimeOnly("com.h2database:h2:2.1.212")

Expand All @@ -116,7 +116,7 @@ kotlin {
<dependency>
<groupId>org.babyfish.jimmer</groupId>
<artifactId>jimmer-sql-kotlin</artifactId>
<version>0.7.67</version>
<version>0.7.69</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
Expand Down Expand Up @@ -165,7 +165,7 @@ kotlin {
<dependency>
<groupId>org.babyfish.jimmer</groupId>
<artifactId>jimmer-ksp</artifactId>
<version>0.7.67</version>
<version>0.7.69</version>
</dependency>
</dependencies>
</plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ title: 使用spring boot starter
```groovy title="build.gradle"
depdencies {
implementation 'org.babyfish.jimmer:jimmer-spring-boot-starter-:0.7.67'
annotationProcessor 'org.babyfish.jimmer:jimmer-apt:0.7.67'
implementation 'org.babyfish.jimmer:jimmer-spring-boot-starter-:0.7.69'
annotationProcessor 'org.babyfish.jimmer:jimmer-apt:0.7.69'
runtimeOnly 'com.h2database:h2:2.1.212'
}
Expand All @@ -41,7 +41,7 @@ depdencies {
<dependency>
<groupId>org.babyfish.jimmer</groupId>
<artifactId>jimmer-spring-boot-starter</artifactId>
<version>0.7.67</version>
<version>0.7.69</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
Expand All @@ -62,7 +62,7 @@ depdencies {
<path>
<groupId>org.babyfish.jimmer</groupId>
<artifactId>jimmer-apt</artifactId>
<version>0.7.67</version>
<version>0.7.69</version>
</path>
</annotationProcessorPaths>
</configuration>
Expand All @@ -82,8 +82,8 @@ plugins {
}
depdencies {

implementation("org.babyfish.jimmer:jimmer-spring-boot-starter:0.7.67")
ksp("org.babyfish.jimmer:jimmer-ksp:0.7.67")
implementation("org.babyfish.jimmer:jimmer-spring-boot-starter:0.7.69")
ksp("org.babyfish.jimmer:jimmer-ksp:0.7.69")

runtimeOnly("com.h2database:h2:2.1.212")

Expand All @@ -109,7 +109,7 @@ kotlin {
<dependency>
<groupId>org.babyfish.jimmer</groupId>
<artifactId>jimmer-spring-boot-starter</artifactId>
<version>0.7.67</version>
<version>0.7.69</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
Expand Down Expand Up @@ -158,7 +158,7 @@ kotlin {
<dependency>
<groupId>org.babyfish.jimmer</groupId>
<artifactId>jimmer-ksp</artifactId>
<version>0.7.67</version>
<version>0.7.69</version>
</dependency>
</dependencies>
</plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,13 @@ title: 关联映射
- org.babyfish.jimmer.sql.ManyToMany
- org.babyfish.jimmer.sql.JoinColumn
- org.babyfish.jimmer.sql.JoinTable

:::caution
对于关联而言,实体类型中的基础属性的类型应该是关联对象,而非关联Id。

如果想定义关联Id属性,请

- 先按本目录的文档完成关联映射

- 再按照[IdView](../../advanced/view/id-view)文档添加关联Id属性
:::
Original file line number Diff line number Diff line change
Expand Up @@ -249,4 +249,10 @@ interface Author {
- 一旦指定`@ManyToMany``mappedBy`属性,就不得使用`@JoinTable`

- 和主动方的`@ManyToMany`关联属性一样,从动方的`@ManyToMany`关联必须非null。原因相同
:::
:::

## 如果想为中间表加入业务字段

对于本文所讨论的多对多关联而言,除了两个外建外,中间表不得定义其他业务字段。

如果想在多对多关联中间表中定义更多的其他业务字段,请参见[ManyToManyView](../../advanced/view/many-to-many-view)
2 changes: 1 addition & 1 deletion example/java/jimmer-cloud/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ext {
jimmerVersion = "0.7.67"
jimmerVersion = "0.7.69"
springBootVersion = "2.7.0"
springCloudVersion = "2021.0.6"
}
Expand Down
2 changes: 1 addition & 1 deletion example/java/jimmer-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
}

ext {
jimmerVersion = "0.7.67"
jimmerVersion = "0.7.69"
}

group 'org.babyfish.jimmer.example.core'
Expand Down
Loading

0 comments on commit 7048624

Please sign in to comment.