Skip to content

Commit 2257dd5

Browse files
author
Christian Chevalley
committed
merge for CI integration. Fixed bugs and tests
1 parent 17d81b1 commit 2257dd5

File tree

287 files changed

+132696
-1450
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

287 files changed

+132696
-1450
lines changed

‎aql-processor/dependency-reduced-pom.xml‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>ethercis</groupId>
55
<artifactId>aql-processor</artifactId>
6-
<version>1.1.0-SNAPSHOT</version>
6+
<version>1.1.2-SNAPSHOT</version>
77
<build>
88
<plugins>
99
<plugin>
@@ -28,7 +28,14 @@
2828
<artifactId>maven-surefire-plugin</artifactId>
2929
<version>2.19</version>
3030
<configuration>
31-
<skipTests>true</skipTests>
31+
<skipTests>false</skipTests>
32+
<systemPropertyVariables>
33+
<test.db.host>localhost</test.db.host>
34+
<test.db.port>5432</test.db.port>
35+
<test.db.name>ethercis</test.db.name>
36+
<test.db.user>postgres</test.db.user>
37+
<test.db.password>postgres</test.db.password>
38+
</systemPropertyVariables>
3239
</configuration>
3340
</plugin>
3441
<plugin>
@@ -82,6 +89,7 @@
8289
<exclude>xsd/**</exclude>
8390
<exclude>org/openehr/**</exclude>
8491
<exclude>com/fasterxml/**</exclude>
92+
<exclude>openEHR/**</exclude>
8593
</excludes>
8694
</filter>
8795
</filters>
@@ -96,6 +104,8 @@
96104
<exclude>junit:junit</exclude>
97105
<exclude>jmock:*</exclude>
98106
<exclude>*:xml-apis</exclude>
107+
<exclude>org.openehr:*</exclude>
108+
<exclude>openEHR:*</exclude>
99109
<exclude>org.apache.maven:lib:tests</exclude>
100110
</excludes>
101111
</artifactSet>
@@ -147,7 +157,7 @@
147157
<dependency>
148158
<groupId>ethercis</groupId>
149159
<artifactId>ecis-core</artifactId>
150-
<version>1.1.1-SNAPSHOT</version>
160+
<version>1.1.2-SNAPSHOT</version>
151161
<scope>compile</scope>
152162
<exclusions>
153163
<exclusion>
@@ -159,7 +169,7 @@
159169
<dependency>
160170
<groupId>ethercis</groupId>
161171
<artifactId>ecis-knowledge-cache</artifactId>
162-
<version>1.1.0-SNAPSHOT</version>
172+
<version>1.1.2-SNAPSHOT</version>
163173
<scope>compile</scope>
164174
<exclusions>
165175
<exclusion>
@@ -171,7 +181,7 @@
171181
<dependency>
172182
<groupId>ethercis</groupId>
173183
<artifactId>jooq-pg</artifactId>
174-
<version>1.1.0-SNAPSHOT</version>
184+
<version>1.1.2-SNAPSHOT</version>
175185
<scope>compile</scope>
176186
</dependency>
177187
<dependency>
@@ -201,7 +211,7 @@
201211
</plugin>
202212
<plugin>
203213
<artifactId>maven-surefire-report-plugin</artifactId>
204-
<version>2.20.1</version>
214+
<version>2.19.1</version>
205215
</plugin>
206216
</plugins>
207217
</reporting>

‎aql-processor/pom.xml‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<groupId>ethercis</groupId>
2525
<artifactId>aql-processor</artifactId>
26-
<version>1.1.0-SNAPSHOT</version>
26+
<version>1.1.2-SNAPSHOT</version>
2727
<properties>
2828
<maven.compiler.source>1.8</maven.compiler.source>
2929
<maven.compiler.target>1.8</maven.compiler.target>
@@ -61,7 +61,14 @@
6161
<artifactId>maven-surefire-plugin</artifactId>
6262
<version>2.19</version>
6363
<configuration>
64-
<skipTests>true</skipTests>
64+
<skipTests>false</skipTests>
65+
<systemPropertyVariables>
66+
<test.db.host>localhost</test.db.host>
67+
<test.db.port>5432</test.db.port>
68+
<test.db.name>ethercis</test.db.name>
69+
<test.db.user>postgres</test.db.user>
70+
<test.db.password>postgres</test.db.password>
71+
</systemPropertyVariables>
6572
</configuration>
6673
</plugin>
6774
<plugin>
@@ -109,6 +116,7 @@
109116
<exclude>xsd/**</exclude>
110117
<exclude>org/openehr/**</exclude>
111118
<exclude>com/fasterxml/**</exclude>
119+
<exclude>openEHR/**</exclude>
112120
</excludes>
113121
</filter>
114122
</filters>
@@ -124,6 +132,8 @@
124132
<exclude>junit:junit</exclude>
125133
<exclude>jmock:*</exclude>
126134
<exclude>*:xml-apis</exclude>
135+
<exclude>org.openehr:*</exclude>
136+
<exclude>openEHR:*</exclude>
127137
<exclude>org.apache.maven:lib:tests</exclude>
128138
</excludes>
129139
</artifactSet>
@@ -206,17 +216,17 @@
206216
<dependency>
207217
<groupId>ethercis</groupId>
208218
<artifactId>ecis-core</artifactId>
209-
<version>1.1.1-SNAPSHOT</version>
219+
<version>${project.version}</version>
210220
</dependency>
211221
<dependency>
212222
<groupId>ethercis</groupId>
213223
<artifactId>ecis-knowledge-cache</artifactId>
214-
<version>1.1.0-SNAPSHOT</version>
224+
<version>${project.version}</version>
215225
</dependency>
216226
<dependency>
217227
<groupId>ethercis</groupId>
218228
<artifactId>jooq-pg</artifactId>
219-
<version>1.1.0-SNAPSHOT</version>
229+
<version>${project.version}</version>
220230
</dependency>
221231
<dependency>
222232
<groupId>org.jooq</groupId>
@@ -253,7 +263,7 @@
253263
<plugin>
254264
<groupId>org.apache.maven.plugins</groupId>
255265
<artifactId>maven-surefire-report-plugin</artifactId>
256-
<version>2.20.1</version>
266+
<version>2.19.1</version>
257267
</plugin>
258268
</plugins>
259269
</reporting>

‎aql-processor/src/main/java/com/ethercis/aql/sql/QueryProcessor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,9 @@ public Object execute(QueryParser queryParser, String serverNodeId, boolean expl
206206
if (!explain)
207207
if (new Variables(queryParser.getVariables()).hasDefinedDistinct() || new Variables(queryParser.getVariables()).hasDefinedFunction())
208208
result = fetchResultSet(new SuperQuery(context, queryParser.getVariables(), select).select(), result);
209-
else
210-
result = (Result<Record>)select.fetch();
211-
209+
else {
210+
result = (Result<Record>) select.fetch();
211+
}
212212
if (selectBinder.isWholeComposition()){
213213
result = new RawJsonTransform(context).toRawJson(result);
214214
}

0 commit comments

Comments
 (0)