Skip to content

Commit 3bdce32

Browse files
senipssenips
committed
update docs,
1 parent eda5b40 commit 3bdce32

Some content is hidden

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

45 files changed

+342
-281
lines changed

‎.circleci/config.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,24 @@
33
# Check https://circleci.com/docs/2.0/language-java/ for more details
44
#
55
version: 2
6-
executorType: machine
76
jobs:
87
build:
98
docker:
10-
machine:
11-
image: ubuntu-1604:201903-01 # pins image to specific version
9+
- image: circleci/postgres:9.6.2-alpine
10+
environment:
11+
POSTGRES_USER: root
12+
POSTGRES_DB: pgdb
13+
POSTGRES_PASSWORD: password
14+
15+
- image: circleci/openjdk:8-jdk
16+
environment:
17+
POSTGRES_DB_URL: jdbc:postgresql://localhost:5432/
18+
POSTGRES_DB_ADMIN_USERNAME: root
19+
POSTGRES_DB_ADMIN_PASSWORD: password
1220

1321
working_directory: ~/repo
1422

1523
environment:
16-
# Customize the JVM maximum heap limit
1724
MAVEN_OPTS: -Xmx3200m
1825

1926
steps:

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,5 @@ dependency-redu*
3232
*report.html
3333

3434
Archive.zip
35-
mem
35+
mem
36+
.fossa.yml

‎cmd/pom.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33

4-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
5+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
56
<parent>
67
<artifactId>mintleaf</artifactId>
78
<groupId>org.qamatic</groupId>
@@ -30,15 +31,15 @@
3031
<scope>test</scope>
3132
</dependency>
3233

33-
<!--lib distro-->
34+
<!--lib distro-->
3435
<dependency>
3536
<groupId>com.h2database</groupId>
3637
<artifactId>h2</artifactId>
3738
</dependency>
3839

3940
<!--<dependency>-->
40-
<!--<groupId>org.yaml</groupId>-->
41-
<!--<artifactId>snakeyaml</artifactId>-->
41+
<!--<groupId>org.yaml</groupId>-->
42+
<!--<artifactId>snakeyaml</artifactId>-->
4243
<!--</dependency>-->
4344
</dependencies>
4445
<build>
@@ -58,7 +59,8 @@
5859
<configuration>
5960
<minimizeJar>true</minimizeJar>
6061
<transformers>
61-
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
62+
<transformer
63+
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
6264
<manifestEntries>
6365
<Main-Class>org.qamatic.mintleaf.MainCli</Main-Class>
6466
<Build-Number>1.14</Build-Number>

‎cmd/src/main/assembly/distro-assembly.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<assembly
2-
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
32
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
44
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
55
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
66
<id>rel</id>

‎cmd/src/main/assembly/examples/migration/h2/h2-config.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
<type>H2</type>
99
<url>jdbc:h2:file:./target/h2testdb1;mv_store=false;</url>
1010
</database>
11+
<database>
12+
<id>h2testdb</id>
13+
<type>H2</type>
14+
<url>jdbc:h2:file:./target/h2testdb1;mv_store=false;</url>
15+
</database>
1116
<schemaVersions>
1217
<version>
1318
<id>1.0</id>
@@ -17,5 +22,13 @@
1722
</changeSets>
1823
<scriptLocation>changesets/1.0/*.sql</scriptLocation>
1924
</version>
25+
<version>
26+
<id>2.0</id>
27+
<changeSets>
28+
create schema,
29+
load seed data
30+
</changeSets>
31+
<scriptLocation>changesets/1.0/*.sql</scriptLocation>
32+
</version>
2033
</schemaVersions>
2134
</mintleaf>

‎cmd/src/main/assembly/files.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
<component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2"
2-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1+
<component xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2"
33
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2 http://maven.apache.org/xsd/component-1.1.2.xsd">
44
<fileSets>
55

‎core/mem:

-28 KB
Binary file not shown.

‎core/pom.xml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -121,24 +121,10 @@
121121
<version>3.25.2</version>
122122
<scope>test</scope>
123123
</dependency>
124-
<dependency>
125-
<groupId>org.testcontainers</groupId>
126-
<artifactId>postgresql</artifactId>
127-
<scope>test</scope>
128-
</dependency>
129-
<dependency>
130-
<groupId>org.testcontainers</groupId>
131-
<artifactId>oracle-xe</artifactId>
132-
<scope>test</scope>
133-
</dependency>
134-
<dependency>
135-
<groupId>org.testcontainers</groupId>
136-
<artifactId>mysql</artifactId>
137-
<scope>test</scope>
138-
</dependency>
139124
<dependency>
140125
<groupId>org.postgresql</groupId>
141126
<artifactId>postgresql</artifactId>
127+
<scope>test</scope>
142128
</dependency>
143129
</dependencies>
144130

‎core/src/main/java/org/qamatic/mintleaf/Column.java

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040

4141
public class Column {
4242
protected String columnName;
43-
protected String typeName;
4443
protected int dataType;
4544
protected boolean nullable;
4645
protected int columnSize;
@@ -78,13 +77,6 @@ public void setColumnName(String columnName) {
7877
this.columnName = columnName;
7978
}
8079

81-
public String getTypeName() {
82-
return typeName;
83-
}
84-
85-
public void setTypeName(String dataType) {
86-
typeName = dataType;
87-
}
8880

8981
public int getDatatype() {
9082
return dataType;
@@ -98,14 +90,14 @@ public boolean isNullable() {
9890
return nullable;
9991
}
10092

101-
public void setNullable(int nullable) {
102-
this.nullable = nullable == 1;
103-
}
104-
10593
public void setNullable(boolean nullable) {
10694
this.nullable = nullable;
10795
}
10896

97+
public void setNullable(int nullable) {
98+
this.nullable = nullable == 1;
99+
}
100+
109101
public int getColumnSize() {
110102
return columnSize;
111103
}
@@ -159,8 +151,8 @@ public boolean isIgnoreColumn() {
159151
return ignoreColumn;
160152
}
161153

162-
public void setIgnoreForTypeObjectCreation(boolean ignoreForTypeObjectCreation) {
163-
ignoreColumn = ignoreForTypeObjectCreation;
154+
public void setIgnoreColumn(boolean ignore) {
155+
ignoreColumn = ignore;
164156
}
165157

166158
}

‎core/src/main/java/org/qamatic/mintleaf/Mintleaf.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@
3535

3636
package org.qamatic.mintleaf;
3737

38-
import org.qamatic.mintleaf.core.*;
38+
import org.qamatic.mintleaf.core.BasicDatabase;
39+
import org.qamatic.mintleaf.core.FluentJdbc;
40+
import org.qamatic.mintleaf.core.JdbcDriverSource;
3941
import org.qamatic.mintleaf.core.tables.InMemoryTable;
4042
import org.qamatic.mintleaf.core.tables.SqlQueryTable;
4143
import org.qamatic.mintleaf.data.*;

0 commit comments

Comments
 (0)