Skip to content

Commit

Permalink
merge for CI integration. Fixed bugs and tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian Chevalley committed Apr 10, 2018
1 parent 17d81b1 commit 2257dd5
Show file tree
Hide file tree
Showing 287 changed files with 132,696 additions and 1,450 deletions.
22 changes: 16 additions & 6 deletions aql-processor/dependency-reduced-pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ethercis</groupId>
<artifactId>aql-processor</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.2-SNAPSHOT</version>
<build>
<plugins>
<plugin>
Expand All @@ -28,7 +28,14 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19</version>
<configuration>
<skipTests>true</skipTests>
<skipTests>false</skipTests>
<systemPropertyVariables>
<test.db.host>localhost</test.db.host>
<test.db.port>5432</test.db.port>
<test.db.name>ethercis</test.db.name>
<test.db.user>postgres</test.db.user>
<test.db.password>postgres</test.db.password>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -82,6 +89,7 @@
<exclude>xsd/**</exclude>
<exclude>org/openehr/**</exclude>
<exclude>com/fasterxml/**</exclude>
<exclude>openEHR/**</exclude>
</excludes>
</filter>
</filters>
Expand All @@ -96,6 +104,8 @@
<exclude>junit:junit</exclude>
<exclude>jmock:*</exclude>
<exclude>*:xml-apis</exclude>
<exclude>org.openehr:*</exclude>
<exclude>openEHR:*</exclude>
<exclude>org.apache.maven:lib:tests</exclude>
</excludes>
</artifactSet>
Expand Down Expand Up @@ -147,7 +157,7 @@
<dependency>
<groupId>ethercis</groupId>
<artifactId>ecis-core</artifactId>
<version>1.1.1-SNAPSHOT</version>
<version>1.1.2-SNAPSHOT</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Expand All @@ -159,7 +169,7 @@
<dependency>
<groupId>ethercis</groupId>
<artifactId>ecis-knowledge-cache</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.2-SNAPSHOT</version>
<scope>compile</scope>
<exclusions>
<exclusion>
Expand All @@ -171,7 +181,7 @@
<dependency>
<groupId>ethercis</groupId>
<artifactId>jooq-pg</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.2-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -201,7 +211,7 @@
</plugin>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.20.1</version>
<version>2.19.1</version>
</plugin>
</plugins>
</reporting>
Expand Down
22 changes: 16 additions & 6 deletions aql-processor/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

<groupId>ethercis</groupId>
<artifactId>aql-processor</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>1.1.2-SNAPSHOT</version>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
Expand Down Expand Up @@ -61,7 +61,14 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19</version>
<configuration>
<skipTests>true</skipTests>
<skipTests>false</skipTests>
<systemPropertyVariables>
<test.db.host>localhost</test.db.host>
<test.db.port>5432</test.db.port>
<test.db.name>ethercis</test.db.name>
<test.db.user>postgres</test.db.user>
<test.db.password>postgres</test.db.password>
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -109,6 +116,7 @@
<exclude>xsd/**</exclude>
<exclude>org/openehr/**</exclude>
<exclude>com/fasterxml/**</exclude>
<exclude>openEHR/**</exclude>
</excludes>
</filter>
</filters>
Expand All @@ -124,6 +132,8 @@
<exclude>junit:junit</exclude>
<exclude>jmock:*</exclude>
<exclude>*:xml-apis</exclude>
<exclude>org.openehr:*</exclude>
<exclude>openEHR:*</exclude>
<exclude>org.apache.maven:lib:tests</exclude>
</excludes>
</artifactSet>
Expand Down Expand Up @@ -206,17 +216,17 @@
<dependency>
<groupId>ethercis</groupId>
<artifactId>ecis-core</artifactId>
<version>1.1.1-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ethercis</groupId>
<artifactId>ecis-knowledge-cache</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ethercis</groupId>
<artifactId>jooq-pg</artifactId>
<version>1.1.0-SNAPSHOT</version>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jooq</groupId>
Expand Down Expand Up @@ -253,7 +263,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.20.1</version>
<version>2.19.1</version>
</plugin>
</plugins>
</reporting>
Expand Down
6 changes: 3 additions & 3 deletions aql-processor/src/main/java/com/ethercis/aql/sql/QueryProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,9 @@ public Object execute(QueryParser queryParser, String serverNodeId, boolean expl
if (!explain)
if (new Variables(queryParser.getVariables()).hasDefinedDistinct() || new Variables(queryParser.getVariables()).hasDefinedFunction())
result = fetchResultSet(new SuperQuery(context, queryParser.getVariables(), select).select(), result);
else
result = (Result<Record>)select.fetch();

else {
result = (Result<Record>) select.fetch();
}
if (selectBinder.isWholeComposition()){
result = new RawJsonTransform(context).toRawJson(result);
}
Expand Down
Loading

0 comments on commit 2257dd5

Please sign in to comment.