CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-07-03 21:07:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Syntax usage improvements

Browse Source
This commit is contained in:
Timo Westkämper 2015-03-13 17:57:54 +02:00
parent d23a7ce3ea
commit 2e60cc0f47
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
querydsl-scala/src/main/scala/com/querydsl/scala/sql/ScalaMetaDataSerializer.scala
View File

@ -88,10 +88,10 @@ class ScalaMetaDataSerializer @Inject() (typeMappings: TypeMappings, val namingS
columnMeta.append(".named(\"" + metadata.getName + "\")")
columnMeta.append(".ofType(" + metadata.getJdbcType + ")")
if (metadata.hasSize) {
columnMeta.append(".withSize(" + metadata.getSize() + ")")
columnMeta.append(".withSize(" + metadata.getSize + ")")
}
if (metadata.getDigits > 0) {
columnMeta.append(".withDigits(" + metadata.getDigits() + ")")
columnMeta.append(".withDigits(" + metadata.getDigits + ")")
}
if (!metadata.isNullable) {
columnMeta.append(".notNull()")
@ -102,13 +102,13 @@ class ScalaMetaDataSerializer @Inject() (typeMappings: TypeMappings, val namingS
override def writeAnnotations(model: EntityType, queryType: Type, writer: ScalaWriter) = {
if (model == queryType) {
model.getAnnotations.foreach(writer.annotation(_))
model.getAnnotations.foreach(writer.annotation)
}
}
def serializePrimaryKeys(model: EntityType, writer: CodeWriter, primaryKeys: Collection[PrimaryKeyData]) {
primaryKeys.foreach { pk =>
val fieldName = namingStrategy.getPropertyNameForPrimaryKey(pk.getName(), model)
val fieldName = namingStrategy.getPropertyNameForPrimaryKey(pk.getName, model)
val value = pk.getColumns.map(c => escape(namingStrategy.getPropertyName(c, model)))
.mkString("createPrimaryKey(", ", ", ")")
writer.publicFinal(new ClassType(classOf[PrimaryKey[_]], model), fieldName, value)
@ -126,7 +126,7 @@ class ScalaMetaDataSerializer @Inject() (typeMappings: TypeMappings, val namingS
val value = new StringBuilder(if (inverse) "createInvForeignKey(" else "createForeignKey(")
if (fk.getForeignColumns.size == 1) {
value.append(namingStrategy.getPropertyName(fk.getForeignColumns.get(0), model))
value.append(", \"" + fk.getParentColumns().get(0) + "\"")
value.append(", \"" + fk.getParentColumns.get(0) + "\"")
} else {
val local = fk.getForeignColumns.map(c => escape(namingStrategy.getPropertyName(c, model))).mkString(", ")
val foreign = fk.getParentColumns.map("\"" + _ + "\"").mkString(", ")
@ -134,7 +134,7 @@ class ScalaMetaDataSerializer @Inject() (typeMappings: TypeMappings, val namingS
}
value.append(")")
val t = new ClassType(classOf[ForeignKey[_]], fk.getType)
writer.publicFinal(t, fieldName, value.toString())
writer.publicFinal(t, fieldName, value.toString)
}
}

2
querydsl-scala/src/test/scala/com/querydsl/scala/CaseClassSerializerTest.scala
View File

@ -34,7 +34,7 @@ class CaseClassSerializerTest {
serializer.createCompanionObject = false
typeMappings.register(entityType, new QueryTypeFactoryImpl("Q", "", "").create(entityType))
serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer))
val str = writer.toString()
val str = writer.toString
CompileTestUtils.assertCompileSuccess(str)
}

4
querydsl-scala/src/test/scala/com/querydsl/scala/ScalaEntitySerializerTest.scala
View File

@ -51,7 +51,7 @@ class ScalaEntitySerializerTest {
typeMappings.register(entityType, new QueryTypeFactoryImpl("Q", "", "").create(entityType))
val serializer = new ScalaEntitySerializer(typeMappings)
serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer))
val str = writer.toString()
val str = writer.toString
//System.err.println(str)
assertTrue(str.contains("class QPerson(cl: Class[_ <: Person], md: PathMetadata) " +
"extends EntityPathImpl[Person](cl, md) {"))
@ -67,7 +67,7 @@ class ScalaEntitySerializerTest {
typeMappings.register(entityType, new QueryTypeFactoryImpl("Q", "", "").create(entityType))
val serializer = new ScalaEntitySerializer(typeMappings)
serializer.serialize(entityType, SimpleSerializerConfig.DEFAULT, new ScalaWriter(writer))
val str = writer.toString()
val str = writer.toString
//System.err.println(str);
CompileTestUtils.assertCompileSuccess(str)
}