Skip to content

Commit ded2c44

Browse files
author
synapticloop
committed
fixed sqlite3 tests for windows
1 parent fbddcc1 commit ded2c44

File tree

159 files changed

+23890
-3580
lines changed

Some content is hidden

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

159 files changed

+23890
-3580
lines changed

build.all.sh

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/bash
22

33
./gradlew assemble pTML -b build.gradle
4-
54
./gradlew --no-daemon -b build.h2zero.all.gradle h2zero
65

76

build.cockroach.sh

-5
This file was deleted.

build.gradle

+4-5
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ java {
3535
}
3636

3737
dependencies {
38-
implementation "com.github.synapticloop:templar:1.5.5"
38+
implementation "com.synapticloop:templar:2.0.0"
3939
implementation "org.json:json:20240303"
4040
implementation "com.mchange:c3p0:0.10.0"
4141
implementation "commons-validator:commons-validator:1.8.0"
@@ -45,13 +45,12 @@ dependencies {
4545

4646
compileOnly gradleApi()
4747

48+
// this is for the tests
4849
testImplementation "junit:junit:4.13.2"
4950
testImplementation "org.mockito:mockito-core:5.11.0"
5051
testImplementation "com.github.stefanbirkner:system-rules:1.19.0"
5152

52-
// this is for the tests
5353
testImplementation('com.mchange:c3p0:0.10.0')
54-
testImplementation('com.mchange:mchange-commons-java:0.2.20')
5554
testImplementation('org.xerial:sqlite-jdbc:3.42.0.1')
5655

5756
}
@@ -60,8 +59,8 @@ configurations.all {
6059
resolutionStrategy {
6160
failOnVersionConflict()
6261
force "junit:junit:4.13.2",
63-
"com.mchange:mchange-commons-java:0.2.20",
64-
"commons-logging:commons-logging:1.3.0"
62+
"commons-logging:commons-logging:1.3.0",
63+
"org.json:json:20240303"
6564
}
6665
}
6766

build.h2zero.all.gradle

+5-3
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ repositories {
2727
h2zero {
2828
inFile = [
2929
'src/test/resources/sqlite/sample-include-sqlite3.h2zero',
30-
'src/test/resources/mysql/sample-include-mysql.h2zero'
31-
]
30+
'src/test/resources/mysql/sample-include-mysql.h2zero',
31+
'src/test/resources/cockroach/sample-include-cockroach.h2zero',
32+
'src/test/resources/postgresql/sample-include-postgresql.h2zero'
33+
]
3234
outDir = '.'
33-
verbose = 'false'
35+
verbose = false
3436
}

build.h2zero.cockroach.gradle

-31
This file was deleted.

build.h2zero.mysql.gradle

-31
This file was deleted.

build.h2zero.postgresql.gradle

-31
This file was deleted.

build.h2zero.sqlite3.gradle

-31
This file was deleted.

build.mysql.bat

-4
This file was deleted.

build.mysql.sh

-5
This file was deleted.

build.postgresql.sh

-5
This file was deleted.

build.sqlite.sh

-5
This file was deleted.

build.sqlite3.bat

-4
This file was deleted.

src/main/java/com/synapticloop/h2zero/base/manager/BaseConnectionManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -874,7 +874,7 @@ public static void setMediumblob(PreparedStatement preparedStatement, int parame
874874
*
875875
* @param preparedStatement The prepared statement
876876
* @param parameterIndex the index of the parameter
877-
* @param inputStream the input stream to read from
877+
* @param reader the input stream to read from
878878
*
879879
* @throws SQLException if something went horribly wrong
880880
*/

src/main/java/com/synapticloop/h2zero/extension/Extension.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
import com.synapticloop.h2zero.util.SimpleLogger;
2626
import com.synapticloop.h2zero.util.SimpleLogger.LoggerType;
2727
import com.synapticloop.h2zero.validator.BaseValidator;
28-
import synapticloop.templar.Parser;
29-
import synapticloop.templar.exception.ParseException;
30-
import synapticloop.templar.exception.RenderException;
31-
import synapticloop.templar.utils.TemplarConfiguration;
32-
import synapticloop.templar.utils.TemplarContext;
28+
import com.synapticloop.templar.Parser;
29+
import com.synapticloop.templar.exception.ParseException;
30+
import com.synapticloop.templar.exception.RenderException;
31+
import com.synapticloop.templar.utils.TemplarConfiguration;
32+
import com.synapticloop.templar.utils.TemplarContext;
3333

3434
import java.io.File;
3535
import java.util.HashMap;

0 commit comments

Comments
 (0)