diff --git a/querydsl-docs/src/main/docbook/content/tutorials/sql.xml b/querydsl-docs/src/main/docbook/content/tutorials/sql.xml index 3bc71bf54..ca1ac835b 100644 --- a/querydsl-docs/src/main/docbook/content/tutorials/sql.xml +++ b/querydsl-docs/src/main/docbook/content/tutorials/sql.xml @@ -396,92 +396,6 @@ public class MySQLQuery extends AbstractSQLQuery{ - - - Using DDL commands - - CREATE TABLE commands can be used in fluent form via the CreateTableClause. Here are - some examples : - - - - The factory method for CreateTableClause construction is : - - - - The constructor of CreateTableClause takes the connection, the templates and the table name. - The rest is declared via - column, primaryKey and foreignKey invocations. - - - Here are the corresponding CREATE TABLE clauses as they are executed. - - - - - Using Data manipulation commands diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/NativeSQLSerializer.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/NativeSQLSerializer.java index 81ec89990..6e48de2e5 100644 --- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/NativeSQLSerializer.java +++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/NativeSQLSerializer.java @@ -62,8 +62,10 @@ public final class NativeSQLSerializer extends SQLSerializer{ } } else if (!isAlias(args[i]) && !(args[i] instanceof FactoryExpression)) { // https://github.com/mysema/querydsl/issues/80 - args[i] = ExpressionUtils.as(args[i], "col__"+(i+1)); - modified = true; + if (!args[i].toString().contains("*")) { + args[i] = ExpressionUtils.as(args[i], "col__"+(i+1)); + modified = true; + } } } if (modified) { diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/hibernate/sql/AbstractSQLTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/hibernate/sql/AbstractSQLTest.java index dbda39b18..8de1f1711 100644 --- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/hibernate/sql/AbstractSQLTest.java +++ b/querydsl-jpa/src/test/java/com/mysema/query/jpa/hibernate/sql/AbstractSQLTest.java @@ -36,6 +36,7 @@ import com.mysema.query.sql.SQLTemplates; import com.mysema.query.types.ConstructorExpression; import com.mysema.query.types.Expression; import com.mysema.query.types.SubQueryExpression; +import com.mysema.query.types.expr.Wildcard; public abstract class AbstractSQLTest { @@ -97,6 +98,11 @@ public abstract class AbstractSQLTest { assertEquals(6, query().from(cat).where(cat.dtype.eq("C")).list(cat.id).size()); } + @Test + public void List_Wildcard() { + assertEquals(6l, query().from(cat).where(cat.dtype.eq("C")).list(Wildcard.all).size()); + } + @Test public void List_With_Limit(){ assertEquals(3, query().from(cat).limit(3).list(cat.id).size()); diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/hibernate/sql/H2SQLTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/hibernate/sql/H2SQLTest.java index 4af9d2d2c..af581956a 100644 --- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/hibernate/sql/H2SQLTest.java +++ b/querydsl-jpa/src/test/java/com/mysema/query/jpa/hibernate/sql/H2SQLTest.java @@ -42,6 +42,11 @@ public class H2SQLTest extends AbstractSQLTest{ public void Wildcard(){ // } + + @Test + public void List_Wildcard() { + // + } } diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/sql/AbstractJPASQLTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/sql/AbstractJPASQLTest.java index dd11e29fd..32ab8483d 100644 --- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/sql/AbstractJPASQLTest.java +++ b/querydsl-jpa/src/test/java/com/mysema/query/jpa/sql/AbstractJPASQLTest.java @@ -39,7 +39,7 @@ import com.mysema.query.sql.SQLTemplates; import com.mysema.query.types.ConstructorExpression; import com.mysema.query.types.Expression; import com.mysema.query.types.SubQueryExpression; -import com.mysema.query.types.query.ListSubQuery; +import com.mysema.query.types.expr.Wildcard; public abstract class AbstractJPASQLTest { @@ -100,6 +100,11 @@ public abstract class AbstractJPASQLTest { public void List(){ assertEquals(6, query().from(cat).where(cat.dtype.eq("C")).list(cat.id).size()); } + + @Test + public void List_Wildcard() { + assertEquals(6l, query().from(cat).where(cat.dtype.eq("C")).list(Wildcard.all).size()); + } @Test public void List_Non_Path() { diff --git a/querydsl-jpa/src/test/java/com/mysema/query/jpa/sql/H2JPASQLTest.java b/querydsl-jpa/src/test/java/com/mysema/query/jpa/sql/H2JPASQLTest.java index c4f4eeb3c..e623372cc 100644 --- a/querydsl-jpa/src/test/java/com/mysema/query/jpa/sql/H2JPASQLTest.java +++ b/querydsl-jpa/src/test/java/com/mysema/query/jpa/sql/H2JPASQLTest.java @@ -30,4 +30,9 @@ public class H2JPASQLTest extends AbstractJPASQLTest { // } + + @Test + public void List_Wildcard() { + // + } }