Fix new issues introduced when fixing #934

Author: babyfish-ct

project/gradle.properties

@@ -1,2 +1,2 @@
 group=org.babyfish.jimmer
-version=0.9.58
+version=0.9.59

project/jimmer-core/src/main/java/org/babyfish/jimmer/meta/impl/ImmutablePropImpl.java

@@ -806,7 +806,9 @@ private void resolveManyToManyViewBaseProp() {
                                         deeperProp +
                                         "\" and \"" +
                                         middleProp +
-                                        "\""
+                                        "\", please specify \"deeperProp\" of \"" +
+                                        ManyToManyView.class.getName() +
+                                        "\" explicitly"
                         );
                     }
                     deeperProp = middleProp;

project/jimmer-sql/src/main/java/org/babyfish/jimmer/sql/JSqlClientImpl.java

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.babyfish.jimmer.impl.util.ClassCache;
+import org.babyfish.jimmer.impl.util.Classes;
 import org.babyfish.jimmer.lang.OldChain;
 import org.babyfish.jimmer.meta.*;
 import org.babyfish.jimmer.sql.association.meta.AssociationProp;
@@ -49,6 +50,8 @@
 import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.time.ZoneId;
@@ -1185,13 +1188,19 @@ private void addScalarProviderImpl(ImmutableProp prop, ScalarProvider<?, ?> scal
                                     "please use property-specific scalar provider"
                     );
                 }
-                if (ReaderManager.isStandardScalarType((Class<?>) scalarType)) {
+                if (Classes.primitiveTypeOf((Class<?>) scalarType).isPrimitive() ||
+                        scalarType == String.class ||
+                        scalarType == BigInteger.class ||
+                        scalarType == BigDecimal.class
+                ) {
                     throw new IllegalStateException(
                             "Illegal global type scalar provider type \"" +
                                     scalarProvider.getClass().getName() +
                                     "\" its scalar type argument cannot be \"" +
                                     scalarType +
-                                    "\" because it is standard type. Please " +
+                                    "\" because it is " +
+                                    (scalarType == String.class ? "string" : "numeric") +
+                                    ". Please " +
                                     "use non-standard type or " +
                                     "use property level scalar provider"
                     );

project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/model/link/Course.java

@@ -23,4 +23,10 @@ public interface Course {
     @ManyToManyView(prop = "learningLinks", deeperProp = "student")
     // or @ManyToManyView(prop = "learningLinks")
     List<Student> students();
+
+    @OneToMany(mappedBy = "nextCourse")
+    List<CourseDependency> prevCourseDependencies();
+
+    @ManyToManyView(prop = "prevCourseDependencies", deeperProp = "prevCourse")
+    List<Course> prevCourses();
 }

project/jimmer-sql/src/test/java/org/babyfish/jimmer/sql/model/link/CourseDependency.java

@@ -0,0 +1,21 @@
+package org.babyfish.jimmer.sql.model.link;
+
+import org.babyfish.jimmer.sql.*;
+
+@Entity
+public interface CourseDependency {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    long id();
+
+    @ManyToOne
+    @OnDissociate(DissociateAction.DELETE)
+    Course nextCourse();
+
+    @ManyToOne
+    @OnDissociate(DissociateAction.DELETE)
+    Course prevCourse();
+
+    String reason();
+}

project/jimmer-sql/src/test/resources/database.sql

@@ -31,6 +31,7 @@ drop table worker if exists;
 drop table category if exists;
 drop table post if exists;
 drop table learning_link if exists;
+drop table course_dependency if exists;
 drop table course if exists;
 drop table student if exists;
 drop table ms_product if exists;
@@ -835,6 +836,29 @@ alter table learning_link
     add constraint uq_course
         unique(student_id, course_id);
 
+create table course_dependency(
+    id bigint auto_increment(100) not null,
+    prev_course_id bigint not null,
+    next_course_id bigint not null,
+    reason varchar(50) not null
+);
+alter table course_dependency
+    add constraint pk_course_dependency
+        primary key(id);
+alter table course_dependency
+    add constraint uq_course_dependency
+        unique(prev_course_id, next_course_id);
+alter table course_dependency
+    add constraint fk_course_dependency__prev
+        foreign key(prev_course_id)
+            references course(id)
+                on delete cascade;
+alter table course_dependency
+    add constraint fk_course_dependency__next
+        foreign key(next_course_id)
+            references course(id)
+                on delete cascade;
+
 insert into student(id, name) values(1, 'Oakes');
 insert into student(id, name) values(2, 'Roach');
 insert into course(id, name, academic_credit) values(1, 'Java', 2);
@@ -845,7 +869,9 @@ insert into learning_link(id, student_id, course_id, score) values
     (2, 1, 3, null),
     (3, 2, 3, 87),
     (4, 2, 1, null);
-
+insert into course_dependency(prev_course_id, next_course_id, reason) values
+    (3, 1, 'JDBC requires SQL'),
+    (1, 2, 'Kotlin depends on JVM');