diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f07556b3..a020b36b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,11 @@
 # * Uses site:stage to collect the documentation for multi-module projects.
 # * Publishes the documentation for `master` branch.
 
+
+services:
+  - name: docker:dind
+    command: ["--tls=false"]
+
 variables:
   # This will suppress any download for dependencies and plugins or upload messages which would clutter the console log.
   # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work.
@@ -23,6 +28,12 @@ variables:
   # when running from the command line.
   # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins.
   MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=false -DdeployAtEnd=false"
+  # Instruct Testcontainers to use the daemon of DinD, use port 2735 for non-tls connections.
+  DOCKER_HOST: "tcp://docker:2375"
+  # Instruct Docker not to start over TLS.
+  DOCKER_TLS_CERTDIR: ""
+  # Improve performance with overlayfs.
+  DOCKER_DRIVER: overlay2
 
 # Cache downloaded dependencies and plugins between builds.
 # To keep cache across branches add 'key: "$CI_JOB_NAME"'
@@ -30,7 +41,7 @@ cache:
   paths:
     - .m2/repository
 
-# This will only the project.
+  # This will only the project.
 .build: &build
   stage: build
   script:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b39326f..de5c19aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [2.5.0] - 2023-06-02
+
+### Added
+* Support for relational databases using JDBC.
+* Parameter `parallelism` setting the maximum number of parallel operations.
+* Script `change-version.sh` to update the version of RMLStreamer in required files.
+
+### Fixed
+* Updated Function Agent to v1.1.0
+* Updated GREL Functions to v0.9.1
+* Updated IDLab Functions to v0.2.0
+* Use `<maven.compiler.release>` property in `pom.xml` to set Java version to 11.
+* Allow a relative path (to the working dir) as output directory when writing to file.
+* Fixed bug in extracting namespaces from XML element (internal [issue #161](https://gitlab.ilabt.imec.be/rml/proc/rml-streamer/-/issues/161))
+
 ## [2.4.2] - 2022-10-10
 
 ### Fixed
@@ -214,3 +229,4 @@ can be set with the program argument `--baseIRI`.
 [2.4.0]: https://github.com/RMLio/RMLStreamer/compare/v2.3.0...v2.4.0
 [2.4.1]: https://github.com/RMLio/RMLStreamer/compare/v2.4.0...v2.4.1
 [2.4.2]: https://github.com/RMLio/RMLStreamer/compare/v2.4.1...v2.4.2
+[2.5.0]: https://github.com/RMLio/RMLStreamer/compare/v2.4.2...v2.5.0
diff --git a/README.md b/README.md
index 8d7e32e0..8a530a2f 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,24 @@ If you go to the directory where your data and mappings are,
 you can run something like (change tag to appropriate version):
 
 ```
-$ docker run -v $PWD:/data --rm rmlstreamer:2.4.1 toFile -m /data/mapping.ttl -o /data/output.ttl 
+$ docker run -v $PWD:/data --rm rmlstreamer:v2.5.0 toFile -m /data/mapping.ttl -o /data/output.ttl 
+```
+
+There are more options for the script, if you want to use specific tags or push to Docker Hub:
+```
+$ ./buildDocker.sh -h
+
+Build and push Docker images for RMLStreamer
+
+buildDocker.sh [-h]
+buildDocker.sh [-a][-n][-p][-u <username>][-v <version>]
+options:
+-a   Build for platforms linux/arm64 and linux/amd64. Default: perform a standard 'docker build'
+-h   Print this help and exit.
+-n   Do NOT (re)build RMLStreamer before building the Docker image. This is risky because the Docker build needs a stand-alone version of RMLStreamer.
+-u <username>  Add an username name to the tag name as on Docker Hub, like <username>/rmlstreamer:<version>.
+-p   Push to Docker Hub repo. You must be logged in for this to succeed.
+-v <version>       Override the version in the tag name, like <username>/rmlstreamer:<version>. If not given, use the current version found in pom.xml.
 ```
 
 ### Moderately quick start (Docker - the recommended way)
@@ -98,6 +115,9 @@ The resulting `RMLStreamer-<version>.jar`, found in the `target` folder, can be
 $ mvn clean package -DskipTests -P 'stand-alone'
 ```
 
+**Note**: If you want to update the version of RMLStreamer (e.g. when developing or releasing), run the script
+`change-version.sh <your-new-version>`. It updates the version on relevant places in the repository.
+
 ### Executing RML Mappings
 
 *This section assumes the use of a CLI. If you want to use Flink's web interface, check out
@@ -134,22 +154,26 @@ $FLINK_BIN run <path to RMLStreamer jar> toKafka --broker-list <host:port> --top
 #### Complete RMLStreamer usage:
 
 ```
-Usage: RMLStreamer [toFile|toKafka|toTCPSocket|noOutput] [options]
+Usage: RMLStreamer [toFile|toKafka|toTCPSocket|toMQTT|noOutput] [options]
 
-  -f, --function-descriptions <function description location 1>,<function description location 2>...
-                           An optional list of paths to function description files (in RDF using FnO). A path can be a file location or a URL.
   -j, --job-name <job name>
                            The name to assign to the job on the Flink cluster. Put some semantics in here ;)
   -i, --base-iri <base IRI>
                            The base IRI as defined in the R2RML spec.
   --disable-local-parallel
                            By default input records are spread over the available task slots within a task manager to optimise parallel processing,at the cost of losing the order of the records throughout the process. This option disables this behaviour to guarantee that the output order is the same as the input order.
+  -p, --parallelism <task slots>
+                           Sets the maximum operator parallelism (~nr of task slots used)
   -m, --mapping-file <RML mapping file>
                            REQUIRED. The path to an RML mapping file. The path must be accessible on the Flink cluster.
   --json-ld                Write the output as JSON-LD instead of N-Quads. An object contains all RDF generated from one input record. Note: this is slower than using the default N-Quads format.
   --bulk                   Write all triples generated from one input record at once, instead of writing triples the moment they are generated.
   --checkpoint-interval <time (ms)>
                            If given, Flink's checkpointing is enabled with the given interval. If not given, checkpointing is enabled when writing to a file (this is required to use the flink StreamingFileSink). Otherwise, checkpointing is disabled.
+  --auto-watermark-interval <time (ms)>
+                           If given, Flink's watermarking will be generated periodically with the given interval. If not given, a default value of 50ms will be used.This option is only valid for DataStreams.
+  -f, --function-descriptions <function description location 1>,<function description location 2>...
+                           An optional list of paths to function description files (in RDF using FnO). A path can be a file location or a URL.
 Command: toFile [options]
 Write output to file 
 Note: when the mapping consists only of stream triple maps, a StreamingFileSink is used. This sink will write the output to a part file at every checkpoint.
@@ -166,6 +190,15 @@ Command: toTCPSocket [options]
 Write output to a TCP socket
   -s, --output-socket <host:port>
                            The TCP socket to write to.
+Command: toMQTT [options]
+Write output to an MQTT topic
+  -b, --broker <host:port>
+                           The MQTT broker.
+  -t, --topic <topic name>
+                           The name of the MQTT topic to write output to.
+Command: noOutput
+Do everything, but discard output
+
 ```
 
 #### Examples
@@ -282,6 +315,33 @@ The only option for spreading load is to use multiple topics, and assign one RML
         ] .
         
  ```
+
+##### Generating a stream from a relational database
+RMLStreamer supports relational databases as a logical source. JDBC is used to establish a connection and perform a query against a database. See example mapping below.
+```ttl
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "country_info";
+  ];
+
+  rr:subjectMap [ rr:template "http://example.com/{Country Code}/{Name}" ];
+	
+  rr:predicateObjectMap [ 
+    rr:predicate ex:name ;
+    rr:objectMap [ rml:reference "Name" ]
+  ] .
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
+
+```
  
 #### RML Stream Vocabulary (non-normative)
 
diff --git a/buildDocker.sh b/buildDocker.sh
index 5b19aab9..d874191b 100755
--- a/buildDocker.sh
+++ b/buildDocker.sh
@@ -2,10 +2,88 @@
 
 version=$(grep -F '<version>' pom.xml | head -n 1 | cut -d '>' -f 2 | cut -d '<' -f 1)
 
-### 1. Build RMLStreamer stand-alone
-echo "Building stand-alone RMLStreamer version $version"
-mvn clean package -DskipTests -P 'stand-alone'
+help() {
+	echo "Build and push Docker images for RMLStreamer"
+	echo
+	echo "buildDocker.sh [-h]"
+	echo "buildDocker.sh [-a][-n][-p][-u <username>][-v <version>]"
+	echo "options:"
+	echo "-a   Build for platforms linux/arm64 and linux/amd64. Default: perform a standard 'docker build'"
+	echo "-h   Print this help and exit."
+	echo "-n   Do NOT (re)build RMLStreamer before building the Docker image. This is risky because the Docker build needs a stand-alone version of RMLStreamer."
+	echo "-u <username>  Add an username name to the tag name as on Docker Hub, like <username>/rmlstreamer:<version>."
+	echo "-p   Push to Docker Hub repo. You must be logged in for this to succeed."
+	echo "-v <version>       Override the version in the tag name, like <username>/rmlstreamer:<version>. If not given, use the current version found in pom.xml."
+}
+
+do_not_build=false
+build_for_all=false
+push=false
+
+
+while getopts ahnu:pv: option
+do
+	case "${option}" in
+		a)	# Build for all available OS/arcghitecture of base image
+				build_for_all=true;;
+		h)	# dislplay help
+				help
+				exit;;
+		n)	# Do NOT (re)build RMLStreamer
+				do_not_build=true;;
+		u)	# Override username
+				username=${OPTARG};;
+		p)	# Push to Docker Hub
+				push=true;;
+		v)	# Override version
+				version=${OPTARG};;
+		\?) # Invalid option
+				echo "Error: invalid option"
+				exit;;
+	esac
+done
+
+if [[ -z "$version" ]]
+then
+	version=$(grep -F '<version>' pom.xml | head -n 1 | cut -d '>' -f 2 | cut -d '<' -f 1)
+fi
+
+if [[ -n "$username" ]]
+then
+	username="${username}/"
+fi
+
+tag="${username}rmlstreamer:${version}"
+tag_latest="${username}rmlstreamer:latest"
+echo "tag: $tag"
+
+if ! $do_not_build
+then
+	### 1. Build RMLStreamer stand-alone
+	echo "Building stand-alone RMLStreamer"
+	mvn clean package -DskipTests -P 'stand-alone'
+fi
+
 
 ### 2. Build the docker container
-docker build --tag "rmlstreamer:$version" . && \
-echo "Successfully built rmlstreamer:$version !"
+echo "Building Docker image(s)"
+if $build_for_all
+then
+	platforms="linux/arm64,linux/amd64"
+	if $push
+	then
+		DOCKER_BUILDX_BUILD_ARGS=(--platform $platforms --tag $tag --tag $tag_latest --push .)
+	else
+		DOCKER_BUILDX_BUILD_ARGS=(--platform $platforms --tag $tag --tag $tag_latest .)
+	fi
+	docker buildx create --name rmlstreamerallplatforms --use
+	docker buildx build ${DOCKER_BUILDX_BUILD_ARGS[@]}
+	docker buildx rm rmlstreamerallplatforms
+else
+	docker build --tag $tag --tag $tag_latest .
+	if $push
+	then
+		docker push $tag
+		docker push $tag_latest
+	fi
+fi
diff --git a/change-version.sh b/change-version.sh
new file mode 100755
index 00000000..d169acd6
--- /dev/null
+++ b/change-version.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+VERSION=$1
+
+# exit if no version argument given
+if [ ! "$VERSION" ]
+then
+	echo 'No version given. Exiting'.
+	exit
+fi
+
+echo 'Updating pom.xml'
+sed -i "s:^    <version>\(.*\)</version>:    <version>$VERSION</version>:" pom.xml
+
+echo 'Updating ParameterUtil.scala'
+sed -i "s:head(\"RMLStreamer\", \"\(.*\)\"):head(\"RMLStreamer\", \"$VERSION\"):" src/main/scala/io/rml/framework/core/util/ParameterUtil.scala
+
+echo 'Updating README.md'
+sed -i "s/rmlstreamer:\(2.4.1\) toFile/rmlstreamer:$VERSION toFile/" README.md
diff --git a/pom.xml b/pom.xml
index 59a411a6..5c276f4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ SOFTWARE.
 
     <groupId>io.rml</groupId>
     <artifactId>RMLStreamer</artifactId>
-    <version>2.4.2</version>
+    <version>v2.5.0</version>
     <packaging>jar</packaging>
 
     <name>RMLStreamer</name>
@@ -41,9 +41,10 @@ SOFTWARE.
         <log4j.version>2.17.0</log4j.version>
         <jena.version>4.3.1</jena.version>
         <kafka.version>2.4.1</kafka.version>
-
+        <junit.version>5.9.1</junit.version>
+        <testcontainers.version>1.17.6</testcontainers.version>
         <scala.binary.version>2.11</scala.binary.version>
-        <java.version>11</java.version>
+        <maven.compiler.release>11</maven.compiler.release>
 
         <!-- license properties -->
         <project.inceptionYear>2018</project.inceptionYear>
@@ -387,7 +388,7 @@ SOFTWARE.
         <dependency>
             <groupId>com.github.FnOio</groupId>
             <artifactId>function-agent-java</artifactId>
-            <version>v0.2.1</version>
+            <version>v1.1.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.jena</groupId>
@@ -398,14 +399,66 @@ SOFTWARE.
         <dependency>
             <groupId>com.github.fnoio</groupId>
             <artifactId>grel-functions-java</artifactId>
-            <version>v0.8.2</version>
+            <version>v0.9.1</version>
         </dependency>
         <dependency>
             <groupId>com.github.fnoio</groupId>
             <artifactId>idlab-functions-java</artifactId>
-            <version>v0.1.2</version>
+            <version>v0.2.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.RMLio</groupId>
+            <artifactId>dataio</artifactId>
+            <version>v0.1.1</version>
+        </dependency>
+
+        <!-- Testcontainers dependencies -->
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <version>${testcontainers.version}</version>
+            <scope>test</scope>
         </dependency>
 
+        <!-- containers -->
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${testcontainers.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>jdbc</artifactId>
+            <version>${testcontainers.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- JUnit extension -->
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${testcontainers.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- End of Testcontainers dependencies -->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>42.5.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <!-- This profile helps to make things run stand-alone or in IntelliJ -->
diff --git a/src/main/java/io/rml/framework/flink/util/DummyFunctionAgent.java b/src/main/java/io/rml/framework/flink/util/DummyFunctionAgent.java
index 28e95ad8..11a435c4 100644
--- a/src/main/java/io/rml/framework/flink/util/DummyFunctionAgent.java
+++ b/src/main/java/io/rml/framework/flink/util/DummyFunctionAgent.java
@@ -41,31 +41,11 @@ public Object execute(String functionId, Arguments arguments) throws Exception {
 
 	@Override
 	public Object execute(String s, Arguments arguments, boolean b) throws Exception {
-		return execute(s, arguments, false);
+		return execute(s, arguments);
 	}
 
 	@Override
-	public void executeToFile(String s, Arguments arguments, String s1) throws Exception {
-		// not used
-	}
-
-	@Override
-	public void executeToFile(String s, Arguments arguments, String s1, boolean b) throws Exception {
-		// not used
-	}
-
-	@Override
-	public void writeModel(String s) throws IOException {
-		// not used
-	}
-
-	@Override
-	public String loadFunction(Method method) {
-		return null;
-	}
-
-	@Override
-	public List<String> getParameterPredicates(String s) {
-		return null;
+	public void close() throws Exception {
+		// nothing to close here
 	}
 }
diff --git a/src/main/java/io/rml/framework/util/XMLNamespace.java b/src/main/java/io/rml/framework/util/XMLNamespace.java
new file mode 100644
index 00000000..d8c8379b
--- /dev/null
+++ b/src/main/java/io/rml/framework/util/XMLNamespace.java
@@ -0,0 +1,90 @@
+package io.rml.framework.util;
+
+import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.events.Namespace;
+import javax.xml.stream.events.StartElement;
+import javax.xml.stream.events.XMLEvent;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * MIT License
+ * <p>
+ * Copyright (C) 2017 - 2023 RDF Mapping Language (RML)
+ * <p>
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * <p>
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * <p>
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author Gerald Haesendonck
+ **/
+public class XMLNamespace {
+	final static XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance();
+
+	public static Map<String, String> namespacesOfRootFromFile(final String path) throws IOException, XMLStreamException {
+		try (InputStream in = new BufferedInputStream(new FileInputStream(path))) {
+			return namespacesOfRoot(in);
+		}
+	}
+
+	public static Map<String, String> namespacesOfRoot(final String xmlDoc) throws IOException, XMLStreamException {
+		try (InputStream in = new ByteArrayInputStream(xmlDoc.getBytes(StandardCharsets.UTF_16))) {
+			return namespacesOfRoot(in);
+		}
+	}
+
+	public static Map<String, String> namespacesOfRoot(final InputStream in) throws XMLStreamException {
+		Map<String, String> prefixToIRI = new HashMap<>(2);
+		XMLEventReader reader = null;
+		try {
+			XMLEventReader xmlReader = xmlInputFactory.createXMLEventReader(in);
+			boolean firstElementProcessed = false;
+			while (xmlReader.hasNext()) {
+				XMLEvent event = xmlReader.nextEvent();
+				System.out.println(event.toString());
+				if (event.isStartElement()) { // first is the root
+					if (firstElementProcessed) {
+						// then this is not the first element anymore
+						break;
+					}
+					firstElementProcessed = true;
+
+					// now get namespaces, if any
+					StartElement startElement = event.asStartElement();
+					for (Iterator<Namespace> it = startElement.getNamespaces(); it.hasNext(); ) {
+						Namespace namespace = it.next();
+						prefixToIRI.put(namespace.getPrefix(), namespace.getNamespaceURI());
+					}
+				}
+			}
+		} finally {
+			if (reader != null) {
+				try {
+					reader.close();
+				} catch (XMLStreamException e) {
+					// ignore
+				}
+			}
+		}
+		return prefixToIRI;
+	}
+}
diff --git a/src/main/scala/io/rml/framework/Main.scala b/src/main/scala/io/rml/framework/Main.scala
index c05b41b5..84aa4809 100644
--- a/src/main/scala/io/rml/framework/Main.scala
+++ b/src/main/scala/io/rml/framework/Main.scala
@@ -98,6 +98,11 @@ object Main extends Logging {
     implicit val env = ExecutionEnvironment.getExecutionEnvironment
     implicit val senv = StreamExecutionEnvironment.getExecutionEnvironment
 
+    if (config.parallelism.isDefined) {
+      env.setParallelism(config.parallelism.get)
+      senv.setMaxParallelism(config.parallelism.get)
+    }
+
     // TODO: check FunctionUtils.scala
     FunctionsFlinkUtil.putFunctionFilesInFlinkCache(env.getJavaEnv, senv.getJavaEnv, config.functionDescriptionLocations.getOrElse(Seq.empty): _*)
 
@@ -121,7 +126,8 @@ object Main extends Logging {
 
       // write dataset to file, depending on the given parameters
       if (config.outputSink.equals(OutputSinkOption.File)) {
-        dataset.writeAsText(s"file://${config.outputPath.get}", WriteMode.OVERWRITE)
+        val outputFile = Util.getFile(config.outputPath.get)
+        dataset.writeAsText(outputFile.getCanonicalPath.toString, WriteMode.OVERWRITE)
           .name("Write to output")
       }
 
@@ -294,7 +300,7 @@ object Main extends Logging {
 
 
       //TODO: Be able to choose a specific stream join composer to compose the streaming pipeline
-      val joinConfigMap = JoinConfigMapCache.getOrElse(tm.joinConfigMap.get, JoinConfigMap(None))
+      val joinConfigMap = JoinConfigMapCache.getOrElse(tm.joinConfigMap.orNull, JoinConfigMap(None))
       val composer = StreamJoinComposer(childDataStream, parentDataStream, tm, joinConfigMap)
       // if there are join conditions defined join the child dataset and the parent dataset
       //
@@ -337,7 +343,6 @@ object Main extends Logging {
     // to create a Flink Data Stream there must be triple maps that contain streamed logical sources
     val triplesMaps = streamTriplesMaps
 
-    // group triple maps by logical sourceformattedMapping: FormattedRMLMapping
     val grouped = triplesMaps.groupBy(triplesMap => triplesMap.logicalSource.semanticIdentifier)
 
     // create a map with as key a Source and as value an Engine with loaded statements
@@ -376,7 +381,6 @@ object Main extends Logging {
 
     // union all streams to one final stream
     unionStreams(processedStreams)
-
   }
 
   private def createMixedPipelineFromFormattedMapping(formattedMapping: FormattedRMLMapping)(implicit env: ExecutionEnvironment, senv: StreamExecutionEnvironment, postProcessor: PostProcessor): DataStream[String] = {
diff --git a/src/main/scala/io/rml/framework/core/extractors/std/StdDataSourceExtractor.scala b/src/main/scala/io/rml/framework/core/extractors/std/StdDataSourceExtractor.scala
index 06b754b2..616f8704 100644
--- a/src/main/scala/io/rml/framework/core/extractors/std/StdDataSourceExtractor.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/std/StdDataSourceExtractor.scala
@@ -25,6 +25,7 @@
 
 package io.rml.framework.core.extractors.std
 
+import be.ugent.idlab.knows.dataio.access.DatabaseType
 import io.rml.framework.core.extractors.DataSourceExtractor
 import io.rml.framework.core.extractors.ExtractorUtil.{extractLiteralFromProperty, extractResourceFromProperty, extractSingleLiteralFromProperty, extractSingleResourceFromProperty}
 import io.rml.framework.core.model._
@@ -52,7 +53,6 @@ class StdDataSourceExtractor extends DataSourceExtractor {
       case literal: Literal => FileDataSource(literal) // the literal represents a path uri
       case resource: RDFResource => extractDataSourceFromResource(resource)
     }
-
   }
 
   /**
@@ -72,6 +72,7 @@ class StdDataSourceExtractor extends DataSourceExtractor {
         case Uri(RMLSVoc.Class.KAFKASTREAM) => extractKafkaStream(resource)
         case Uri(WoTVoc.ThingDescription.Class.THING) => extractWoTSource(resource)
         case Uri(CSVWVoc.Class.TABLE) => extractCSVWSource(resource)
+        case Uri(D2RQVoc.Class.DATABASE) => extractDatabaseSource(resource)
         case _ => throw new RMLException(s"${classResource.uri} not supported as data source.")
       }
       case literal: Literal => throw new RMLException(literal.value + ": type must be a resource.")
@@ -160,4 +161,14 @@ class StdDataSourceExtractor extends DataSourceExtractor {
     val dialect = extractSingleResourceFromProperty(resource, CSVWVoc.Property.DIALECT)
     CSVWFileSource(path, CSVWDialect().parse(dialect))
   }
+
+  private def extractDatabaseSource(resource: RDFResource): StreamDataSource = {
+    val jdbcURL = extractSingleLiteralFromProperty(resource, D2RQVoc.Property.JDBC_DSN)
+    val username = extractSingleLiteralFromProperty(resource, D2RQVoc.Property.USERNAME)
+    val password = extractSingleLiteralFromProperty(resource, D2RQVoc.Property.PASSWORD)
+    val driverString = extractSingleLiteralFromProperty(resource, D2RQVoc.Property.JDBC_DRIVER)
+    val dbType = DatabaseType.getDBtype(driverString)
+
+    DatabaseSource(jdbcURL, username, password, dbType)
+  }
 }
diff --git a/src/main/scala/io/rml/framework/core/extractors/std/StdLogicalSourceExtractor.scala b/src/main/scala/io/rml/framework/core/extractors/std/StdLogicalSourceExtractor.scala
index e66c19e2..01b05b08 100644
--- a/src/main/scala/io/rml/framework/core/extractors/std/StdLogicalSourceExtractor.scala
+++ b/src/main/scala/io/rml/framework/core/extractors/std/StdLogicalSourceExtractor.scala
@@ -27,31 +27,29 @@ package io.rml.framework.core.extractors.std
 
 import io.rml.framework.core.extractors.{DataSourceExtractor, ExtractorUtil, LogicalSourceExtractor}
 import io.rml.framework.core.internal.Logging
+import io.rml.framework.core.model._
 import io.rml.framework.core.model.rdf.RDFResource
-import io.rml.framework.core.model.{DataSource, Literal, LogicalSource, Uri}
 import io.rml.framework.core.util.Util.DEFAULT_ITERATOR_MAP
-import io.rml.framework.core.vocabulary.RMLVoc
+import io.rml.framework.core.vocabulary.{QueryVoc, R2RMLVoc, RMLVoc}
 import io.rml.framework.shared.RMLException
 
 /**
-  * Extractor for extracting a logical source from a resource.
-  */
+ * Extractor for extracting a logical source from a resource.
+ */
 class StdLogicalSourceExtractor(dataSourceExtractor: DataSourceExtractor)
   extends LogicalSourceExtractor with Logging {
 
   /**
-    * Extracts logical source from resource.
-    *
-    * @param node Resource to extract logical source from.
-    * @return
-    */
+   * Extracts logical source from resource.
+   *
+   * @param node Resource to extract logical source from.
+   * @return
+   */
   @throws(classOf[RMLException])
   override def extract(node: RDFResource): LogicalSource = {
 
     logDebug(node.uri + ": Extracting logical source.")
-
-    val property = RMLVoc.Property.LOGICALSOURCE
-    val properties = node.listProperties(property)
+    val properties = node.listProperties(RMLVoc.Property.LOGICALSOURCE)
 
     if (properties.size != 1)
       throw new RMLException(node.uri + ": invalid amount of logical sources (amount=" + properties.size + ", should be 1 only).")
@@ -65,57 +63,84 @@ class StdLogicalSourceExtractor(dataSourceExtractor: DataSourceExtractor)
   }
 
   /**
-    * Extracts all properties from a logical source resource.
-    *
-    * @param resource Resource that represents a logical source.
-    * @return An instance of LogicalSource.
-    */
+   * Extracts all properties from a logical source resource.
+   *
+   * @param resource Resource that represents a logical source.
+   * @return An instance of LogicalSource.
+   */
   @throws(classOf[RMLException])
   private def extractLogicalSourceProperties(resource: RDFResource): LogicalSource = {
 
     val source: DataSource = extractDataSource(resource)
-    val referenceFormulation: Uri = extractReferenceFormulation(resource)
-    val iterator: String = extractIterator(resource, referenceFormulation)
-
-    // debug log, check for performance
-    if (isDebugEnabled) {
-      logDebug(resource.uri + ": Extracted from logical source" +
-        ": iterator -> " + iterator +
-        ", source -> " + source +
-        ", referenceFormulation -> " + referenceFormulation)
+
+    source match {
+      case source1: DatabaseSource =>
+        extractDatabase(resource, source1)
+      case _ =>
+        val referenceFormulation = extractReferenceFormulation(resource)
+
+        val iterator: String = extractIterator(resource, referenceFormulation)
+
+        // debug log, check for performance
+        if (isDebugEnabled) {
+          logDebug(resource.uri + ": Extracted from logical source" +
+            ": iterator -> " + iterator +
+            ", source -> " + source +
+            ", referenceFormulation -> " + referenceFormulation)
+        }
+
+        LogicalSource(referenceFormulation, List(iterator), source)
+    }
+  }
+
+  private def extractDatabase(resource: RDFResource, dbSource: DatabaseSource): LogicalSource = {
+    logDebug("Extracting database")
+    val queryProps = resource.listProperties(RMLVoc.Property.QUERY)
+
+    val query = {
+      if (queryProps.isEmpty) { // no query specified, define it based on the logicalSource's properties
+        val tableName = resource.listProperties(R2RMLVoc.Property.TABLE_NAME)
+        if (tableName.isEmpty) {
+          throw new Error("Either rml:query or rr:tableName must be provided in the logical source!")
+        }
+        s"SELECT * FROM ${tableName.head.value}"
+      } else {
+        queryProps.head.value
+      }
     }
 
-    LogicalSource(referenceFormulation, List(iterator), source)
+    dbSource.query = query
 
+    LogicalSource(Uri(QueryVoc.Class.CSV), List(""), dbSource)
   }
 
   /**
-    * Extracts iterator from a logical source resource.
-    *
-    * @param resource Resource that represents a logical source.
-    * @return Optionally a literal that represents the iterator.
-    */
+   * Extracts iterator from a logical source resource.
+   *
+   * @param resource Resource that represents a logical source.
+   * @return Optionally a literal that represents the iterator.
+   */
   @throws(classOf[RMLException])
   private def extractIterator(resource: RDFResource, referenceFormulation: Uri): String = {
     ExtractorUtil.extractLiteralFromProperty(resource, RMLVoc.Property.ITERATOR, DEFAULT_ITERATOR_MAP(referenceFormulation.value))
   }
 
   /**
-    * Extracts data source from a logical source resource.
-    *
-    * @param resource Resource that represents a logical source.
-    * @return An instance of a DataSource
-    */
+   * Extracts data source from a logical source resource.
+   *
+   * @param resource Resource that represents a logical source.
+   * @return An instance of a DataSource
+   */
   private def extractDataSource(resource: RDFResource): DataSource = {
     dataSourceExtractor.extract(resource)
   }
 
   /**
-    * Extracts reference formulation from a logical source resource.
-    *
-    * @param resource Resource that represents a logical source.
-    * @return A literal that represents the reference formulation.
-    */
+   * Extracts reference formulation from a logical source resource.
+   *
+   * @param resource Resource that represents a logical source.
+   * @return A literal that represents the reference formulation.
+   */
   @throws(classOf[RMLException])
   private def extractReferenceFormulation(resource: RDFResource): Uri = {
     val referenceFormulationResource = ExtractorUtil.extractSingleResourceFromProperty(resource, RMLVoc.Property.REFERENCEFORMULATION)
diff --git a/src/main/scala/io/rml/framework/core/function/FunctionUtils.scala b/src/main/scala/io/rml/framework/core/function/FunctionUtils.scala
index 20ed53a9..d66cb6da 100644
--- a/src/main/scala/io/rml/framework/core/function/FunctionUtils.scala
+++ b/src/main/scala/io/rml/framework/core/function/FunctionUtils.scala
@@ -7,13 +7,14 @@ import io.rml.framework.core.vocabulary.{RDFVoc, XsdVoc}
 import io.rml.framework.shared.RMLException
 
 import java.time.Instant
+import java.util.Date
 
 object FunctionUtils extends Logging {
 
   def typeCastDataType(output: Entity, dataType: Option[Uri]): Option[Entity] = {
     if(dataType.isDefined){
       val typeClass = getTypeClass(dataType.get)
-      val castedValue = Parameter(typeClass, output.toString).getValue
+      val castedValue = Parameter(typeClass, output.value).getValue
 
       castedValue.map(e => Literal(e.toString))
     }else{
@@ -35,6 +36,7 @@ object FunctionUtils extends Logging {
       case Uri(RDFVoc.Type.RDF_LIST) => classOf[List[_]]
       case Uri(XsdVoc.Type.XSD_ANY) => classOf[Any]
       case Uri(RDFVoc.Type.RDF_OBJECT) => classOf[Any]
+      case Uri(XsdVoc.Type.XSD_DATE) => classOf[Date]
       case _ => throw new RMLException(s"Type ${uri.value} not supported for parameter")
     }
   }
diff --git a/src/main/scala/io/rml/framework/core/function/model/Parameter.scala b/src/main/scala/io/rml/framework/core/function/model/Parameter.scala
index cc199fbd..e5360236 100644
--- a/src/main/scala/io/rml/framework/core/function/model/Parameter.scala
+++ b/src/main/scala/io/rml/framework/core/function/model/Parameter.scala
@@ -2,7 +2,9 @@ package io.rml.framework.core.function.model
 
 import io.rml.framework.core.model.{Node, Uri}
 
+import java.text.{DecimalFormat, NumberFormat}
 import java.time.Instant
+import java.util.{Date, Locale}
 import scala.util.parsing.json.JSON
 
 /**
@@ -56,21 +58,22 @@ abstract class Parameter extends Node {
     val BooleanString = classOf[Boolean].getName
     val LongString = classOf[Long].getName
     val InstantString = classOf[Instant].getName
+    val DateString = classOf[Date].getName
 
-    if(paramType== null)
+    if (paramType == null)
       throw new NullPointerException("parameter type is null..")
-    else{
+    else {
       paramType.getName match {
-        case BooleanString |"boolean" => Some(paraValue)
+        case BooleanString | "boolean" => Some(formatBoolean(paraValue.toString))
         case ScalaString | "java.lang.String" => Some(paraValue.toString)
         case IntegerString | "int" => Some(paraValue.toString.toInt)
-        case DoubleString | "double" => Some(paraValue.toString.toDouble)
+        case DoubleString | "double" => Some(formatToScientific(paraValue.toString.toDouble))
         case LongString | "long" => Some(paraValue.toString.toLong)
-        case InstantString => Some(Instant.parse(paraValue.toString))
-        case ObjectString|"java.lang.Object" => Some(paraValue)
-
+        case InstantString => Some(paraValue.toString.replace(" ", "T"))
+//        case InstantString => Some(Instant.parse(paraValue.toString))
+        case ObjectString | "java.lang.Object" => Some(paraValue)
+        case DateString => Some(paraValue)
         case ListString | ArrayString | "java.util.List" =>
-
           val parsedListEither = JSON.parseFull(paraValue.toString).toRight("Value can't be parsed as List")
 
           parsedListEither match {
@@ -83,7 +86,7 @@ abstract class Parameter extends Node {
               }
 
 
-        case Left(exMessage) => throw new IllegalArgumentException(exMessage)
+            case Left(exMessage) => throw new IllegalArgumentException(exMessage)
           }
         case _ => throw new Error(s"Couldn't derive type: ${paramType.getName}")
 
@@ -91,8 +94,38 @@ abstract class Parameter extends Node {
     }
   }
 
+  /**
+   * Formats the decimal to scientific notation
+   * Taken from RMLMapper: be.ugent.rml.Utils
+   *
+   * @param double double to be cast
+   * @return scientific notation of the double
+   */
+  private def formatToScientific(double: Double): String = {
+    val input = BigDecimal.valueOf(double).bigDecimal.stripTrailingZeros()
+    val precision =
+      if (input.scale() < 0)
+        input.precision() - input.scale()
+      else
+        input.precision()
+
+    val sb = new StringBuilder("0.0")
+    for (_ <- 2 to precision) {
+      sb.append("#")
+    }
+    sb.append("E0")
+    val decimalFormat = NumberFormat.getNumberInstance(Locale.US).asInstanceOf[DecimalFormat]
+    decimalFormat.applyPattern(sb.toString())
 
+    decimalFormat.format(double)
+  }
 
+  private def formatBoolean(bool: String): String = {
+    bool match {
+      case "t" | "true" | "TRUE" | "1" => "true"
+      case _ => "false"
+    }
+  }
 
 
 }
@@ -115,8 +148,8 @@ object Parameter {
     DefinedParameter(paramType, paramUri, Some(paraValue), position)
   }
 
-  def apply(paramType:Class[_], paraValue:String): Parameter ={
-    DefinedParameter(paramType, Uri(""),Some(paraValue), 0)
+  def apply(paramType: Class[_], paraValue: String): Parameter = {
+    DefinedParameter(paramType, Uri(""), Some(paraValue), 0)
   }
 
 
diff --git a/src/main/scala/io/rml/framework/core/item/EmptyItem.scala b/src/main/scala/io/rml/framework/core/item/EmptyItem.scala
index c0ec7da8..4150c107 100644
--- a/src/main/scala/io/rml/framework/core/item/EmptyItem.scala
+++ b/src/main/scala/io/rml/framework/core/item/EmptyItem.scala
@@ -28,4 +28,6 @@ class EmptyItem() extends Item {
   override def refer(reference: String): Option[List[String]] = None
 
   override def tag = ""
+
+  override def getDataTypes: Map[String, String] = Map.empty
 }
diff --git a/src/main/scala/io/rml/framework/core/item/Item.scala b/src/main/scala/io/rml/framework/core/item/Item.scala
index 828cd34f..793f335b 100644
--- a/src/main/scala/io/rml/framework/core/item/Item.scala
+++ b/src/main/scala/io/rml/framework/core/item/Item.scala
@@ -39,4 +39,5 @@ trait Item extends Serializable {
 
   def tag: String
 
+  def getDataTypes: Map[String, String]
 }
diff --git a/src/main/scala/io/rml/framework/core/item/JoinedItem.scala b/src/main/scala/io/rml/framework/core/item/JoinedItem.scala
index 1ca0a029..09cc4296 100644
--- a/src/main/scala/io/rml/framework/core/item/JoinedItem.scala
+++ b/src/main/scala/io/rml/framework/core/item/JoinedItem.scala
@@ -30,4 +30,6 @@ case class JoinedItem(child: Item, parent: Item) extends  Item {
   }
 
   override def tag: String = ""
+
+  override def getDataTypes: Map[String, String] = Map.empty
 }
diff --git a/src/main/scala/io/rml/framework/core/item/csv/CSVItem.scala b/src/main/scala/io/rml/framework/core/item/csv/CSVItem.scala
index 0c8b2140..6f6021ed 100644
--- a/src/main/scala/io/rml/framework/core/item/csv/CSVItem.scala
+++ b/src/main/scala/io/rml/framework/core/item/csv/CSVItem.scala
@@ -36,7 +36,7 @@ import scala.collection.JavaConverters._
  *
  * @param record
  */
-class CSVItem(record: Map[String, String], val tag: String) extends Item {
+class CSVItem(record: Map[String, String], val tag: String, dataTypes: Map[String, String]) extends Item {
 
   /**
    *
@@ -57,6 +57,7 @@ class CSVItem(record: Map[String, String], val tag: String) extends Item {
     }
   }
 
+  override def getDataTypes: Map[String, String] = dataTypes
 }
 
 
@@ -65,7 +66,7 @@ object CSVItem extends Logging {
 
   def apply(record: CSVRecord): CSVItem = {
     val recordMap = record.toMap
-    new CSVItem(recordMap.asScala.toMap, "")
+    new CSVItem(recordMap.asScala.toMap, "", Map.empty)
   }
 
   def fromDataBatch(dataBatch: String, csvFormat: CSVFormat): List[Item] = {
@@ -74,7 +75,7 @@ object CSVItem extends Logging {
     val sanitizedData = dataBatch.replaceAll("^\\s+", "").replace("\n\n", "")
     val parser = csvFormat.parse(new StringReader(sanitizedData))
     val result: List[Item] = parser.getRecords.asScala.toList.map(record =>
-      new CSVItem(record.toMap.asScala.toMap, "")
+      new CSVItem(record.toMap.asScala.toMap, "", Map.empty)
     )
     result
   }
diff --git a/src/main/scala/io/rml/framework/core/item/json/JSONItem.scala b/src/main/scala/io/rml/framework/core/item/json/JSONItem.scala
index 7f36a9bd..45c4a411 100644
--- a/src/main/scala/io/rml/framework/core/item/json/JSONItem.scala
+++ b/src/main/scala/io/rml/framework/core/item/json/JSONItem.scala
@@ -66,6 +66,8 @@ class JSONItem(map: java.util.Map[String, Object], val tag: String) extends Item
         None
     }
   }
+
+  override def getDataTypes: Map[String, String] = Map.empty
 }
 
 object JSONItem extends Logging {
diff --git a/src/main/scala/io/rml/framework/core/item/xml/XMLItem.scala b/src/main/scala/io/rml/framework/core/item/xml/XMLItem.scala
index 25f25edf..ec7aa24c 100644
--- a/src/main/scala/io/rml/framework/core/item/xml/XMLItem.scala
+++ b/src/main/scala/io/rml/framework/core/item/xml/XMLItem.scala
@@ -29,16 +29,16 @@ import com.ximpleware.extended.{AutoPilotHuge, VTDGenHuge, XMLBuffer}
 import io.rml.framework.core.internal.Logging
 import io.rml.framework.core.item.Item
 import io.rml.framework.core.util.Util.DEFAULT_ITERATOR_MAP
-import io.rml.framework.core.util.XMLNamespace
 import io.rml.framework.core.vocabulary.QueryVoc
+import io.rml.framework.util.XMLNamespace
 import org.apache.commons.io.IOUtils
 import org.w3c.dom.{Document, NodeList}
 
-import java.io.{ByteArrayInputStream, InputStreamReader}
 import java.nio.charset.StandardCharsets
 import javax.xml.namespace.NamespaceContext
 import javax.xml.parsers.DocumentBuilderFactory
 import javax.xml.xpath.{XPathConstants, XPathFactory}
+import scala.collection.JavaConverters._
 import scala.util.control.NonFatal
 
 class XMLItem(xml: Document, namespaces: Map[String, String], val tag: String) extends Item {
@@ -80,22 +80,12 @@ class XMLItem(xml: Document, namespaces: Map[String, String], val tag: String) e
 
   override def toString: String = XMLItem.documentToString(xml)
 
+  override def getDataTypes: Map[String, String] = Map.empty
 }
 
 object XMLItem extends Logging {
   private val DEFAULT_PATH_OPTION: String = DEFAULT_ITERATOR_MAP(QueryVoc.Class.XPATH)
 
-  def getNSpacesFromString(xml: String): Map[String, String] = {
-    val inputStream = new ByteArrayInputStream(xml.getBytes(StandardCharsets.UTF_8))
-    val reader = new InputStreamReader(inputStream)
-    try {
-      val namespace = XMLNamespace.fromStreamReader(reader)
-      namespace.map(tuple => tuple._1 -> tuple._2).toMap
-    } finally {
-      if (reader != null) reader.close()
-    }
-  }
-
   // Since this is being used in other working parts of the code, it won't be refactored for now 20/7/18
   def fromString(xml: String, namespaces: Map[String, String] = Map(), xpath:String): XMLItem = {
     val documentBuilderFactory = DocumentBuilderFactory.newInstance()
@@ -127,7 +117,7 @@ object XMLItem extends Logging {
   def fromStringOptionable(orgXml: String, iterators: Iterable[String]): List[Item] = {
     try {
 
-      val namespaces = getNSpacesFromString(orgXml)
+      val namespaces = XMLNamespace.namespacesOfRoot(orgXml).asScala.toMap
       val xml = orgXml
       val vg = new VTDGenHuge
 
diff --git a/src/main/scala/io/rml/framework/core/model/DataSource.scala b/src/main/scala/io/rml/framework/core/model/DataSource.scala
index 0cfcce0c..78a7f311 100644
--- a/src/main/scala/io/rml/framework/core/model/DataSource.scala
+++ b/src/main/scala/io/rml/framework/core/model/DataSource.scala
@@ -30,8 +30,7 @@ package io.rml.framework.core.model
   * Info: ...
   *
   * Marker trait for Data sources.
-  * The value representing the location/identity of the data source can only be
-  * of type literal or uri.
+  * The value representing the location/identity of the data source can only be of type Literal or Uri.
   *
   *
   */
diff --git a/src/main/scala/io/rml/framework/core/model/DatabaseSource.scala b/src/main/scala/io/rml/framework/core/model/DatabaseSource.scala
new file mode 100644
index 00000000..e2b9e3f9
--- /dev/null
+++ b/src/main/scala/io/rml/framework/core/model/DatabaseSource.scala
@@ -0,0 +1,20 @@
+package io.rml.framework.core.model
+
+import be.ugent.idlab.knows.dataio.access.DatabaseType
+
+/**
+ * A database source using JDBC.
+ *
+ * @param jdbcURL  URL to reach the database
+ * @param username username to use when accessing the database
+ * @param password password corresponding to the username
+ * @param dbType   type of database being used, characterized by the driver URL
+ * @param query    query to execute against the database
+ */
+case class DatabaseSource(var jdbcURL: String, username: String, password: String, dbType: DatabaseType, var query: String = "") extends StreamDataSource {
+  override def uri: ExplicitNode = Uri(jdbcURL)
+
+  def setURL(url: String): Unit = {
+    this.jdbcURL = url
+  }
+}
diff --git a/src/main/scala/io/rml/framework/core/model/Literal.scala b/src/main/scala/io/rml/framework/core/model/Literal.scala
index 62e9638a..f271aea8 100644
--- a/src/main/scala/io/rml/framework/core/model/Literal.scala
+++ b/src/main/scala/io/rml/framework/core/model/Literal.scala
@@ -33,19 +33,19 @@ import io.rml.framework.core.model.std.StdLiteral
 trait Literal extends Entity  with ExplicitNode{
 
   /**
-    *
+    * Value of the literal
     * @return
     */
   def value: String
 
   /**
-    *
+    * Type of the value
     * @return
     */
   def `type`: Option[Uri]
 
   /**
-    *
+    * Language the value is in (only really applicable for Strings)
     * @return
     */
   def language: Option[Literal]
diff --git a/src/main/scala/io/rml/framework/core/model/LogicalSource.scala b/src/main/scala/io/rml/framework/core/model/LogicalSource.scala
index a54ec0cb..c7a13335 100644
--- a/src/main/scala/io/rml/framework/core/model/LogicalSource.scala
+++ b/src/main/scala/io/rml/framework/core/model/LogicalSource.scala
@@ -25,31 +25,31 @@
 
 package io.rml.framework.core.model
 
-import java.util.Objects
-
 import io.rml.framework.core.model.std.StdLogicalSource
 
+import java.util.Objects
+
 /**
-  * Info : ...
-  */
+ * Node describing a Logical Source in a TriplesMap.
+ */
 trait LogicalSource extends Node {
 
   /**
-    *
-    * @return
-    */
+   * A list of iterators used when consuming the Logical Source.
+   *
+   * @return
+   */
   def iterators: List[String]
 
   /**
-    *
-    * @return
-    */
+   * Instance of DataSource representing the location of data to be consumed
+   */
   def source: DataSource
 
   /**
-    *
-    * @return
-    */
+   * Format the data is in.
+   *
+   */
   def referenceFormulation: Uri
 
 
@@ -64,12 +64,20 @@ trait LogicalSource extends Node {
   }
 
   /**
-    * Logical sources are "semantically" the same if their source identifier and their referenceFormulation are
-    * the same. This is used for grouping the sources, regardless of the iterators
-    * @return
-    */
+   * Logical sources are "semantically" the same if their source identifier and their referenceFormulation are
+   * the same. This is used for grouping the sources, regardless of the iterators
+   *
+   * @return
+   */
   def semanticIdentifier: String = {
-    Objects.hash(source.identifier, referenceFormulation.identifier).toHexString
+    source match {
+      case dbSource: DatabaseSource =>
+        // Database source is a special case since there can be multiple tables
+        // in one source.
+        Objects.hash(source.identifier, referenceFormulation.identifier, dbSource.query).toHexString
+      case _ =>
+        Objects.hash(source.identifier, referenceFormulation.identifier).toHexString
+    }
   }
 
 }
@@ -88,7 +96,5 @@ object LogicalSource {
       referenceFormulation,
       iterators,
       source)
-
   }
-
 }
diff --git a/src/main/scala/io/rml/framework/core/model/StreamDataSource.scala b/src/main/scala/io/rml/framework/core/model/StreamDataSource.scala
index 9ac8fbca..3cfb595f 100644
--- a/src/main/scala/io/rml/framework/core/model/StreamDataSource.scala
+++ b/src/main/scala/io/rml/framework/core/model/StreamDataSource.scala
@@ -25,4 +25,7 @@
 
 package io.rml.framework.core.model
 
+/**
+ * Marker trait for representing DataSources that are to be consumed as a stream, i.e. should not be fully loaded into memory before consumption.
+ */
 trait StreamDataSource extends DataSource
\ No newline at end of file
diff --git a/src/main/scala/io/rml/framework/core/util/ParameterUtil.scala b/src/main/scala/io/rml/framework/core/util/ParameterUtil.scala
index 4e4f2e18..c836fe31 100644
--- a/src/main/scala/io/rml/framework/core/util/ParameterUtil.scala
+++ b/src/main/scala/io/rml/framework/core/util/ParameterUtil.scala
@@ -34,6 +34,7 @@ object ParameterUtil {
                               jobName: String = "RMLStreamer",
                               baseIRI: Option[String] = None,
                               localParallel: Boolean = true,
+                              parallelism: Option[Int] = None,
                               postProcessor: PostProcessorOption = PostProcessorOption.None,
                               checkpointInterval: Option[Long] = None,
                               outputPath: Option[String] = None,
@@ -52,9 +53,10 @@ object ParameterUtil {
         s"Job name: ${jobName}\n" +
         s"Base IRI: ${baseIRI.getOrElse("/")}\n" +
         s"Parallelise over local task slots: ${localParallel}\n" +
+        s"Maximum parallelism: ${parallelism}\n" +
         s"Post processor: ${postProcessor}\n" +
         s"Checkpoint interval: ${checkpointInterval.getOrElse("/")}\n" +
-          s"Auto Watermark interval: ${autoWatermarkInterval}\n" +
+        s"Auto Watermark interval: ${autoWatermarkInterval}\n" +
         s"Output method: ${outputSink}\n" +
         s"Output file: ${outputPath.getOrElse("/")}\n" +
         s"Kafka broker list: ${brokerList.getOrElse("/")}\n" +
@@ -83,7 +85,7 @@ object ParameterUtil {
   val parser = new scopt.OptionParser[ParameterConfig]("RMLStreamer") {
     override def showUsageOnError = Some(true)
 
-    head("RMLStreamer", "2.1.0-SNAPSHOT")
+    head("RMLStreamer", "v2.5.0")
 
     opt[String]('j', "job-name").valueName("<job name>")
       .optional()
@@ -102,6 +104,11 @@ object ParameterUtil {
         "at the cost of losing the order of the records throughout the process." +
         " This option disables this behaviour to guarantee that the output order is the same as the input order.")
 
+    opt[Int]('p', "parallelism").valueName("<task slots>")
+      .optional()
+      .action((value, config) => config.copy(parallelism = Some(value)))
+      .text("Sets the maximum operator parallelism (~nr of task slots used)")
+
     opt[String]('m', "mapping-file").valueName("<RML mapping file>").required()
       .action((value, config) => config.copy(mappingFilePath = value))
       .text("REQUIRED. The path to an RML mapping file. The path must be accessible on the Flink cluster.")
diff --git a/src/main/scala/io/rml/framework/core/util/XMLNamespace.scala b/src/main/scala/io/rml/framework/core/util/XMLNamespace.scala
deleted file mode 100644
index 20af167a..00000000
--- a/src/main/scala/io/rml/framework/core/util/XMLNamespace.scala
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
-  * MIT License
-  *
-  * Copyright (C) 2017 - 2020 RDF Mapping Language (RML)
-  *
-  * Permission is hereby granted, free of charge, to any person obtaining a copy
-  * of this software and associated documentation files (the "Software"), to deal
-  * in the Software without restriction, including without limitation the rights
-  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  * copies of the Software, and to permit persons to whom the Software is
-  * furnished to do so, subject to the following conditions:
-  *
-  * The above copyright notice and this permission notice shall be included in
-  * all copies or substantial portions of the Software.
-  *
-  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  * THE SOFTWARE.
-  *
-  **/
-package io.rml.framework.core.util
-
-import java.io.{File, FileInputStream, InputStreamReader}
-
-object XMLNamespace {
-
-  def fromFile(path: String): List[(String, String)] = {
-    val file = new File(path)
-
-    val in = new FileInputStream(file)
-    val reader = new InputStreamReader(in)
-    try {
-       fromStreamReader(reader)
-    } finally {
-      if (in != null) in.close()
-      if (reader != null) reader.close()
-    }
-  }
-
-  def fromStreamReader(reader: InputStreamReader): List[(String, String)] = {
-    var bracketCounter = 0
-
-    var buffer = ""
-    var c = 0
-    while ( {
-      c != -1 && bracketCounter != 2
-    }) {
-      val char = reader.read().asInstanceOf[Char]
-      buffer += char
-      if (char == '>') bracketCounter += 1
-    }
-
-
-    val namespaceRegex = "xmlns:(.*)=\"([^\"]*\")".r
-    val namespaceKeyRegex = "xmlns:(.*)=".r
-    val namespaceValueRegex = "\"([^\"]*)\"".r
-    val namespaceMap = namespaceRegex.findAllIn(buffer).map(item => {
-      val keys = namespaceKeyRegex.findAllIn(item).matchData map {
-        m => m.group(1)
-      }
-      val values = namespaceValueRegex.findAllIn(item).matchData map {
-        m => m.group(1)
-      }
-      (keys.toList.head, values.toList.head)
-    }).toList
-
-    namespaceMap
-  }
-}
diff --git a/src/main/scala/io/rml/framework/core/vocabulary/D2RQVoc.scala b/src/main/scala/io/rml/framework/core/vocabulary/D2RQVoc.scala
new file mode 100644
index 00000000..fc3b0fa8
--- /dev/null
+++ b/src/main/scala/io/rml/framework/core/vocabulary/D2RQVoc.scala
@@ -0,0 +1,18 @@
+package io.rml.framework.core.vocabulary
+
+object D2RQVoc {
+  val namespace = ("d2rq", "http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#")
+
+  object Property {
+    val JDBC_DSN = namespace._2 + "jdbcDSN"
+    val JDBC_DRIVER = namespace._2 + "jdbcDriver"
+    val USERNAME = namespace._2 + "username"
+    val PASSWORD = namespace._2 + "password"
+    val QUERY = namespace._2 + ""
+  }
+
+  object Class {
+    val DATABASE = namespace._2 + "Database"
+  }
+
+}
diff --git a/src/main/scala/io/rml/framework/core/vocabulary/QueryVoc.scala b/src/main/scala/io/rml/framework/core/vocabulary/QueryVoc.scala
index 7c73a68a..19e2ece2 100644
--- a/src/main/scala/io/rml/framework/core/vocabulary/QueryVoc.scala
+++ b/src/main/scala/io/rml/framework/core/vocabulary/QueryVoc.scala
@@ -33,5 +33,6 @@ object QueryVoc {
     val JSONPATH = namespace._2 + "JSONPath";
     val CSV = namespace._2 + "CSV";
     val XPATH = namespace._2 + "XPath";
+    val RDB = namespace._2 + "RDB"
   }
 }
diff --git a/src/main/scala/io/rml/framework/core/vocabulary/R2RMLVoc.scala b/src/main/scala/io/rml/framework/core/vocabulary/R2RMLVoc.scala
index a862ad49..745df5d7 100644
--- a/src/main/scala/io/rml/framework/core/vocabulary/R2RMLVoc.scala
+++ b/src/main/scala/io/rml/framework/core/vocabulary/R2RMLVoc.scala
@@ -52,7 +52,9 @@ object R2RMLVoc {
     val GRAPHMAP = namespace._2 + "graphMap";
     val DATATYPE = namespace._2 + "datatype";
     val LANGUAGE = namespace._2 + "language";
-    val DEFAULTGRAPH = namespace._2 + "defaultGraph"; 
+    val DEFAULTGRAPH = namespace._2 + "defaultGraph";
+    val TABLE_NAME = namespace._2 + "tableName"
+    val SQL_VERSION = namespace._2 + "sqlVersion"
   }
   
   object Class {
diff --git a/src/main/scala/io/rml/framework/core/vocabulary/RMLVoc.scala b/src/main/scala/io/rml/framework/core/vocabulary/RMLVoc.scala
index 59ce7dec..fcd5de76 100644
--- a/src/main/scala/io/rml/framework/core/vocabulary/RMLVoc.scala
+++ b/src/main/scala/io/rml/framework/core/vocabulary/RMLVoc.scala
@@ -43,5 +43,6 @@ object RMLVoc {
     val REFERENCEFORMULATION = namespace._2 + "referenceFormulation";
     val SOURCE = namespace._2 + "source";
     val LOGICALTARGET = namespace._2 + "logicalTarget";
+    val QUERY = namespace._2 + "query"
   }
 }
diff --git a/src/main/scala/io/rml/framework/core/vocabulary/XsdVoc.scala b/src/main/scala/io/rml/framework/core/vocabulary/XsdVoc.scala
index 8218a066..5a704b27 100644
--- a/src/main/scala/io/rml/framework/core/vocabulary/XsdVoc.scala
+++ b/src/main/scala/io/rml/framework/core/vocabulary/XsdVoc.scala
@@ -37,7 +37,8 @@ object XsdVoc {
     val XSD_POSITIVE_INTEGER = namespace._2 + "positiveInteger";
     val XSD_BOOLEAN = namespace._2 + "boolean";
     val XSD_DATETIME = namespace._2 + "dateTime";
-
+    val XSD_DATE = namespace._2 + "date"
+    val XSD_TIME = namespace._2 + "time"
     val XSD_ANY  = namespace._2 + "any";
   }
 
diff --git a/src/main/scala/io/rml/framework/engine/Engine.scala b/src/main/scala/io/rml/framework/engine/Engine.scala
index d6253868..d467c3a7 100644
--- a/src/main/scala/io/rml/framework/engine/Engine.scala
+++ b/src/main/scala/io/rml/framework/engine/Engine.scala
@@ -63,7 +63,11 @@ object Engine extends Logging {
     val tuples = for {
       m <- matches
       sanitizedRef = removeBrackets(m.toString()).replaceAll("#", "\\$")
-      optReferred = if (encode) item.refer(sanitizedRef).map(lString => lString.map(el => Uri.encode(el))) else item.refer(sanitizedRef)
+      // make reference IRI-safe
+      optReferred = if (encode)
+        item.refer(sanitizedRef).map(lString => lString.map(el => Uri.encode(el)))
+      else
+        item.refer(sanitizedRef)
       quotedSanitizedRef = Pattern.quote(sanitizedRef)
       if optReferred.isDefined
     } yield (optReferred, quotedSanitizedRef)
@@ -91,8 +95,6 @@ object Engine extends Logging {
 
               count += 1
             }
-
-
           }
         })
       }
@@ -101,43 +103,40 @@ object Engine extends Logging {
       // any escaped curly bracket can be unescaped.
       // e.g. \{ -> {
       Some(result.map(unescapeCurlyBrackets))
-
     }
   }
 
   /**
-    * Retrieve the value of a reference from a given item.
-    *
-    * @param reference
-    * @param item
-    * @return
-    */
-  def processReference(reference: Literal, item: Item): Option[List[String]] = {
-    item.refer(reference.value)
-  }
-
-  /**
-    * Private util method for removing brackets from a template string.
-    *
-    * @param s
-    * @return
-    */
-  private def removeBrackets(s: String): String
-
-  = {
+   * Private util method for removing brackets from a template string.
+   *
+   * @param s
+   * @return
+   */
+  private def removeBrackets(s: String): String = {
     s.replace("{", "")
       .replace("}", "")
   }
 
   /**
    * Unescapes curly brackets
+   *
    * @param s
    * @return
    */
-  private def unescapeCurlyBrackets(s: String) : String = {
+  private def unescapeCurlyBrackets(s: String): String = {
     s
       .replaceAllLiterally("""\{""", "{")
       .replaceAllLiterally("""\}""", "}")
   }
 
+  /**
+   * Retrieve the value of a reference from a given item.
+   *
+   * @param reference
+   * @param item
+   * @return
+   */
+  def processReference(reference: Literal, item: Item): Option[List[String]] = {
+    item.refer(reference.value)
+  }
 }
diff --git a/src/main/scala/io/rml/framework/engine/Processor.scala b/src/main/scala/io/rml/framework/engine/Processor.scala
index 81a7ddc5..f5fd3caf 100644
--- a/src/main/scala/io/rml/framework/engine/Processor.scala
+++ b/src/main/scala/io/rml/framework/engine/Processor.scala
@@ -47,4 +47,10 @@ abstract class Processor[T<:Item, IN, A <: Agent](engine: StatementEngine[T, A])
   override def open(parameters: Configuration): Unit = {
     functionAgent = Some(FunctionsFlinkUtil.initFunctionAgentForProcessor(getRuntimeContext.getDistributedCache));
   }
+
+  override def close(): Unit = {
+    if (functionAgent.isDefined) {
+      functionAgent.get.close();
+    }
+  }
 }
diff --git a/src/main/scala/io/rml/framework/engine/statement/TermMapGeneratorAssembler.scala b/src/main/scala/io/rml/framework/engine/statement/TermMapGeneratorAssembler.scala
index 3eb701d8..6d6c3146 100644
--- a/src/main/scala/io/rml/framework/engine/statement/TermMapGeneratorAssembler.scala
+++ b/src/main/scala/io/rml/framework/engine/statement/TermMapGeneratorAssembler.scala
@@ -46,10 +46,10 @@ abstract class TermMapGeneratorAssembler extends Logging {
       constantGenerator(termMap)
     } else if (termMap.hasTemplate) {
       templateGenerator(termMap)
-    } else if (termMap.hasReference) {
-      referenceGenerator(termMap)
     } else if (termMap.hasTermType && termMap.termType.get == Uri(R2RMLVoc.Class.BLANKNODE)) {
       blankNodeGenerator()
+    } else if (termMap.hasReference) {
+      referenceGenerator(termMap)
     } else {
       if (isWarnEnabled) logWarning(termMap.toString + ": no constant, template or reference present.")
       //(item: Item, functionAgent: Agent) => None
@@ -99,5 +99,4 @@ abstract class TermMapGeneratorAssembler extends Logging {
       case R2RMLVoc.Class.LITERAL => TermMapGenerators.referenceLiteralGenerator(termMap)
     }
   }
-
 }
diff --git a/src/main/scala/io/rml/framework/engine/statement/TermMapGenerators.scala b/src/main/scala/io/rml/framework/engine/statement/TermMapGenerators.scala
index 5bdf466d..dbb87379 100644
--- a/src/main/scala/io/rml/framework/engine/statement/TermMapGenerators.scala
+++ b/src/main/scala/io/rml/framework/engine/statement/TermMapGenerators.scala
@@ -28,6 +28,7 @@ package io.rml.framework.engine.statement
 
 import be.ugent.idlab.knows.functions.agent.Agent
 import io.rml.framework.api.RMLEnvironment
+import io.rml.framework.core.function.FunctionUtils
 import io.rml.framework.core.item.Item
 import io.rml.framework.core.model._
 import io.rml.framework.core.util.Util
@@ -69,7 +70,7 @@ object TermMapGenerators {
 
   def templateLiteralGenerator(termMap: TermMap): ((Item, Agent)) => Option[Iterable[Literal]] = {
     // return a function that processes the template
-      itemAgentTuple => {
+    itemAgentTuple => {
       for {
         iter <- Engine.processTemplate(termMap.template.get, itemAgentTuple._1)
       } yield for {
@@ -97,10 +98,22 @@ object TermMapGenerators {
     itemAgentTuple => {
       for {
         iter <- Engine.processReference(termMap.reference.get, itemAgentTuple._1)
-
       } yield for {
         value <- iter
-        lit = Literal(value, termMap.datatype, termMap.language)
+        item = itemAgentTuple._1
+        reference = termMap.reference.get.value
+        potentialType = item.getDataTypes.get(reference)
+
+        lit =
+          if (potentialType.isDefined) {
+            val `type` = Uri(potentialType.get)
+            // cast the value to correct notation
+            // little hack: wrap the value in Uri to allow usage in the typecasting code
+            val l = FunctionUtils.typeCastDataType(Uri(value), Some(`type`))
+            Literal(l.get.value, Some(`type`), termMap.language)
+          }
+          else
+            Literal(value, termMap.datatype, termMap.language)
 
       } yield lit
     }
@@ -108,7 +121,6 @@ object TermMapGenerators {
 
   def referenceUriGenerator(termMap: TermMap): ((Item, Agent)) => Option[Iterable[Uri]] = {
     // return a function that processes a reference
-
     itenAgentTuple => {
       for {
         iter <- Engine.processReference(termMap.reference.get, itenAgentTuple._1)
@@ -121,7 +133,7 @@ object TermMapGenerators {
     }
   }
 
-  private def processIRI(origIri: String): Iterable[String] =  {
+  private def processIRI(origIri: String): Iterable[String] = {
     if (Util.isValidAbsoluteUri(origIri)) {
       List(origIri)
     } else {
@@ -138,5 +150,4 @@ object TermMapGenerators {
       }
     }
   }
-
 }
diff --git a/src/main/scala/io/rml/framework/flink/sink/SPARQLSink.scala b/src/main/scala/io/rml/framework/flink/sink/SPARQLSink.scala
index e4610794..eb32efa7 100644
--- a/src/main/scala/io/rml/framework/flink/sink/SPARQLSink.scala
+++ b/src/main/scala/io/rml/framework/flink/sink/SPARQLSink.scala
@@ -37,7 +37,7 @@ class SPARQLSink private[sink](val URL: String) extends RichSinkFunction[String]
         val httpStatusCode = result.getStatusLine.getStatusCode
         if (httpStatusCode >= 300) {
           val body = result.getEntity
-          if (body.getContentLength > 0) try {
+          if (body.getContentLength > 0) {
             val inputStream = body.getContent
             try {
               val contents = new String(IOUtils.toByteArray(inputStream), StandardCharsets.UTF_8)
diff --git a/src/main/scala/io/rml/framework/flink/source/CSVStream.scala b/src/main/scala/io/rml/framework/flink/source/CSVStream.scala
index 46a8db34..d5e82ae7 100644
--- a/src/main/scala/io/rml/framework/flink/source/CSVStream.scala
+++ b/src/main/scala/io/rml/framework/flink/source/CSVStream.scala
@@ -25,28 +25,35 @@
 
 package io.rml.framework.flink.source
 
+import be.ugent.idlab.knows.dataio.access.RDBAccess
+import io.rml.framework.core.internal.Logging
 import io.rml.framework.core.item.Item
 import io.rml.framework.core.item.csv.CSVItem
 import io.rml.framework.core.model._
 import io.rml.framework.core.util.{CustomCSVConfig, DefaultCSVConfig}
+import io.rml.framework.core.vocabulary.QueryVoc
 import io.rml.framework.flink.connector.kafka.UniversalKafkaConnectorFactory
+import io.rml.framework.flink.source.functions.RDBSourceFunction
 import org.apache.commons.csv.CSVFormat
 import org.apache.flink.api.common.serialization.SimpleStringSchema
 import org.apache.flink.api.scala._
 import org.apache.flink.streaming.api.scala.{DataStream, StreamExecutionEnvironment}
 
-case class CSVStream(stream: DataStream[Iterable[Item]] ) extends Stream
+import scala.collection.JavaConverters._
 
-object CSVStream {
 
-  def apply(source: StreamDataSource)(implicit env: StreamExecutionEnvironment): Stream = {
+case class CSVStream(stream: DataStream[Iterable[Item]]) extends Stream
 
-    source match {
+object CSVStream extends Logging {
+
+  def apply(source: LogicalSource)(implicit env: StreamExecutionEnvironment): Stream = {
+    source.source match {
       case tcpStream: TCPSocketStream => fromTCPSocketStream(tcpStream)
       case fileStream: FileStream => fromFileStream(fileStream.path)
       case kafkaStream: KafkaStream => fromKafkaStream(kafkaStream)
-      case mqttStream : MQTTStream => fromMQTTStream(mqttStream)
+      case mqttStream: MQTTStream => fromMQTTStream(mqttStream)
       case wsStream: WsStream => fromWsStream(wsStream)
+      case dbSource: DatabaseSource => fromDatabase(dbSource)
       case _ => null
     }
   }
@@ -58,11 +65,11 @@ object CSVStream {
 
   def fromKafkaStream(kafkaStream: KafkaStream)(implicit env: StreamExecutionEnvironment): CSVStream = {
     val properties = kafkaStream.getProperties
-    val consumer =  UniversalKafkaConnectorFactory.getSource(kafkaStream.topic, new SimpleStringSchema(), properties)
+    val consumer = UniversalKafkaConnectorFactory.getSource(kafkaStream.topic, new SimpleStringSchema(), properties)
     streamFromSource(env.addSource(consumer))
   }
 
-  def fromMQTTStream(mqttStream : MQTTStream)(implicit env: StreamExecutionEnvironment):CSVStream = {
+  def fromMQTTStream(mqttStream: MQTTStream)(implicit env: StreamExecutionEnvironment): CSVStream = {
     val source = RichMQTTSource(
       mqttStream.hypermediaTarget,
       mqttStream.contentType,
@@ -73,7 +80,7 @@ object CSVStream {
     streamFromSource(env.addSource(source))
   }
 
-  def fromWsStream(wsStream: WsStream)(implicit env: StreamExecutionEnvironment):CSVStream = {
+  def fromWsStream(wsStream: WsStream)(implicit env: StreamExecutionEnvironment): CSVStream = {
     val source = new WebSocketSource(wsStream.hypermediaTarget)
     streamFromSource(env.addSource(source))
   }
@@ -110,6 +117,16 @@ object CSVStream {
     throw new NotImplementedError("FileStream is not implemented properly yet ")
   }
 
+  def fromDatabase(dbStream: DatabaseSource)(implicit senv: StreamExecutionEnvironment): CSVStream = {
+    val access = accessFromDBStream(dbStream)
+    val datastream = senv.addSource(new RDBSourceFunction(access))
+      .map(source => {
+        List(new CSVItem(source.getData.asScala.toMap, "", source.getDataTypes.asScala.toMap))
+      }).asInstanceOf[DataStream[Iterable[Item]]]
+
+    CSVStream(datastream)
+  }
+
   private def convertToSelection(headers: Array[String]): String = {
     headers.reduce((a, b) => a + ", " + b)
   }
@@ -142,4 +159,7 @@ object CSVStream {
     CSVStream(stream)
   }
 
+  private def accessFromDBStream(source: DatabaseSource): RDBAccess = {
+    new RDBAccess(source.jdbcURL, source.dbType, source.username, source.password, source.query.replace("\\\"", "\""), QueryVoc.Class.CSV)
+  }
 }
diff --git a/src/main/scala/io/rml/framework/flink/source/Database.scala b/src/main/scala/io/rml/framework/flink/source/Database.scala
deleted file mode 100644
index 090b7128..00000000
--- a/src/main/scala/io/rml/framework/flink/source/Database.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
-  * MIT License
-  *
-  * Copyright (C) 2017 - 2020 RDF Mapping Language (RML)
-  *
-  * Permission is hereby granted, free of charge, to any person obtaining a copy
-  * of this software and associated documentation files (the "Software"), to deal
-  * in the Software without restriction, including without limitation the rights
-  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  * copies of the Software, and to permit persons to whom the Software is
-  * furnished to do so, subject to the following conditions:
-  *
-  * The above copyright notice and this permission notice shall be included in
-  * all copies or substantial portions of the Software.
-  *
-  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  * THE SOFTWARE.
-  *
-  **/
-package io.rml.framework.flink.source
-
-class Database {
-
-}
diff --git a/src/main/scala/io/rml/framework/flink/source/Source.scala b/src/main/scala/io/rml/framework/flink/source/Source.scala
index ea79bad4..723918d8 100644
--- a/src/main/scala/io/rml/framework/flink/source/Source.scala
+++ b/src/main/scala/io/rml/framework/flink/source/Source.scala
@@ -26,6 +26,7 @@ package io.rml.framework.flink.source
 
 import io.rml.framework.core.model.{FileDataSource, LogicalSource, StreamDataSource, Uri}
 import io.rml.framework.core.vocabulary.QueryVoc
+import io.rml.framework.shared.RMLException
 import org.apache.flink.api.scala.ExecutionEnvironment
 import org.apache.flink.streaming.api.scala.StreamExecutionEnvironment
 
@@ -46,14 +47,15 @@ object Source {
 
   def apply(logicalSource: LogicalSource)(implicit env: ExecutionEnvironment, senv: StreamExecutionEnvironment): Source = {
     logicalSource.source match {
-      case fs: FileDataSource => FileDataSet(logicalSource)
-      case ss: StreamDataSource => {
+      case _: FileDataSource => FileDataSet(logicalSource)
+      case _: StreamDataSource => {
         logicalSource.source match {
           case source: StreamDataSource =>
             logicalSource.referenceFormulation match {
-              case Uri(QueryVoc.Class.CSV) => CSVStream(source)
+              case Uri(QueryVoc.Class.CSV) => CSVStream(logicalSource)
               case Uri(QueryVoc.Class.XPATH) => XMLStream(source, logicalSource.iterators.distinct)
               case Uri(QueryVoc.Class.JSONPATH) => JSONStream(source, logicalSource.iterators.distinct)
+              case _ => throw new RMLException(s"Reference formulation of the resource unknown. Provided formulation: ${logicalSource.referenceFormulation}")
             }
         }
       }
diff --git a/src/main/scala/io/rml/framework/flink/source/XMLInputFormat.scala b/src/main/scala/io/rml/framework/flink/source/XMLInputFormat.scala
index 04ed642e..ecd943b7 100644
--- a/src/main/scala/io/rml/framework/flink/source/XMLInputFormat.scala
+++ b/src/main/scala/io/rml/framework/flink/source/XMLInputFormat.scala
@@ -27,12 +27,14 @@ package io.rml.framework.flink.source
 import com.ximpleware.extended.{AutoPilotHuge, VTDGenHuge}
 import io.rml.framework.core.item.xml.XMLIterator
 import io.rml.framework.core.item.{EmptyItem, Item}
-import io.rml.framework.core.util.XMLNamespace
 import io.rml.framework.shared.RMLException
+import io.rml.framework.util.XMLNamespace
 import org.apache.flink.api.common.io.{GenericInputFormat, NonParallelInput}
 import org.apache.flink.core.io.GenericInputSplit
 import org.slf4j.LoggerFactory
 
+import scala.collection.JavaConverters._
+
 class XMLInputFormat(path: String, xpath: String) extends GenericInputFormat[Item] with NonParallelInput {
 
   val LOG = LoggerFactory.getLogger(classOf[XMLInputFormat])
@@ -42,7 +44,7 @@ class XMLInputFormat(path: String, xpath: String) extends GenericInputFormat[Ite
   override def open(inputSplit: GenericInputSplit): Unit = {
     super.open(inputSplit)
 
-    val namespaces: Map[String, String] = XMLNamespace.fromFile(path).map(tuple => tuple._1 -> tuple._2).toMap
+    val namespaces: Map[String, String] = XMLNamespace.namespacesOfRootFromFile(path).asScala.toMap
 
     val vg = new VTDGenHuge // parser for xml
 
@@ -57,7 +59,6 @@ class XMLInputFormat(path: String, xpath: String) extends GenericInputFormat[Ite
       ap.selectXPath(xpath)
       // create the iterator for the Akka Source
       iterator = XMLIterator(ap, vn, namespaces, xpath)
-      LOG.info("Run the XML source!")
     } else {
       throw new RMLException("Can't parse XML with VTD.")
     }
@@ -66,7 +67,6 @@ class XMLInputFormat(path: String, xpath: String) extends GenericInputFormat[Ite
   override def reachedEnd() = !iterator.hasNext
 
   override def nextRecord(reuse: Item) = {
-    LOG.info("Going for the next!")
     val next = iterator.next()
     if (next.isDefined) next.get
     else new EmptyItem
diff --git a/src/main/scala/io/rml/framework/flink/source/functions/RDBSourceFunction.scala b/src/main/scala/io/rml/framework/flink/source/functions/RDBSourceFunction.scala
new file mode 100644
index 00000000..e9b98dcb
--- /dev/null
+++ b/src/main/scala/io/rml/framework/flink/source/functions/RDBSourceFunction.scala
@@ -0,0 +1,28 @@
+package io.rml.framework.flink.source.functions
+
+import be.ugent.idlab.knows.dataio.access.RDBAccess
+import be.ugent.idlab.knows.dataio.iterators.CSVSourceIterator
+import be.ugent.idlab.knows.dataio.source.CSVSource
+import io.rml.framework.core.internal.Logging
+import org.apache.flink.streaming.api.functions.source.{RichSourceFunction, SourceFunction}
+
+/**
+ * Implementation of getting data from RDB
+ */
+class RDBSourceFunction(access: RDBAccess) extends RichSourceFunction[CSVSource] with Logging with Serializable {
+  private var running = true
+
+  override def run(sourceContext: SourceFunction.SourceContext[CSVSource]): Unit = {
+    val iterator = new CSVSourceIterator()
+    iterator.open(access)
+    while (running && iterator.hasNext) {
+      sourceContext.getCheckpointLock.synchronized {
+        sourceContext.collect(iterator.next().asInstanceOf[CSVSource])
+      }
+    }
+  }
+
+  override def cancel(): Unit = {
+    running = false
+  }
+}
diff --git a/src/test/java/io/rml/framework/containers/PostgresContainer.java b/src/test/java/io/rml/framework/containers/PostgresContainer.java
new file mode 100644
index 00000000..70f547e4
--- /dev/null
+++ b/src/test/java/io/rml/framework/containers/PostgresContainer.java
@@ -0,0 +1,51 @@
+package io.rml.framework.containers;
+
+import org.apache.ibatis.jdbc.ScriptRunner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.PostgreSQLContainer;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+
+/**
+ * Wrapper class around the Testcontainers' Postgres container. Contains convenience methods for managing it
+ */
+@Testcontainers
+public class PostgresContainer {
+    private final static Logger logger = LoggerFactory.getLogger(PostgresContainer.class);
+
+    @Container
+    public final PostgreSQLContainer<?> POSTGRES_CONTAINER = new PostgreSQLContainer()
+            .withDatabaseName("test")
+            .withUsername("postgres")
+            .withPassword("");
+
+    public void start() {
+        POSTGRES_CONTAINER.start();
+    }
+
+    public void stop() {
+        POSTGRES_CONTAINER.stop();
+    }
+
+    public void executeScript(String scriptPath) throws SQLException {
+        try (Connection conn = DriverManager.getConnection(POSTGRES_CONTAINER.getJdbcUrl(), POSTGRES_CONTAINER.getUsername(), POSTGRES_CONTAINER.getPassword())) {
+            ScriptRunner runner = new ScriptRunner(conn);
+            runner.setLogWriter(null); // make it not spit out the ran SQL into the output
+            runner.runScript(new FileReader(scriptPath));
+        } catch (FileNotFoundException exception) {
+            logger.error(exception.getMessage());
+            throw new Error();
+        }
+    }
+
+    public String getURL() {
+        return this.POSTGRES_CONTAINER.getJdbcUrl();
+    }
+}
diff --git a/src/test/java/io/rml/framework/util/TestXMLNamespace.java b/src/test/java/io/rml/framework/util/TestXMLNamespace.java
new file mode 100644
index 00000000..1ef5fc60
--- /dev/null
+++ b/src/test/java/io/rml/framework/util/TestXMLNamespace.java
@@ -0,0 +1,52 @@
+package io.rml.framework.util;
+
+import org.junit.jupiter.api.Test;
+
+import javax.xml.stream.XMLStreamException;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * MIT License
+ * <p>
+ * Copyright (C) 2017 - 2023 RDF Mapping Language (RML)
+ * <p>
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * <p>
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * <p>
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ **/
+public class TestXMLNamespace {
+	@Test
+	public void testNamespacesFromRoot() throws IOException, XMLStreamException {
+		String xmlDoc =
+				"<?xml version=\"1.0\" encoding=\"utf-16\"?>\n" +
+				"<RINFData xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\">\n" +
+				"  <MemberStateCode Code=\"BE\" Version=\"1.5\" />\n" +
+				"</RINFData>";
+
+		try (InputStream in = new ByteArrayInputStream(xmlDoc.getBytes(StandardCharsets.UTF_16))) {
+			Map<String, String> namespaces = XMLNamespace.namespacesOfRoot(in);
+			assertEquals("http://www.w3.org/2001/XMLSchema-instance", namespaces.get("xsi"));
+			assertEquals("http://www.w3.org/2001/XMLSchema", namespaces.get("xsd"));
+		}
+	}
+}
diff --git a/src/test/resources/db-tests/negative/RMLTC0002e-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/negative/RMLTC0002e-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..df866912
--- /dev/null
+++ b/src/test/resources/db-tests/negative/RMLTC0002e-PostgreSQL/mapping.ttl
@@ -0,0 +1,31 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1> a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "\"Students\""
+  ];
+
+  rr:subjectMap [
+      rr:template "http://example.com/{ID}/{Name}";
+    ];
+
+    rr:predicateObjectMap [
+      rr:predicate ex:id ;
+      rr:objectMap [ rml:reference "IDs" ]
+    ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/rml-testcases/RMLTC0002c-CSV/output.ttl b/src/test/resources/db-tests/negative/RMLTC0002e-PostgreSQL/output.nq
similarity index 100%
rename from src/test/resources/rml-testcases/RMLTC0002c-CSV/output.ttl
rename to src/test/resources/db-tests/negative/RMLTC0002e-PostgreSQL/output.nq
diff --git a/src/test/resources/db-tests/negative/RMLTC0002e-PostgreSQL/resource.sql b/src/test/resources/db-tests/negative/RMLTC0002e-PostgreSQL/resource.sql
new file mode 100644
index 00000000..80957756
--- /dev/null
+++ b/src/test/resources/db-tests/negative/RMLTC0002e-PostgreSQL/resource.sql
@@ -0,0 +1,6 @@
+DROP TABLE IF EXISTS student CASCADE ;
+CREATE TABLE student (
+  "ID" INTEGER,
+  "Name" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus');
diff --git a/src/test/resources/db-tests/negative/RMLTC0002g-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/negative/RMLTC0002g-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..d0295473
--- /dev/null
+++ b/src/test/resources/db-tests/negative/RMLTC0002g-PostgreSQL/mapping.ttl
@@ -0,0 +1,32 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1> a rr:TriplesMap;
+    
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rml:query "SELECT kjnqsdjfbqsdjfmsdnfm FROM student";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+      rr:template "http://example.com/{ID}/{Name}";
+    ];
+
+    rr:predicateObjectMap [
+      rr:predicate ex:id ;
+      rr:objectMap [ rml:reference "IDs" ]
+    ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/negative/RMLTC0002g-PostgreSQL/output.nq b/src/test/resources/db-tests/negative/RMLTC0002g-PostgreSQL/output.nq
new file mode 100644
index 00000000..e69de29b
diff --git a/src/test/resources/db-tests/negative/RMLTC0002g-PostgreSQL/resource.sql b/src/test/resources/db-tests/negative/RMLTC0002g-PostgreSQL/resource.sql
new file mode 100644
index 00000000..80957756
--- /dev/null
+++ b/src/test/resources/db-tests/negative/RMLTC0002g-PostgreSQL/resource.sql
@@ -0,0 +1,6 @@
+DROP TABLE IF EXISTS student CASCADE ;
+CREATE TABLE student (
+  "ID" INTEGER,
+  "Name" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus');
diff --git a/src/test/resources/db-tests/negative/RMLTC0002h-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/negative/RMLTC0002h-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..316ce9b8
--- /dev/null
+++ b/src/test/resources/db-tests/negative/RMLTC0002h-PostgreSQL/mapping.ttl
@@ -0,0 +1,32 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1> a rr:TriplesMap;
+    
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rml:query "SELECT Name, Name FROM student";
+    rr:tableName "student";
+  ];
+
+  rr:subjectMap [
+      rr:template "http://example.com/{ID}/{Name}";
+    ];
+
+    rr:predicateObjectMap [
+      rr:predicate ex:id ;
+      rr:objectMap [ rml:reference "IDs" ]
+    ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/negative/RMLTC0002h-PostgreSQL/output.nq b/src/test/resources/db-tests/negative/RMLTC0002h-PostgreSQL/output.nq
new file mode 100644
index 00000000..e69de29b
diff --git a/src/test/resources/db-tests/negative/RMLTC0002h-PostgreSQL/resource.sql b/src/test/resources/db-tests/negative/RMLTC0002h-PostgreSQL/resource.sql
new file mode 100644
index 00000000..80957756
--- /dev/null
+++ b/src/test/resources/db-tests/negative/RMLTC0002h-PostgreSQL/resource.sql
@@ -0,0 +1,6 @@
+DROP TABLE IF EXISTS student CASCADE ;
+CREATE TABLE student (
+  "ID" INTEGER,
+  "Name" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus');
diff --git a/src/test/resources/db-tests/negative/RMLTC0002i-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/negative/RMLTC0002i-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..26423d74
--- /dev/null
+++ b/src/test/resources/db-tests/negative/RMLTC0002i-PostgreSQL/mapping.ttl
@@ -0,0 +1,24 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap ;
+  rml:logicalSource [
+    rml:source <http://example.com/base/#DB_source> ;
+    rml:query "SELECT ID, Name FROM student" ;
+    rr:tableName "student"
+  ] ;
+  rr:subjectMap [ rr:template "http://example.com/{ID}/{Name}" ] ;
+  rr:predicateObjectMap [
+    rr:predicate foaf:name ;
+    rr:objectMap [ rml:reference "Name" ]
+  ] .
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/negative/RMLTC0002i-PostgreSQL/output.nq b/src/test/resources/db-tests/negative/RMLTC0002i-PostgreSQL/output.nq
new file mode 100644
index 00000000..1175d01d
--- /dev/null
+++ b/src/test/resources/db-tests/negative/RMLTC0002i-PostgreSQL/output.nq
@@ -0,0 +1 @@
+<http://example.com/10/Venus> <http://xmlns.com/foaf/0.1/name> "Venus".
diff --git a/src/test/resources/db-tests/negative/RMLTC0002i-PostgreSQL/resource.sql b/src/test/resources/db-tests/negative/RMLTC0002i-PostgreSQL/resource.sql
new file mode 100644
index 00000000..80957756
--- /dev/null
+++ b/src/test/resources/db-tests/negative/RMLTC0002i-PostgreSQL/resource.sql
@@ -0,0 +1,6 @@
+DROP TABLE IF EXISTS student CASCADE ;
+CREATE TABLE student (
+  "ID" INTEGER,
+  "Name" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus');
diff --git a/src/test/resources/db-tests/positive/RMLTC0000-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0000-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..953dc795
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0000-PostgreSQL/mapping.ttl
@@ -0,0 +1,36 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student";
+];
+
+  rr:subjectMap [
+      rr:template "http://example.com/{Name}"
+    ];
+
+    rr:predicateObjectMap [
+      rr:predicate foaf:name ;
+      rr:objectMap [
+        rml:reference "Name"
+      ]
+    ].
+
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0000-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0000-PostgreSQL/output.nq
new file mode 100644
index 00000000..ca0b9916
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0000-PostgreSQL/output.nq
@@ -0,0 +1 @@
+# empty database
diff --git a/src/test/resources/db-tests/positive/RMLTC0000-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0000-PostgreSQL/resource.sql
new file mode 100644
index 00000000..6a124b10
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0000-PostgreSQL/resource.sql
@@ -0,0 +1,4 @@
+DROP TABLE IF EXISTS student CASCADE ;
+CREATE TABLE student (
+    "Name" VARCHAR(50)
+);
\ No newline at end of file
diff --git a/src/test/resources/db-tests/positive/RMLTC0001a-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0001a-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..8fa14827
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0001a-PostgreSQL/mapping.ttl
@@ -0,0 +1,36 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+    
+  rml:logicalSource [ 
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student";
+];
+
+  rr:subjectMap [ 
+    rr:template "http://example.com/{Name}" 
+  ]; 
+	
+  rr:predicateObjectMap [ 
+    rr:predicate foaf:name; 
+    rr:objectMap [
+      rml:reference "Name"
+    ]
+  ].
+
+										
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0001a-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0001a-PostgreSQL/output.nq
new file mode 100644
index 00000000..efbb5543
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0001a-PostgreSQL/output.nq
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0001a-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0001a-PostgreSQL/resource.sql
new file mode 100644
index 00000000..21c51c3f
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0001a-PostgreSQL/resource.sql
@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS student CASCADE ;
+CREATE TABLE student (
+  "Name" VARCHAR(50)
+);
+INSERT INTO student values ('Venus');
diff --git a/src/test/resources/db-tests/positive/RMLTC0001b-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0001b-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..a40954ec
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0001b-PostgreSQL/mapping.ttl
@@ -0,0 +1,37 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+    
+  rml:logicalSource [ 
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rml:query "SELECT name FROM student";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [ 
+    rr:template "http://example.com/{name}"
+  ]; 
+	
+  rr:predicateObjectMap [ 
+    rr:predicate foaf:name; 
+    rr:objectMap [
+      rml:reference "name"
+    ]
+  ].
+
+										
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0001b-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0001b-PostgreSQL/output.nq
new file mode 100644
index 00000000..efbb5543
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0001b-PostgreSQL/output.nq
@@ -0,0 +1 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0001b-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0001b-PostgreSQL/resource.sql
new file mode 100644
index 00000000..601449ad
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0001b-PostgreSQL/resource.sql
@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS student CASCADE ;
+CREATE TABLE student (
+  name VARCHAR(50)
+);
+INSERT INTO student values ('Venus');
diff --git a/src/test/resources/db-tests/positive/RMLTC0002a-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0002a-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..6472fa0d
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0002a-PostgreSQL/mapping.ttl
@@ -0,0 +1,38 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+
+<TriplesMap1> a rr:TriplesMap;
+    
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student";
+  ];
+
+  rr:subjectMap [ 
+    rr:template "http://example.com/{ID}/{Name}";
+    rr:class foaf:Person 
+  ];
+
+  rr:predicateObjectMap [ 
+    rr:predicate ex:id ; 
+    rr:objectMap [ rml:reference "ID" ]
+  ];
+
+  rr:predicateObjectMap [ 
+    rr:predicate foaf:name ; 
+    rr:objectMap [ rml:reference "Name" ]
+  ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0002a-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0002a-PostgreSQL/output.nq
new file mode 100644
index 00000000..224747a6
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0002a-PostgreSQL/output.nq
@@ -0,0 +1,3 @@
+<http://example.com/10/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" .
+<http://example.com/10/Venus> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/10/Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
diff --git a/src/test/resources/db-tests/positive/RMLTC0002a-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0002a-PostgreSQL/resource.sql
new file mode 100644
index 00000000..2b4b5bea
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0002a-PostgreSQL/resource.sql
@@ -0,0 +1,7 @@
+DROP TABLE IF EXISTS student CASCADE ;
+CREATE TABLE student (
+  "ID" INTEGER,
+  "Name" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus');
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0002b-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0002b-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..96490e49
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0002b-PostgreSQL/mapping.ttl
@@ -0,0 +1,32 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1> a rr:TriplesMap;
+    
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student";
+  ];
+
+  rr:subjectMap [
+    rr:template "students{ID}";
+    rr:termType rr:BlankNode
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [ rml:reference "Name" ]
+  ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0002b-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0002b-PostgreSQL/output.nq
new file mode 100644
index 00000000..407dd744
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0002b-PostgreSQL/output.nq
@@ -0,0 +1 @@
+_:students10 <http://xmlns.com/foaf/0.1/name> "Venus" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0002b-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0002b-PostgreSQL/resource.sql
new file mode 100644
index 00000000..80957756
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0002b-PostgreSQL/resource.sql
@@ -0,0 +1,6 @@
+DROP TABLE IF EXISTS student CASCADE ;
+CREATE TABLE student (
+  "ID" INTEGER,
+  "Name" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus');
diff --git a/src/test/resources/db-tests/positive/RMLTC0002c-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0002c-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..6ec8fc9c
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0002c-PostgreSQL/mapping.ttl
@@ -0,0 +1,30 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1> a rr:TriplesMap;
+    
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:tableName "student";
+  ];
+
+  rr:subjectMap [
+      rr:template "http://example.com/{ID}/{Name}";
+    ];
+
+    rr:predicateObjectMap [
+      rr:predicate ex:id ;
+      rr:objectMap [ rml:reference "IDs" ]
+    ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0002c-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0002c-PostgreSQL/output.nq
new file mode 100644
index 00000000..e69de29b
diff --git a/src/test/resources/db-tests/positive/RMLTC0002c-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0002c-PostgreSQL/resource.sql
new file mode 100644
index 00000000..80957756
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0002c-PostgreSQL/resource.sql
@@ -0,0 +1,6 @@
+DROP TABLE IF EXISTS student CASCADE ;
+CREATE TABLE student (
+  "ID" INTEGER,
+  "Name" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus');
diff --git a/src/test/resources/db-tests/positive/RMLTC0002d-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0002d-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..93c158de
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0002d-PostgreSQL/mapping.ttl
@@ -0,0 +1,32 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1> a rr:TriplesMap;
+    
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rml:query "SELECT ('Student' || ID) AS StudentId, ID, Name FROM student";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+      rml:reference "studentid"; rr:termType rr:BlankNode
+    ];
+
+    rr:predicateObjectMap [
+      rr:predicate foaf:name ;
+      rr:objectMap [ rml:reference "name" ]
+    ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN"; # the "jbdc:mysql:// part is ignored
+  d2rq:jdbcDriver "org.postgresql.Driver"; # this is ignored
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0002d-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0002d-PostgreSQL/output.nq
new file mode 100644
index 00000000..c9ce3cd7
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0002d-PostgreSQL/output.nq
@@ -0,0 +1 @@
+_:Student10 <http://xmlns.com/foaf/0.1/name> "Venus".
diff --git a/src/test/resources/db-tests/positive/RMLTC0002d-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0002d-PostgreSQL/resource.sql
new file mode 100644
index 00000000..b6377ea8
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0002d-PostgreSQL/resource.sql
@@ -0,0 +1,6 @@
+DROP TABLE IF EXISTS student CASCADE ;
+CREATE TABLE student (
+  ID INTEGER,
+  Name VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus');
diff --git a/src/test/resources/db-tests/positive/RMLTC0002j-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0002j-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..5589935d
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0002j-PostgreSQL/mapping.ttl
@@ -0,0 +1,32 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1> a rr:TriplesMap;
+    
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rml:query "SELECT \"student\".\"ID\", \"student\".\"Name\" FROM student";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+      rr:template "http://example.com/{ID}/{Name}";
+    ];
+
+    rr:predicateObjectMap [
+      rr:predicate foaf:name ;
+      rr:objectMap [ rml:reference "Name" ]
+    ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0002j-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0002j-PostgreSQL/output.nq
new file mode 100644
index 00000000..98205bd6
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0002j-PostgreSQL/output.nq
@@ -0,0 +1 @@
+<http://example.com/10/Venus> <http://xmlns.com/foaf/0.1/name> "Venus".
\ No newline at end of file
diff --git a/src/test/resources/db-tests/positive/RMLTC0002j-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0002j-PostgreSQL/resource.sql
new file mode 100644
index 00000000..80957756
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0002j-PostgreSQL/resource.sql
@@ -0,0 +1,6 @@
+DROP TABLE IF EXISTS student CASCADE ;
+CREATE TABLE student (
+  "ID" INTEGER,
+  "Name" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus');
diff --git a/src/test/resources/db-tests/positive/RMLTC0002k-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0002k-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..0806dde1
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0002k-PostgreSQL/mapping.ttl
@@ -0,0 +1,31 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1> a rr:TriplesMap;
+    
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rml:query "SELECT \"student\".\"ID\", \"student\".\"Name\" FROM student";
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [
+      rr:template "http://example.com/{ID}/{Name}";
+    ];
+
+    rr:predicateObjectMap [
+      rr:predicate foaf:name ;
+      rr:objectMap [ rml:reference "Name" ]
+    ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0002k-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0002k-PostgreSQL/output.nq
new file mode 100644
index 00000000..98205bd6
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0002k-PostgreSQL/output.nq
@@ -0,0 +1 @@
+<http://example.com/10/Venus> <http://xmlns.com/foaf/0.1/name> "Venus".
\ No newline at end of file
diff --git a/src/test/resources/db-tests/positive/RMLTC0002k-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0002k-PostgreSQL/resource.sql
new file mode 100644
index 00000000..80957756
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0002k-PostgreSQL/resource.sql
@@ -0,0 +1,6 @@
+DROP TABLE IF EXISTS student CASCADE ;
+CREATE TABLE student (
+  "ID" INTEGER,
+  "Name" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus');
diff --git a/src/test/resources/db-tests/positive/RMLTC0003a-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0003a-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..3c5758af
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0003a-PostgreSQL/mapping.ttl
@@ -0,0 +1,41 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1> a rr:TriplesMap ;
+
+  rml:logicalSource [
+    rml:source <#DB_source> ;
+    rml:query """
+SELECT "ID",
+       "FirstName",
+        "LastName"
+FROM "student"
+""" ;
+    rr:tableName "student" ;
+    rr:sqlVersion rr:SQL1979
+  ] ;
+
+  rr:subjectMap [
+    rr:template "http://example.com/Student/{ID}/{FirstName}-{LastName}";
+    rr:class foaf:Person
+  ] ;
+
+  rr:predicateObjectMap [
+    rr:predicate ex:id ;
+    rr:objectMap [ rml:reference "ID"; ]
+  ] ;
+
+  .
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN"; # the "jbdc:mysql:// part is ignored
+  d2rq:jdbcDriver "com.mysql.cj.jdbc.Driver"; # this is ignored
+  d2rq:username "postgres";
+  d2rq:password "" .
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0003a-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0003a-PostgreSQL/output.nq
new file mode 100644
index 00000000..898147de
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0003a-PostgreSQL/output.nq
@@ -0,0 +1,2 @@
+<http://example.com/Student/10/Venus-Williams> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer>.
+<http://example.com/Student/10/Venus-Williams> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person>.
diff --git a/src/test/resources/db-tests/positive/RMLTC0003a-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0003a-PostgreSQL/resource.sql
new file mode 100644
index 00000000..339e52c6
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0003a-PostgreSQL/resource.sql
@@ -0,0 +1,7 @@
+DROP TABLE IF EXISTS student CASCADE ;
+CREATE TABLE student (
+  "ID" INTEGER,
+  "FirstName" VARCHAR(50),
+  "LastName" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus', 'Williams');
diff --git a/src/test/resources/db-tests/positive/RMLTC0003b-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0003b-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..ec8112ce
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0003b-PostgreSQL/mapping.ttl
@@ -0,0 +1,35 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1> a rr:TriplesMap;
+    
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rml:query "SELECT id, lastname, concat_ws(firstname, '', lastname) as name FROM student";
+    rr:tableName "student";
+  ];
+
+  rr:subjectMap [
+      rr:template "http://example.com/{id}/{lastname}";
+    ];
+
+    rr:predicateObjectMap [
+        rr:predicate foaf:name ;
+        rr:objectMap [
+          rml:reference "name";
+          rr:termType rr:Literal;
+        ]
+      ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0003b-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0003b-PostgreSQL/output.nq
new file mode 100644
index 00000000..4ba0d6f1
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0003b-PostgreSQL/output.nq
@@ -0,0 +1 @@
+<http://example.com/10/Williams> <http://xmlns.com/foaf/0.1/name> "VenusWilliams" .
\ No newline at end of file
diff --git a/src/test/resources/db-tests/positive/RMLTC0003b-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0003b-PostgreSQL/resource.sql
new file mode 100644
index 00000000..c9b85352
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0003b-PostgreSQL/resource.sql
@@ -0,0 +1,7 @@
+DROP TABLE IF EXISTS student CASCADE ;
+CREATE TABLE student (
+  id INTEGER,
+  firstname VARCHAR(50),
+  lastname VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus', 'Williams');
diff --git a/src/test/resources/db-tests/positive/RMLTC0003c-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0003c-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..667646af
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0003c-PostgreSQL/mapping.ttl
@@ -0,0 +1,34 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1> a rr:TriplesMap;
+    
+  rml:logicalSource [ 
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student";
+];
+
+  rr:subjectMap [ 
+    rr:template "http://example.com/Student{ID}";
+  ];
+
+  rr:predicateObjectMap [ 
+    rr:predicate foaf:name ; 
+    rr:objectMap [ 
+      rr:template "{FirstName} {LastName}"; 
+      rr:termType rr:Literal; 
+    ]
+  ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0003c-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0003c-PostgreSQL/output.nq
new file mode 100644
index 00000000..180f90c2
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0003c-PostgreSQL/output.nq
@@ -0,0 +1 @@
+<http://example.com/Student10> <http://xmlns.com/foaf/0.1/name> "Venus Williams" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0003c-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0003c-PostgreSQL/resource.sql
new file mode 100644
index 00000000..339e52c6
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0003c-PostgreSQL/resource.sql
@@ -0,0 +1,7 @@
+DROP TABLE IF EXISTS student CASCADE ;
+CREATE TABLE student (
+  "ID" INTEGER,
+  "FirstName" VARCHAR(50),
+  "LastName" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus', 'Williams');
diff --git a/src/test/resources/db-tests/positive/RMLTC0004a-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0004a-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..30dcd9b0
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0004a-PostgreSQL/mapping.ttl
@@ -0,0 +1,54 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1> a rr:TriplesMap;
+    
+  rml:logicalSource [ 
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student_sport";
+];
+
+  rr:subjectMap [ 
+    rr:template "http://example.com/{Student}";
+    rr:class ex:Student
+  ];
+
+  rr:predicateObjectMap [ 
+    rr:predicate foaf:name ; 
+    rr:objectMap [ 
+      rml:reference "Student"
+    ]
+  ].
+
+<TriplesMap2> a rr:TriplesMap;
+    
+  rml:logicalSource [ 
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student_sport";
+];
+
+  rr:subjectMap [ 
+    rr:template "http://example.com/{Sport}";
+    rr:class ex:Sport
+  ];
+
+  rr:predicateObjectMap [ 
+    rr:predicate foaf:name ; 
+    rr:objectMap [ 
+      rml:reference "Sport"
+    ]
+  ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0004a-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0004a-PostgreSQL/output.nq
new file mode 100644
index 00000000..ab10283d
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0004a-PostgreSQL/output.nq
@@ -0,0 +1,4 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" .
+<http://example.com/Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Student> .
+<http://example.com/Tennis> <http://xmlns.com/foaf/0.1/name> "Tennis" .
+<http://example.com/Tennis> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Sport> .
diff --git a/src/test/resources/db-tests/positive/RMLTC0004a-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0004a-PostgreSQL/resource.sql
new file mode 100644
index 00000000..e3fbd520
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0004a-PostgreSQL/resource.sql
@@ -0,0 +1,7 @@
+DROP TABLE IF EXISTS student_sport;
+
+CREATE TABLE student_sport (
+  "Student" VARCHAR(50),
+  "Sport" VARCHAR(50)
+);
+INSERT INTO student_sport values ('Venus', 'Tennis');
diff --git a/src/test/resources/db-tests/positive/RMLTC0004a-PostgreSQL/student_sport.csv b/src/test/resources/db-tests/positive/RMLTC0004a-PostgreSQL/student_sport.csv
new file mode 100644
index 00000000..3c88eaa3
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0004a-PostgreSQL/student_sport.csv
@@ -0,0 +1,2 @@
+Student,Sport
+Venus,Tennis
diff --git a/src/test/resources/db-tests/positive/RMLTC0005a-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0005a-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..a7ab853a
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0005a-PostgreSQL/mapping.ttl
@@ -0,0 +1,32 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+@base <http://example.com/base/> .
+
+<TriplesMap1> a rr:TriplesMap;
+    
+  rml:logicalSource [ 
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "IOUs";
+  ];
+
+  rr:subjectMap [ 
+    rr:template "http://example.com/{fname};{lname}";
+    rr:class foaf:Person;
+  ];
+
+  rr:predicateObjectMap [ 
+    rr:predicate ex:owes; 
+    rr:objectMap [ rml:reference "amount"; ]
+  ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0005a-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0005a-PostgreSQL/output.nq
new file mode 100644
index 00000000..30bc4b1d
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0005a-PostgreSQL/output.nq
@@ -0,0 +1,5 @@
+<http://example.com/Bob;Smith> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Bob;Smith> <http://example.com/owes> "3.0E1"^^<http://www.w3.org/2001/XMLSchema#double> .
+<http://example.com/Sue;Jones> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Sue;Jones> <http://example.com/owes> "2.0E1"^^<http://www.w3.org/2001/XMLSchema#double> .
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0005a-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0005a-PostgreSQL/resource.sql
new file mode 100644
index 00000000..32767803
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0005a-PostgreSQL/resource.sql
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS IOUs;
+CREATE TABLE IOUs (
+      fname VARCHAR(20),
+      lname  VARCHAR(20),
+      amount FLOAT);
+INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30);
+INSERT INTO IOUs (fname, lname, amount) VALUES ('Sue', 'Jones', 20);
+INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30);
diff --git a/src/test/resources/db-tests/positive/RMLTC0005b-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0005b-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..15269112
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0005b-PostgreSQL/mapping.ttl
@@ -0,0 +1,43 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+@base <http://example.com/base/> .
+
+<TriplesMap1> a rr:TriplesMap;
+    
+  rml:logicalSource [ 
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "IOUs";
+  ];
+
+  rr:subjectMap [ 
+    rr:template "{fname}_{lname}";
+    rr:class <IOUs>;
+    rr:termType rr:BlankNode
+  ];
+
+  rr:predicateObjectMap [ 
+    rr:predicate <IOUs#fname>; 
+    rr:objectMap [ rml:reference "fname"; ]
+  ];
+
+  rr:predicateObjectMap [ 
+    rr:predicate <IOUs#lname>; 
+    rr:objectMap [ rml:reference "lname"; ]
+  ];
+
+  rr:predicateObjectMap [ 
+    rr:predicate <IOUs#amount>; 
+    rr:objectMap [ rml:reference "amount"; ]
+  ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0005b-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0005b-PostgreSQL/output.nq
new file mode 100644
index 00000000..e9744d9a
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0005b-PostgreSQL/output.nq
@@ -0,0 +1,9 @@
+_:Bob_Smith <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/base/IOUs> .
+_:Bob_Smith <http://example.com/base/IOUs#fname> "Bob" .
+_:Bob_Smith <http://example.com/base/IOUs#lname> "Smith" .
+_:Bob_Smith <http://example.com/base/IOUs#amount> "3.0E1"^^<http://www.w3.org/2001/XMLSchema#double> .
+_:Sue_Jones <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/base/IOUs> .
+_:Sue_Jones <http://example.com/base/IOUs#fname> "Sue" .
+_:Sue_Jones <http://example.com/base/IOUs#lname> "Jones" .
+_:Sue_Jones <http://example.com/base/IOUs#amount> "2.0E1"^^<http://www.w3.org/2001/XMLSchema#double> .
+	
diff --git a/src/test/resources/db-tests/positive/RMLTC0005b-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0005b-PostgreSQL/resource.sql
new file mode 100644
index 00000000..32767803
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0005b-PostgreSQL/resource.sql
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS IOUs;
+CREATE TABLE IOUs (
+      fname VARCHAR(20),
+      lname  VARCHAR(20),
+      amount FLOAT);
+INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30);
+INSERT INTO IOUs (fname, lname, amount) VALUES ('Sue', 'Jones', 20);
+INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30);
diff --git a/src/test/resources/db-tests/positive/RMLTC0006a-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0006a-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..5a70bfac
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0006a-PostgreSQL/mapping.ttl
@@ -0,0 +1,32 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1> a rr:TriplesMap;
+    
+  rml:logicalSource [ 
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student";
+];
+
+  rr:subjectMap [
+    rr:constant ex:BadStudent;
+    rr:graphMap [ rr:constant <http://example.com/graph/student> ];
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicateMap [ rr:constant ex:description ];
+    rr:objectMap [ rr:constant "Bad Student"; ]
+  ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0006a-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0006a-PostgreSQL/output.nq
new file mode 100644
index 00000000..4e6fd3ef
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0006a-PostgreSQL/output.nq
@@ -0,0 +1 @@
+<http://example.com/BadStudent> <http://example.com/description> "Bad Student" <http://example.com/graph/student> .
\ No newline at end of file
diff --git a/src/test/resources/db-tests/positive/RMLTC0006a-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0006a-PostgreSQL/resource.sql
new file mode 100644
index 00000000..b5c63bc3
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0006a-PostgreSQL/resource.sql
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS student;
+
+CREATE TABLE student (
+  "ID" INTEGER,
+  "FirstName" VARCHAR(50),
+  "LastName" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus', 'Williams');
diff --git a/src/test/resources/db-tests/positive/RMLTC0007a-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0007a-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..0cd76ef6
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0007a-PostgreSQL/mapping.ttl
@@ -0,0 +1,32 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+@base <http://example.com/base/> .
+
+<TriplesMap1> a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student";
+];
+
+  rr:subjectMap [
+    rr:template "http://example.com/Student/{ID}/{FirstName}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate rdf:type;
+    rr:object foaf:Person;
+  ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0007a-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0007a-PostgreSQL/output.nq
new file mode 100644
index 00000000..76f87f89
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0007a-PostgreSQL/output.nq
@@ -0,0 +1,2 @@
+ <http://example.com/Student/10/Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0007a-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0007a-PostgreSQL/resource.sql
new file mode 100644
index 00000000..b5c63bc3
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0007a-PostgreSQL/resource.sql
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS student;
+
+CREATE TABLE student (
+  "ID" INTEGER,
+  "FirstName" VARCHAR(50),
+  "LastName" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus', 'Williams');
diff --git a/src/test/resources/db-tests/positive/RMLTC0007b-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0007b-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..d471ad5a
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0007b-PostgreSQL/mapping.ttl
@@ -0,0 +1,38 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+@base <http://example.com/base/> .
+
+<TriplesMap1> a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student";
+];
+
+  rr:subjectMap [
+    rr:template "http://example.com/Student/{ID}/{FirstName}";
+    rr:graph ex:PersonGraph
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate rdf:type;
+    rr:object foaf:Person;
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [ rml:reference "FirstName" ]
+  ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0007b-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0007b-PostgreSQL/output.nq
new file mode 100644
index 00000000..5c4eb261
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0007b-PostgreSQL/output.nq
@@ -0,0 +1,3 @@
+<http://example.com/Student/10/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" <http://example.com/PersonGraph> . 
+<http://example.com/Student/10/Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person>  <http://example.com/PersonGraph> .
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0007b-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0007b-PostgreSQL/resource.sql
new file mode 100644
index 00000000..b5c63bc3
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0007b-PostgreSQL/resource.sql
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS student;
+
+CREATE TABLE student (
+  "ID" INTEGER,
+  "FirstName" VARCHAR(50),
+  "LastName" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus', 'Williams');
diff --git a/src/test/resources/db-tests/positive/RMLTC0007c-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0007c-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..80222745
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0007c-PostgreSQL/mapping.ttl
@@ -0,0 +1,37 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1> a rr:TriplesMap;
+    
+  rml:logicalSource [ 
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student";
+];
+
+  rr:subjectMap [ 
+    rr:template "http://example.com/Student/{ID}/{FirstName}";
+    rr:class foaf:Person, ex:Student
+  ];
+
+  rr:predicateObjectMap [ 
+    rr:predicate ex:id ;
+    rr:objectMap [ rml:reference "ID"; ]
+  ];
+
+  rr:predicateObjectMap [ 
+    rr:predicate foaf:name;
+    rr:objectMap [ rml:reference "FirstName" ]
+  ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0007c-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0007c-PostgreSQL/output.nq
new file mode 100644
index 00000000..ae78ddfb
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0007c-PostgreSQL/output.nq
@@ -0,0 +1,5 @@
+<http://example.com/Student/10/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" .
+<http://example.com/Student/10/Venus> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> . 
+<http://example.com/Student/10/Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Student/10/Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Student> .
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0007c-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0007c-PostgreSQL/resource.sql
new file mode 100644
index 00000000..b5c63bc3
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0007c-PostgreSQL/resource.sql
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS student;
+
+CREATE TABLE student (
+  "ID" INTEGER,
+  "FirstName" VARCHAR(50),
+  "LastName" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus', 'Williams');
diff --git a/src/test/resources/db-tests/positive/RMLTC0007d-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0007d-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..f24a2724
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0007d-PostgreSQL/mapping.ttl
@@ -0,0 +1,47 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1> a rr:TriplesMap;
+    
+  rml:logicalSource [ 
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student";
+];
+
+  rr:subjectMap [
+    rr:template "http://example.com/Student/{ID}/{FirstName}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate rdf:type;
+    rr:object foaf:Person;
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate rdf:type;
+    rr:object ex:Student;
+  ];
+
+  rr:predicateObjectMap [ 
+    rr:predicate ex:id;
+    rr:objectMap [ rml:reference "ID" ]
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [ rml:reference "FirstName" ]
+  ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0007d-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0007d-PostgreSQL/output.nq
new file mode 100644
index 00000000..ae78ddfb
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0007d-PostgreSQL/output.nq
@@ -0,0 +1,5 @@
+<http://example.com/Student/10/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" .
+<http://example.com/Student/10/Venus> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> . 
+<http://example.com/Student/10/Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Student/10/Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Student> .
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0007d-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0007d-PostgreSQL/resource.sql
new file mode 100644
index 00000000..b5c63bc3
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0007d-PostgreSQL/resource.sql
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS student;
+
+CREATE TABLE student (
+  "ID" INTEGER,
+  "FirstName" VARCHAR(50),
+  "LastName" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus', 'Williams');
diff --git a/src/test/resources/db-tests/positive/RMLTC0007e-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0007e-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..12246c3e
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0007e-PostgreSQL/mapping.ttl
@@ -0,0 +1,38 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1> a rr:TriplesMap;
+    
+  rml:logicalSource [ 
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student";
+];
+
+  rr:subjectMap [ 
+    rr:template "http://example.com/Student/{ID}/{FirstName}";
+    rr:graph ex:PersonGraph ;
+    rr:class foaf:Person
+  ];
+
+  rr:predicateObjectMap [ 
+    rr:predicate ex:id ;
+    rr:objectMap [ rml:reference "ID"; ]
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name ;
+    rr:objectMap [ rml:reference "FirstName"; ]
+  ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0007e-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0007e-PostgreSQL/output.nq
new file mode 100644
index 00000000..c5ea4c49
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0007e-PostgreSQL/output.nq
@@ -0,0 +1,4 @@
+<http://example.com/Student/10/Venus> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example.com/PersonGraph> .
+<http://example.com/Student/10/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" <http://example.com/PersonGraph> .
+<http://example.com/Student/10/Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> <http://example.com/PersonGraph> .
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0007e-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0007e-PostgreSQL/resource.sql
new file mode 100644
index 00000000..b5c63bc3
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0007e-PostgreSQL/resource.sql
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS student;
+
+CREATE TABLE student (
+  "ID" INTEGER,
+  "FirstName" VARCHAR(50),
+  "LastName" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus', 'Williams');
diff --git a/src/test/resources/db-tests/positive/RMLTC0007f-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0007f-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..5534b178
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0007f-PostgreSQL/mapping.ttl
@@ -0,0 +1,43 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1> a rr:TriplesMap;
+    
+  rml:logicalSource [ 
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student";
+];
+
+  rr:subjectMap [ 
+    rr:template "http://example.com/Student/{ID}/{FirstName}";
+    rr:graph ex:PersonGraph
+  ];
+
+  rr:predicateObjectMap [ 
+    rr:predicate rdf:type;
+    rr:object foaf:Person
+  ];
+
+  rr:predicateObjectMap [ 
+    rr:predicate ex:id ;
+    rr:objectMap [ rml:reference "ID";  ]
+  ];
+
+  rr:predicateObjectMap [ 
+    rr:predicate foaf:name ;
+    rr:objectMap [ rml:reference "FirstName" ]
+  ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0007f-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0007f-PostgreSQL/output.nq
new file mode 100644
index 00000000..fb6a536c
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0007f-PostgreSQL/output.nq
@@ -0,0 +1,4 @@
+<http://example.com/Student/10/Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> <http://example.com/PersonGraph> .
+<http://example.com/Student/10/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" <http://example.com/PersonGraph> .
+<http://example.com/Student/10/Venus> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example.com/PersonGraph> .
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0007f-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0007f-PostgreSQL/resource.sql
new file mode 100644
index 00000000..b5c63bc3
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0007f-PostgreSQL/resource.sql
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS student;
+
+CREATE TABLE student (
+  "ID" INTEGER,
+  "FirstName" VARCHAR(50),
+  "LastName" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus', 'Williams');
diff --git a/src/test/resources/db-tests/positive/RMLTC0007g-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0007g-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..d5b66343
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0007g-PostgreSQL/mapping.ttl
@@ -0,0 +1,35 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1> a rr:TriplesMap;
+    
+  rml:logicalSource [ 
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student";
+];
+
+
+  rr:subjectMap [ 
+    rr:template "http://example.com/Student/{ID}/{FirstName}";
+    rr:graph rr:defaultGraph
+  ];
+
+  rr:predicateObjectMap [ 
+    rr:predicate foaf:name;
+    rr:objectMap [
+      rml:reference "FirstName"
+    ]
+  ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0007g-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0007g-PostgreSQL/output.nq
new file mode 100644
index 00000000..6c29bcce
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0007g-PostgreSQL/output.nq
@@ -0,0 +1,2 @@
+<http://example.com/Student/10/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" .
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0007g-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0007g-PostgreSQL/resource.sql
new file mode 100644
index 00000000..b5c63bc3
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0007g-PostgreSQL/resource.sql
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS student;
+
+CREATE TABLE student (
+  "ID" INTEGER,
+  "FirstName" VARCHAR(50),
+  "LastName" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus', 'Williams');
diff --git a/src/test/resources/db-tests/positive/RMLTC0008a-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0008a-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..a75e65a0
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0008a-PostgreSQL/mapping.ttl
@@ -0,0 +1,49 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [ 
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student";
+];
+
+  rr:subjectMap [ 
+    rr:template "http://example.com/Student/{ID}/{Name}"; 
+    rr:graphMap [ rr:template "http://example.com/graph/Student/{ID}/{Name}" ]
+  ];
+	
+  rr:predicateObjectMap [ 
+    rr:predicate rdf:type ;
+    rr:object foaf:Person; 
+  ];
+	
+  rr:predicateObjectMap [ 
+    rr:predicate ex:id ;
+    rr:objectMap [ rml:reference "ID" ]
+  ];
+
+  rr:predicateObjectMap [ 
+    rr:predicate foaf:name ;
+    rr:objectMap [ rml:reference "Name" ]
+  ];
+
+  rr:predicateObjectMap [ 
+    rr:predicate ex:Sport ;
+    rr:objectMap [ rml:reference "Sport" ]
+  ] .
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0008a-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0008a-PostgreSQL/output.nq
new file mode 100644
index 00000000..8c3c01f8
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0008a-PostgreSQL/output.nq
@@ -0,0 +1,6 @@
+<http://example.com/Student/10/Venus%20Williams> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> <http://example.com/graph/Student/10/Venus%20Williams> .
+<http://example.com/Student/10/Venus%20Williams> <http://xmlns.com/foaf/0.1/name> "Venus Williams" <http://example.com/graph/Student/10/Venus%20Williams> .
+<http://example.com/Student/10/Venus%20Williams> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example.com/graph/Student/10/Venus%20Williams> . 
+<http://example.com/Student/10/Venus%20Williams> <http://example.com/Sport> "Tennis" <http://example.com/graph/Student/10/Venus%20Williams> . 
+
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0008a-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0008a-PostgreSQL/resource.sql
new file mode 100644
index 00000000..3ad893a6
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0008a-PostgreSQL/resource.sql
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS student;
+
+CREATE TABLE student (
+  "ID" INTEGER,
+  "Name" VARCHAR(50),
+  "Sport" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus Williams', 'Tennis');
diff --git a/src/test/resources/db-tests/positive/RMLTC0008c-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0008c-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..829c028b
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0008c-PostgreSQL/mapping.ttl
@@ -0,0 +1,33 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix activity: <http://example.com/activity/> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student";
+  ];
+
+
+  rr:subjectMap [ rr:template "http://example.com/Student/{ID}/{Name}" ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name ;
+    rr:predicate ex:name ;
+    rr:objectMap [ rml:reference "Name" ]
+  ] .
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0008c-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0008c-PostgreSQL/output.nq
new file mode 100644
index 00000000..d36f700c
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0008c-PostgreSQL/output.nq
@@ -0,0 +1,3 @@
+<http://example.com/Student/10/Venus%20Williams> <http://xmlns.com/foaf/0.1/name> "Venus Williams"  .
+<http://example.com/Student/10/Venus%20Williams> <http://example.com/name> "Venus Williams"  .
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0008c-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0008c-PostgreSQL/resource.sql
new file mode 100644
index 00000000..3ad893a6
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0008c-PostgreSQL/resource.sql
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS student;
+
+CREATE TABLE student (
+  "ID" INTEGER,
+  "Name" VARCHAR(50),
+  "Sport" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus Williams', 'Tennis');
diff --git a/src/test/resources/db-tests/positive/RMLTC0009c-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0009c-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..aa22cc5c
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0009c-PostgreSQL/mapping.ttl
@@ -0,0 +1,37 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix activity: <http://example.com/activity/> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rml:query """
+        SELECT Name, COUNT(Sport)
+        FROM Student
+        GROUP BY Name
+        """ ;
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [ rr:template "http://example.com/resource/student_{name}"; ];
+	
+    rr:predicateObjectMap
+    [ 
+      rr:predicate	foaf:name ; 
+      rr:objectMap	[ rml:reference "name"; ];
+    ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0009c-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0009c-PostgreSQL/output.nq
new file mode 100644
index 00000000..f789cbf8
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0009c-PostgreSQL/output.nq
@@ -0,0 +1,4 @@
+<http://example.com/resource/student_Venus%20Williams> <http://xmlns.com/foaf/0.1/name> "Venus Williams" . 
+<http://example.com/resource/student_Demi%20Moore> <http://xmlns.com/foaf/0.1/name> "Demi Moore" . 
+
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0009c-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0009c-PostgreSQL/resource.sql
new file mode 100644
index 00000000..d8ba9270
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0009c-PostgreSQL/resource.sql
@@ -0,0 +1,20 @@
+DROP TABLE IF EXISTS Student;
+DROP TABLE IF EXISTS Sport;
+
+CREATE TABLE Sport (
+ID integer,
+Name varchar (50),
+PRIMARY KEY (ID)
+);
+
+CREATE TABLE Student (
+ID integer,
+Name varchar(50),
+Sport integer,
+PRIMARY KEY (ID),
+FOREIGN KEY(Sport) REFERENCES Sport(ID)
+);
+
+INSERT INTO Sport (ID, Name) VALUES (100,'Tennis');
+INSERT INTO Student (ID, Name, Sport) VALUES (10,'Venus Williams', 100);
+INSERT INTO Student (ID, Name, Sport) VALUES (20,'Demi Moore', NULL);
diff --git a/src/test/resources/db-tests/positive/RMLTC0009d-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0009d-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..0ab891cf
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0009d-PostgreSQL/mapping.ttl
@@ -0,0 +1,43 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix activity: <http://example.com/activity/> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rml:query """
+        SELECT Name, COUNT(Sport) as SPORTCOUNT
+        FROM Student
+        GROUP BY Name
+        """ ;
+    rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [ rr:template "http://example.com/resource/student_{name}"; ];
+	
+    rr:predicateObjectMap
+    [ 
+      rr:predicate	foaf:name ; 
+      rr:objectMap	[ rml:reference "name"; ];
+    ];
+
+    rr:predicateObjectMap
+    [ 
+		rr:predicate	ex:numSport ; 
+		rr:objectMap	[ rml:reference "sportcount"; ];
+    ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0009d-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0009d-PostgreSQL/output.nq
new file mode 100644
index 00000000..9ecd9fc2
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0009d-PostgreSQL/output.nq
@@ -0,0 +1,7 @@
+<http://example.com/resource/student_Venus%20Williams> <http://xmlns.com/foaf/0.1/name> "Venus Williams" . 
+<http://example.com/resource/student_Venus%20Williams> <http://example.com/numSport> "1"^^<http://www.w3.org/2001/XMLSchema#integer> . 
+<http://example.com/resource/student_Demi%20Moore> <http://xmlns.com/foaf/0.1/name> "Demi Moore" . 
+<http://example.com/resource/student_Demi%20Moore> <http://example.com/numSport> "0"^^<http://www.w3.org/2001/XMLSchema#integer> . 
+
+
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0009d-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0009d-PostgreSQL/resource.sql
new file mode 100644
index 00000000..d8ba9270
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0009d-PostgreSQL/resource.sql
@@ -0,0 +1,20 @@
+DROP TABLE IF EXISTS Student;
+DROP TABLE IF EXISTS Sport;
+
+CREATE TABLE Sport (
+ID integer,
+Name varchar (50),
+PRIMARY KEY (ID)
+);
+
+CREATE TABLE Student (
+ID integer,
+Name varchar(50),
+Sport integer,
+PRIMARY KEY (ID),
+FOREIGN KEY(Sport) REFERENCES Sport(ID)
+);
+
+INSERT INTO Sport (ID, Name) VALUES (100,'Tennis');
+INSERT INTO Student (ID, Name, Sport) VALUES (10,'Venus Williams', 100);
+INSERT INTO Student (ID, Name, Sport) VALUES (20,'Demi Moore', NULL);
diff --git a/src/test/resources/db-tests/positive/RMLTC0010a-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0010a-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..19dda8ff
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0010a-PostgreSQL/mapping.ttl
@@ -0,0 +1,31 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix activity: <http://example.com/activity/> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "country_info";
+  ];
+
+  rr:subjectMap [ rr:template "http://example.com/{Country Code}" ];
+	
+  rr:predicateObjectMap [ 
+    rr:predicate ex:name ;
+    rr:objectMap [ rml:reference "Name" ]
+  ] .
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0010a-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0010a-PostgreSQL/output.nq
new file mode 100644
index 00000000..29911d6f
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0010a-PostgreSQL/output.nq
@@ -0,0 +1,4 @@
+<http://example.com/1> <http://example.com/name> "Bolivia, Plurinational State of" .
+<http://example.com/2> <http://example.com/name> "Ireland" .
+<http://example.com/3> <http://example.com/name> "Saint Martin (French part)" .
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0010a-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0010a-PostgreSQL/resource.sql
new file mode 100644
index 00000000..12f1652d
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0010a-PostgreSQL/resource.sql
@@ -0,0 +1,10 @@
+DROP TABLE IF EXISTS country_info;
+
+CREATE TABLE country_info (
+  "Country Code" INTEGER,
+  "Name" VARCHAR(100),
+  "ISO 3166" VARCHAR(10)
+);
+INSERT INTO country_info values ('1', 'Bolivia, Plurinational State of', 'BO');
+INSERT INTO country_info values ('2', 'Ireland', 'IE');
+INSERT INTO country_info values ('3', 'Saint Martin (French part)', 'MF');
diff --git a/src/test/resources/db-tests/positive/RMLTC0010b-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0010b-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..c8d3a5f7
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0010b-PostgreSQL/mapping.ttl
@@ -0,0 +1,31 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix activity: <http://example.com/activity/> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "country_info";
+  ];
+
+  rr:subjectMap [ rr:template "http://example.com/{Country Code}/{Name}" ];
+	
+  rr:predicateObjectMap [ 
+    rr:predicate ex:name ;
+    rr:objectMap [ rml:reference "Name" ]
+  ] .
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0010b-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0010b-PostgreSQL/output.nq
new file mode 100644
index 00000000..c92a08b0
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0010b-PostgreSQL/output.nq
@@ -0,0 +1,4 @@
+<http://example.com/1/Bolivia%2C%20Plurinational%20State%20of> <http://example.com/name> "Bolivia, Plurinational State of" .
+<http://example.com/2/Ireland> <http://example.com/name> "Ireland" .
+<http://example.com/3/Saint%20Martin%20%28French%20part%29> <http://example.com/name> "Saint Martin (French part)" .
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0010b-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0010b-PostgreSQL/resource.sql
new file mode 100644
index 00000000..12f1652d
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0010b-PostgreSQL/resource.sql
@@ -0,0 +1,10 @@
+DROP TABLE IF EXISTS country_info;
+
+CREATE TABLE country_info (
+  "Country Code" INTEGER,
+  "Name" VARCHAR(100),
+  "ISO 3166" VARCHAR(10)
+);
+INSERT INTO country_info values ('1', 'Bolivia, Plurinational State of', 'BO');
+INSERT INTO country_info values ('2', 'Ireland', 'IE');
+INSERT INTO country_info values ('3', 'Saint Martin (French part)', 'MF');
diff --git a/src/test/resources/db-tests/positive/RMLTC0010c-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0010c-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..002a4a41
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0010c-PostgreSQL/mapping.ttl
@@ -0,0 +1,31 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix activity: <http://example.com/activity/> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "country_info";
+  ];
+
+  rr:subjectMap [ rr:template "http://example.com/{Country Code}/{Name}" ];
+
+  rr:predicateObjectMap [
+    rr:predicate ex:code ;
+    rr:objectMap [ rr:template "\\{\\{\\{ {ISO 3166} \\}\\}\\}"; rr:termType rr:Literal]
+  ] .
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0010c-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0010c-PostgreSQL/output.nq
new file mode 100644
index 00000000..5c7e1080
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0010c-PostgreSQL/output.nq
@@ -0,0 +1,4 @@
+<http://example.com/1/Bolivia%2C%20Plurinational%20State%20of> <http://example.com/code> "{{{ BO }}}" .
+<http://example.com/2/Ireland> <http://example.com/code> "{{{ IE }}}" .
+<http://example.com/3/Saint%20Martin%20%28French%20part%29> <http://example.com/code> "{{{ MF }}}" .
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0010c-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0010c-PostgreSQL/resource.sql
new file mode 100644
index 00000000..12f1652d
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0010c-PostgreSQL/resource.sql
@@ -0,0 +1,10 @@
+DROP TABLE IF EXISTS country_info;
+
+CREATE TABLE country_info (
+  "Country Code" INTEGER,
+  "Name" VARCHAR(100),
+  "ISO 3166" VARCHAR(10)
+);
+INSERT INTO country_info values ('1', 'Bolivia, Plurinational State of', 'BO');
+INSERT INTO country_info values ('2', 'Ireland', 'IE');
+INSERT INTO country_info values ('3', 'Saint Martin (French part)', 'MF');
diff --git a/src/test/resources/db-tests/positive/RMLTC0011b-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0011b-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..d2230f54
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0011b-PostgreSQL/mapping.ttl
@@ -0,0 +1,88 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+    
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student";
+  ];
+
+  rr:subjectMap [ 
+    rr:template "http://example.com/student/{id}";
+  ]; 
+	
+  rr:predicateObjectMap [ 
+    rr:predicate ex:firstName; 
+    rr:objectMap [
+      rml:reference "firstname"
+    ]
+  ]; 
+	
+  rr:predicateObjectMap [ 
+    rr:predicate ex:lastName; 
+    rr:objectMap [
+      rml:reference "lastname"
+    ]
+  ].
+
+<TriplesMap2>
+  a rr:TriplesMap;
+    
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "sport";
+  ];
+
+  rr:subjectMap [ 
+    rr:template "http://example.com/sport/{id}";
+  ]; 
+	
+  rr:predicateObjectMap [ 
+    rr:predicate ex:id; 
+    rr:objectMap [
+      rml:reference "id"
+    ]
+  ]; 
+	
+  rr:predicateObjectMap [ 
+    rr:predicate ex:description; 
+    rr:objectMap [
+      rml:reference "description"
+    ]
+  ].
+
+<LinkMap_1_2>
+  a rr:TriplesMap;
+    
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student_sport";
+  ];
+
+  rr:subjectMap [ 
+    rr:template "http://example.com/student/{id_student}";
+  ]; 
+	
+  rr:predicateObjectMap [ 
+    rr:predicate ex:plays; 
+    rr:objectMap [
+      rr:template "http://example.com/sport/{id_sport}"
+    ]
+  ].									
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0011b-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0011b-PostgreSQL/output.nq
new file mode 100644
index 00000000..6a82565e
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0011b-PostgreSQL/output.nq
@@ -0,0 +1,17 @@
+<http://example.com/student/10> <http://example.com/lastName> "Williams" .
+<http://example.com/student/10> <http://example.com/firstName> "Venus" .
+<http://example.com/student/12> <http://example.com/lastName> "Villa" .
+<http://example.com/student/12> <http://example.com/firstName> "David" .
+<http://example.com/student/11> <http://example.com/lastName> "Alonso" .
+<http://example.com/student/11> <http://example.com/firstName> "Fernando" .
+<http://example.com/sport/110> <http://example.com/description> "Tennis" .
+<http://example.com/sport/110> <http://example.com/id> "110"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/sport/111> <http://example.com/description> "Football" .
+<http://example.com/sport/111> <http://example.com/id> "111"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/sport/112> <http://example.com/description> "Formula1" .
+<http://example.com/sport/112> <http://example.com/id> "112"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/student/10> <http://example.com/plays> <http://example.com/sport/110> .
+<http://example.com/student/12> <http://example.com/plays> <http://example.com/sport/111> .
+<http://example.com/student/11> <http://example.com/plays> <http://example.com/sport/112> .
+<http://example.com/student/11> <http://example.com/plays> <http://example.com/sport/111> .
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0011b-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0011b-PostgreSQL/resource.sql
new file mode 100644
index 00000000..acdc4aa1
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0011b-PostgreSQL/resource.sql
@@ -0,0 +1,31 @@
+DROP TABLE IF EXISTS student_sport;
+DROP TABLE IF EXISTS student;
+DROP TABLE IF EXISTS sport;
+
+CREATE TABLE sport (
+  ID INTEGER,
+  Description VARCHAR(200)
+);
+INSERT INTO sport values ('110','Tennis');
+INSERT INTO sport values ('111','Football');
+INSERT INTO sport values ('112','Formula1');
+
+
+CREATE TABLE student (
+  ID INTEGER,
+  FirstName VARCHAR(200),
+  LastName VARCHAR(200)
+);
+INSERT INTO student values ('10','Venus','Williams');
+INSERT INTO student values ('11','Fernando','Alonso');
+INSERT INTO student values ('12','David','Villa');
+
+
+CREATE TABLE student_sport (
+  ID_Student INTEGER,
+  ID_Sport INTEGER
+);
+INSERT INTO student_sport values ('10', '110');
+INSERT INTO student_sport values ('11','111');
+INSERT INTO student_sport values ('11','112');
+INSERT INTO student_sport values ('12','111');
diff --git a/src/test/resources/db-tests/positive/RMLTC0011b-PostgreSQL/sport.csv b/src/test/resources/db-tests/positive/RMLTC0011b-PostgreSQL/sport.csv
new file mode 100644
index 00000000..98446d06
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0011b-PostgreSQL/sport.csv
@@ -0,0 +1,4 @@
+ID,Description
+110,Tennis
+111,Football
+112,Formula1
diff --git a/src/test/resources/db-tests/positive/RMLTC0011b-PostgreSQL/student_sport.csv b/src/test/resources/db-tests/positive/RMLTC0011b-PostgreSQL/student_sport.csv
new file mode 100644
index 00000000..381e9213
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0011b-PostgreSQL/student_sport.csv
@@ -0,0 +1,5 @@
+ID_Student,ID_Sport
+10,110
+11,111
+11,112
+12,111
diff --git a/src/test/resources/db-tests/positive/RMLTC0012a-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0012a-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..90aab1f3
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0012a-PostgreSQL/mapping.ttl
@@ -0,0 +1,40 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "IOUs";
+  ];
+	
+  rr:subjectMap [ rr:template "{fname}_{lname}_{amount}"; rr:termType rr:BlankNode; ];
+	
+  rr:predicateObjectMap [ 
+    rr:predicate foaf:name ; 
+    rr:objectMap [
+      rr:template "{fname} {lname}";
+      rr:termType rr:Literal ;
+    ]
+  ];
+    
+  rr:predicateObjectMap [ 
+    rr:predicate ex:amount ; 
+    rr:objectMap    [ 
+      rml:reference "amount";
+    ]
+  ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0012a-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0012a-PostgreSQL/output.nq
new file mode 100644
index 00000000..10e4040a
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0012a-PostgreSQL/output.nq
@@ -0,0 +1,5 @@
+_:Bob_Smith_30 <http://example.com/amount> "30"^^<http://www.w3.org/2001/XMLSchema#integer> .
+_:Bob_Smith_30 <http://xmlns.com/foaf/0.1/name> "Bob Smith" .
+_:Sue_Jones_20 <http://example.com/amount> "20"^^<http://www.w3.org/2001/XMLSchema#integer> .
+_:Sue_Jones_20 <http://xmlns.com/foaf/0.1/name> "Sue Jones" .
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0012a-PostgreSQL/persons.csv b/src/test/resources/db-tests/positive/RMLTC0012a-PostgreSQL/persons.csv
new file mode 100644
index 00000000..6d1909d9
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0012a-PostgreSQL/persons.csv
@@ -0,0 +1,4 @@
+fname,lname,amount
+Bob,Smith,30
+Sue,Jones,20
+Bob,Smith,30
diff --git a/src/test/resources/db-tests/positive/RMLTC0012a-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0012a-PostgreSQL/resource.sql
new file mode 100644
index 00000000..af98da75
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0012a-PostgreSQL/resource.sql
@@ -0,0 +1,17 @@
+DROP TABLE IF EXISTS IOUs;
+DROP TABLE IF EXISTS Lives;
+
+CREATE TABLE IOUs (
+      fname VARCHAR(20),
+      lname VARCHAR(20),
+      amount INT);
+INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30);
+INSERT INTO IOUs (fname, lname, amount) VALUES ('Sue', 'Jones', 20);
+INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30);
+CREATE TABLE Lives (
+      fname VARCHAR(20),
+      lname VARCHAR(20),
+      city VARCHAR(20));
+INSERT INTO Lives (fname, lname, city) VALUES ('Bob', 'Smith', 'London');
+INSERT INTO Lives (fname, lname, city) VALUES ('Sue', 'Jones', 'Madrid');
+INSERT INTO Lives (fname, lname, city) VALUES ('Bob', 'Smith', 'London');
diff --git a/src/test/resources/db-tests/positive/RMLTC0012b-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0012b-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..8ab57ddb
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0012b-PostgreSQL/mapping.ttl
@@ -0,0 +1,60 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "persons";
+  ];
+	
+  rr:subjectMap [
+    rr:template "{fname}{lname}";
+    rr:termType rr:BlankNode ;
+  ];
+	
+  rr:predicateObjectMap [ 
+    rr:predicate foaf:name ; 
+    rr:objectMap [
+      rr:template "{fname} {lname}";
+      rr:termType rr:Literal ;
+    ]
+  ];
+  .
+
+<TriplesMap2>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "lives";
+  ];
+
+  rr:subjectMap [
+    rr:template "{fname}{lname}";
+    rr:termType rr:BlankNode;
+  ];
+
+  rr:predicateObjectMap
+  [
+    rr:predicate	ex:city ;
+    rr:objectMap    [
+      rml:reference "city";
+    ]
+];
+.
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "password" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0012b-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0012b-PostgreSQL/output.nq
new file mode 100644
index 00000000..0d556bbd
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0012b-PostgreSQL/output.nq
@@ -0,0 +1,5 @@
+_:BobSmith <http://example.com/city> "London" .
+_:BobSmith <http://xmlns.com/foaf/0.1/name> "Bob Smith" .
+_:SueJones <http://example.com/city> "Madrid" .
+_:SueJones <http://xmlns.com/foaf/0.1/name> "Sue Jones" .
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0012b-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0012b-PostgreSQL/resource.sql
new file mode 100644
index 00000000..2761bf68
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0012b-PostgreSQL/resource.sql
@@ -0,0 +1,21 @@
+DROP TABLE IF EXISTS persons;
+
+CREATE TABLE persons (
+  "fname" VARCHAR(200),
+  "lname" VARCHAR(200),
+  "amount" INTEGER
+);
+INSERT INTO persons values ('Bob','Smith','30');
+INSERT INTO persons values ('Sue','Jones','20');
+INSERT INTO persons values ('Bob','Smith','30');
+
+DROP TABLE IF EXISTS lives;
+
+CREATE TABLE lives (
+  "fname" VARCHAR(200),
+  "lname" VARCHAR(200),
+  "city" VARCHAR(200)
+);
+INSERT INTO lives values ('Bob','Smith','London');
+INSERT INTO lives values ('Sue','Jones','Madrid');
+INSERT INTO lives values ('Bob','Smith','London');
diff --git a/src/test/resources/db-tests/positive/RMLTC0012e-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0012e-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..699e49c9
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0012e-PostgreSQL/mapping.ttl
@@ -0,0 +1,86 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "IOUs";
+  ];
+
+  rr:subjectMap [ rr:template "{fname}_{lname}_{amount}"; rr:termType rr:BlankNode; ];
+    
+    rr:predicateObjectMap [
+    	rr:predicate rdf:type;
+    	rr:object <IOUs>;
+    ];
+		
+    rr:predicateObjectMap
+    [ 
+      rr:predicate		<IOUs#fname> ; 
+      rr:objectMap		[ rml:reference "fname"; ]
+    ];
+
+    rr:predicateObjectMap
+    [ 
+      rr:predicate		<IOUs#lname> ; 
+      rr:objectMap		[ rml:reference "lname"; ]
+    ];
+
+    rr:predicateObjectMap
+    [ 
+      rr:predicate		<IOUs#amount> ; 
+      rr:objectMap		[ rml:reference "amount"; ]
+    ];
+	.
+	
+<TriplesMap2>
+    a rr:TriplesMap;
+
+	rml:logicalSource [
+	    rml:source <#DB_source>;
+        rr:sqlVersion rr:SQL2008;
+	    rr:tableName  "Lives"
+    ];
+	
+    rr:subjectMap [ rr:template "{fname}_{lname}_{city}"; rr:termType rr:BlankNode; ];
+    
+    rr:predicateObjectMap [
+    	rr:predicate rdf:type;
+    	rr:object <Lives>;
+    ];
+	
+    rr:predicateObjectMap
+    [ 
+      rr:predicate		<IOUs#fname> ; 
+      rr:objectMap		[ rml:reference "fname"; ]
+    ];
+
+    rr:predicateObjectMap
+    [ 
+      rr:predicate		<IOUs#lname> ; 
+      rr:objectMap		[ rml:reference "lname"; ]
+    ];
+
+    rr:predicateObjectMap
+    [ 
+      rr:predicate		<IOUs#city> ; 
+      rr:objectMap		[ rml:reference "city"; ]
+    ];
+	.	
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0012e-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0012e-PostgreSQL/output.nq
new file mode 100644
index 00000000..caec8253
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0012e-PostgreSQL/output.nq
@@ -0,0 +1,17 @@
+_:Bob_Smith_30 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/base/IOUs> .
+_:Bob_Smith_30 <http://example.com/base/IOUs#fname> "Bob" .
+_:Bob_Smith_30 <http://example.com/base/IOUs#lname> "Smith" .
+_:Bob_Smith_30 <http://example.com/base/IOUs#amount> "3.0E1"^^<http://www.w3.org/2001/XMLSchema#double> .
+_:Sue_Jones_20 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/base/IOUs> .
+_:Sue_Jones_20 <http://example.com/base/IOUs#fname> "Sue" .
+_:Sue_Jones_20 <http://example.com/base/IOUs#lname> "Jones" .
+_:Sue_Jones_20 <http://example.com/base/IOUs#amount> "2.0E1"^^<http://www.w3.org/2001/XMLSchema#double> .
+_:Bob_Smith_London <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/base/Lives> .
+_:Bob_Smith_London <http://example.com/base/IOUs#fname> "Bob" .
+_:Bob_Smith_London <http://example.com/base/IOUs#lname> "Smith" .
+_:Bob_Smith_London <http://example.com/base/IOUs#city> "London" .
+_:Sue_Jones_Madrid <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/base/Lives> .
+_:Sue_Jones_Madrid <http://example.com/base/IOUs#fname> "Sue" .
+_:Sue_Jones_Madrid <http://example.com/base/IOUs#lname> "Jones" .
+_:Sue_Jones_Madrid <http://example.com/base/IOUs#city> "Madrid" .
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0012e-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0012e-PostgreSQL/resource.sql
new file mode 100644
index 00000000..46e386f7
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0012e-PostgreSQL/resource.sql
@@ -0,0 +1,18 @@
+DROP TABLE IF EXISTS IOUs;
+DROP TABLE IF EXISTS Lives;
+
+CREATE TABLE IOUs (
+      fname VARCHAR(20),
+      lname VARCHAR(20),
+      amount FLOAT);
+INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30);
+INSERT INTO IOUs (fname, lname, amount) VALUES ('Sue', 'Jones', 20);
+INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30);
+
+CREATE TABLE Lives (
+      fname VARCHAR(20),
+      lname VARCHAR(20),
+      city VARCHAR(20));
+INSERT INTO Lives (fname, lname, city) VALUES ('Bob', 'Smith', 'London');
+INSERT INTO Lives (fname, lname, city) VALUES ('Sue', 'Jones', 'Madrid');
+INSERT INTO Lives (fname, lname, city) VALUES ('Bob', 'Smith', 'London');
diff --git a/src/test/resources/db-tests/positive/RMLTC0013a-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0013a-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..3f8bd314
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0013a-PostgreSQL/mapping.ttl
@@ -0,0 +1,34 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "Person";
+  ];
+	
+  rr:subjectMap [
+      rr:template "http://example.com/Person/{ID}/{Name}/{DateOfBirth}"
+    ];
+
+    rr:predicateObjectMap [
+      rr:predicate ex:BirthDay ;
+      rr:objectMap [
+        rml:reference "DateOfBirth"
+      ]
+    ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN"; # the "jbdc:mysql:// part is ignored
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "password" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0013a-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0013a-PostgreSQL/output.nq
new file mode 100644
index 00000000..4b1bf1fa
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0013a-PostgreSQL/output.nq
@@ -0,0 +1,3 @@
+<http://example.com/Person/2/Bob/September%2C%202010> <http://example.com/BirthDay> "September, 2010" .
+
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0013a-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0013a-PostgreSQL/resource.sql
new file mode 100644
index 00000000..03a372d2
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0013a-PostgreSQL/resource.sql
@@ -0,0 +1,11 @@
+DROP TABLE IF EXISTS Person;
+
+CREATE TABLE Person (
+"ID" integer,
+"Name" varchar(50),
+"DateOfBirth" varchar(50),
+PRIMARY KEY ("ID")
+);
+INSERT INTO Person ("ID", "Name", "DateOfBirth") VALUES (1,'Alice', NULL);
+INSERT INTO Person ("ID", "Name", "DateOfBirth") VALUES (2,'Bob', 'September, 2010');
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0014d-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0014d-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..fdf9ae8c
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0014d-PostgreSQL/mapping.ttl
@@ -0,0 +1,39 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/ns#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rml:query  """
+      SELECT EMP.*, (CASE job
+        WHEN 'CLERK' THEN 'general-office'
+        WHEN 'NIGHTGUARD' THEN 'security'
+        WHEN 'ENGINEER' THEN 'engineering'
+      END) AS ROLE FROM EMP
+    """ ;
+    rml:referenceFormulation ql:CSV
+   ];
+	
+    rr:subjectMap [ rr:template "http://data.example.com/employee/{empno}" ];
+    
+    rr:predicateObjectMap [
+        rr:predicate ex:role;
+        rr:objectMap [ rr:template "http://data.example.com/roles/{role}" ];
+    ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0014d-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0014d-PostgreSQL/output.nq
new file mode 100644
index 00000000..a1025c8a
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0014d-PostgreSQL/output.nq
@@ -0,0 +1 @@
+<http://data.example.com/employee/7369> <http://example.com/ns#role> <http://data.example.com/roles/general-office> .
diff --git a/src/test/resources/db-tests/positive/RMLTC0014d-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0014d-PostgreSQL/resource.sql
new file mode 100644
index 00000000..84570225
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0014d-PostgreSQL/resource.sql
@@ -0,0 +1,24 @@
+DROP TABLE IF EXISTS LIKES;
+DROP TABLE IF EXISTS EMP;
+DROP TABLE IF EXISTS DEPT;
+
+CREATE TABLE DEPT (
+      deptno INTEGER UNIQUE,
+      dname VARCHAR(30),
+      loc VARCHAR(100));
+INSERT INTO DEPT (deptno, dname, loc) VALUES (10, 'APPSERVER', 'NEW YORK');
+
+CREATE TABLE EMP (
+      empno INTEGER PRIMARY KEY,
+      ename VARCHAR(100),
+      job VARCHAR(30),
+	  deptno INTEGER REFERENCES DEPT (deptno),
+	  etype VARCHAR(30));
+INSERT INTO EMP (empno, ename, job, deptno, etype ) VALUES (7369, 'SMITH', 'CLERK', 10, 'PART_TIME');
+
+CREATE TABLE LIKES (
+      id INTEGER,
+      likeType VARCHAR(30),
+      likedObj VARCHAR(100));
+INSERT INTO LIKES (id, likeType, likedObj) VALUES (7369, 'Playing', 'Soccer');
+INSERT INTO LIKES (id, likeType, likedObj) VALUES (7369, 'Watching', 'Basketball');
diff --git a/src/test/resources/db-tests/positive/RMLTC0016a-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0016a-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..58286cda
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0016a-PostgreSQL/mapping.ttl
@@ -0,0 +1,56 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+@base <http://example.com/base/> .
+
+
+<TriplesMap1>
+    a rr:TriplesMap;
+
+	rml:logicalSource [ rml:source <#DB_source>; rr:sqlVersion rr:SQL2008; rr:tableName "Patient" ];
+
+    rr:subjectMap [ rr:template "http://example.com/Patient/{id}"; ];
+
+    rr:predicateObjectMap
+    [
+		rr:predicate	rdf:type;
+		rr:object		foaf:Person;
+	];
+
+    rr:predicateObjectMap
+    [
+		rr:predicate	ex:id ;
+		rr:objectMap    [ rml:reference "id"; ]
+    ];
+
+    rr:predicateObjectMap
+    [
+      rr:predicate		ex:firstName;
+      rr:objectMap		[ rml:reference "firstname"; ]
+    ];
+
+    rr:predicateObjectMap
+    [
+      rr:predicate		ex:lastName;
+      rr:objectMap		[ rml:reference "lastname"; ]
+    ];
+
+    rr:predicateObjectMap
+    [
+      rr:predicate		ex:gender;
+      rr:objectMap		[ rml:reference "sex"; ]
+    ];
+
+    .
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0016a-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0016a-PostgreSQL/output.nq
new file mode 100644
index 00000000..c854ecf9
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0016a-PostgreSQL/output.nq
@@ -0,0 +1,16 @@
+<http://example.com/Patient/10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Patient/10> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/Patient/10> <http://example.com/firstName> "Monica" .
+<http://example.com/Patient/10> <http://example.com/lastName> "Geller" .
+<http://example.com/Patient/10> <http://example.com/gender> "female" .
+<http://example.com/Patient/11> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Patient/11> <http://example.com/id> "11"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/Patient/11> <http://example.com/firstName> "Rachel" .
+<http://example.com/Patient/11> <http://example.com/lastName> "Green" .
+<http://example.com/Patient/11> <http://example.com/gender> "female" .
+<http://example.com/Patient/12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Patient/12> <http://example.com/id> "12"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/Patient/12> <http://example.com/firstName> "Chandler" .
+<http://example.com/Patient/12> <http://example.com/lastName> "Bing" .
+<http://example.com/Patient/12> <http://example.com/gender> "male" .
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0016a-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0016a-PostgreSQL/resource.sql
new file mode 100644
index 00000000..3fa73e67
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0016a-PostgreSQL/resource.sql
@@ -0,0 +1,27 @@
+DROP TABLE IF EXISTS Patient;
+
+CREATE TABLE Patient (
+ID INTEGER,
+FirstName VARCHAR(50),
+LastName VARCHAR(50),
+Sex VARCHAR(6),
+Weight REAL,
+Height FLOAT,
+BirthDate DATE,
+EntranceDate TIMESTAMP,
+PaidInAdvance BOOLEAN,
+Photo BYTEA,
+PRIMARY KEY (ID)
+);
+
+INSERT INTO Patient (ID, FirstName,LastName,Sex,Weight,Height,BirthDate,EntranceDate,PaidInAdvance,Photo)
+VALUES (10,'Monica','Geller','female',80.25,1.65,'1981-10-10','2009-10-10 12:12:22',FALSE,
+'\\x89504E470D0A1A0A0000000D49484452000000050000000508060000008D6F26E50000001C4944415408D763F9FFFEBFC37F062005C3201284D031F18258CD04000EF535CBD18E0E1F0000000049454E44AE426082');
+
+INSERT INTO Patient (ID, FirstName,LastName,Sex,Weight,Height,BirthDate,EntranceDate,PaidInAdvance,Photo)
+VALUES (11,'Rachel','Green','female',70.22,1.70,'1982-11-12','2008-11-12 09:45:44',TRUE,
+'\\x89504E470D0A1A0A0000000D49484452000000050000000508060000008D6F26E50000001C4944415408D763F9FFFF3FC37F062005C3201284D031F18258CD04000EF535CBD18E0E1F0000000049454E44AE426082');
+
+INSERT INTO Patient (ID, FirstName,LastName,Sex,Weight,Height,BirthDate,EntranceDate,PaidInAdvance,Photo)
+VALUES (12,'Chandler','Bing','male',90.31,1.76,'1978-04-06','2007-03-12 02:13:14',TRUE,
+'\\x89504E470D0A1A0A0000000D49484452000000050000000508060000008D6F26E50000001C4944415408D763F9FFFEBFC37F062005C3201284D031F18258CD04000EF535CBD18E0E1F0000000049454E44AE426082');
diff --git a/src/test/resources/db-tests/positive/RMLTC0016c-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0016c-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..ed944972
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0016c-PostgreSQL/mapping.ttl
@@ -0,0 +1,43 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+@base <http://example.com/base/> .
+
+
+<TriplesMap1>
+    a rr:TriplesMap;
+
+	rml:logicalSource [ rml:source <#DB_source>; rr:sqlVersion rr:SQL2008; rr:tableName "Patient" ];
+
+    rr:subjectMap [ rr:template "http://example.com/Patient{id}"; ];
+
+    rr:predicateObjectMap
+    [
+		rr:predicate	rdf:type;
+		rr:object		foaf:Person;
+	];
+
+    rr:predicateObjectMap
+    [
+      rr:predicate		ex:birthdate;
+      rr:objectMap		[ rml:reference "birthdate"; ]
+    ];
+
+    rr:predicateObjectMap
+    [
+      rr:predicate		ex:entrancedate;
+      rr:objectMap		[ rml:reference "entrancedate"; ]
+    ];
+    .
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0016c-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0016c-PostgreSQL/output.nq
new file mode 100644
index 00000000..020b5b7c
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0016c-PostgreSQL/output.nq
@@ -0,0 +1,9 @@
+<http://example.com/Patient10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Patient10> <http://example.com/birthdate> "1981-10-10"^^<http://www.w3.org/2001/XMLSchema#date> .
+<http://example.com/Patient10> <http://example.com/entrancedate> "2009-10-10T12:12:22"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
+<http://example.com/Patient11> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Patient11> <http://example.com/birthdate> "1982-11-12"^^<http://www.w3.org/2001/XMLSchema#date> .
+<http://example.com/Patient11> <http://example.com/entrancedate> "2008-11-12T09:45:44"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
+<http://example.com/Patient12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Patient12> <http://example.com/birthdate> "1978-04-06"^^<http://www.w3.org/2001/XMLSchema#date> .
+<http://example.com/Patient12> <http://example.com/entrancedate> "2007-03-12T02:13:14"^^<http://www.w3.org/2001/XMLSchema#dateTime> .
diff --git a/src/test/resources/db-tests/positive/RMLTC0016c-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0016c-PostgreSQL/resource.sql
new file mode 100644
index 00000000..3fa73e67
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0016c-PostgreSQL/resource.sql
@@ -0,0 +1,27 @@
+DROP TABLE IF EXISTS Patient;
+
+CREATE TABLE Patient (
+ID INTEGER,
+FirstName VARCHAR(50),
+LastName VARCHAR(50),
+Sex VARCHAR(6),
+Weight REAL,
+Height FLOAT,
+BirthDate DATE,
+EntranceDate TIMESTAMP,
+PaidInAdvance BOOLEAN,
+Photo BYTEA,
+PRIMARY KEY (ID)
+);
+
+INSERT INTO Patient (ID, FirstName,LastName,Sex,Weight,Height,BirthDate,EntranceDate,PaidInAdvance,Photo)
+VALUES (10,'Monica','Geller','female',80.25,1.65,'1981-10-10','2009-10-10 12:12:22',FALSE,
+'\\x89504E470D0A1A0A0000000D49484452000000050000000508060000008D6F26E50000001C4944415408D763F9FFFEBFC37F062005C3201284D031F18258CD04000EF535CBD18E0E1F0000000049454E44AE426082');
+
+INSERT INTO Patient (ID, FirstName,LastName,Sex,Weight,Height,BirthDate,EntranceDate,PaidInAdvance,Photo)
+VALUES (11,'Rachel','Green','female',70.22,1.70,'1982-11-12','2008-11-12 09:45:44',TRUE,
+'\\x89504E470D0A1A0A0000000D49484452000000050000000508060000008D6F26E50000001C4944415408D763F9FFFF3FC37F062005C3201284D031F18258CD04000EF535CBD18E0E1F0000000049454E44AE426082');
+
+INSERT INTO Patient (ID, FirstName,LastName,Sex,Weight,Height,BirthDate,EntranceDate,PaidInAdvance,Photo)
+VALUES (12,'Chandler','Bing','male',90.31,1.76,'1978-04-06','2007-03-12 02:13:14',TRUE,
+'\\x89504E470D0A1A0A0000000D49484452000000050000000508060000008D6F26E50000001C4944415408D763F9FFFEBFC37F062005C3201284D031F18258CD04000EF535CBD18E0E1F0000000049454E44AE426082');
diff --git a/src/test/resources/db-tests/positive/RMLTC0016d-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0016d-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..415e15d4
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0016d-PostgreSQL/mapping.ttl
@@ -0,0 +1,37 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+@base <http://example.com/base/> .
+
+
+<TriplesMap1>
+    a rr:TriplesMap;
+
+	rml:logicalSource [ rml:source <#DB_source>; rr:sqlVersion rr:SQL2008; rr:tableName "Patient" ];
+
+    rr:subjectMap [ rr:template "http://example.com/Patient{id}"; ];
+
+    rr:predicateObjectMap
+    [
+		rr:predicate	rdf:type;
+		rr:object		foaf:Person;
+	];
+
+    rr:predicateObjectMap
+    [
+      rr:predicate		ex:paid;
+      rr:objectMap		[ rml:reference "paidinadvance";  ]
+    ];
+    .
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0016d-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0016d-PostgreSQL/output.nq
new file mode 100644
index 00000000..578b074e
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0016d-PostgreSQL/output.nq
@@ -0,0 +1,6 @@
+<http://example.com/Patient10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Patient10> <http://example.com/paid> "false"^^<http://www.w3.org/2001/XMLSchema#boolean> .
+<http://example.com/Patient11> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Patient11> <http://example.com/paid> "true"^^<http://www.w3.org/2001/XMLSchema#boolean> .
+<http://example.com/Patient12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Patient12> <http://example.com/paid> "true"^^<http://www.w3.org/2001/XMLSchema#boolean> .
diff --git a/src/test/resources/db-tests/positive/RMLTC0016d-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0016d-PostgreSQL/resource.sql
new file mode 100644
index 00000000..3fa73e67
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0016d-PostgreSQL/resource.sql
@@ -0,0 +1,27 @@
+DROP TABLE IF EXISTS Patient;
+
+CREATE TABLE Patient (
+ID INTEGER,
+FirstName VARCHAR(50),
+LastName VARCHAR(50),
+Sex VARCHAR(6),
+Weight REAL,
+Height FLOAT,
+BirthDate DATE,
+EntranceDate TIMESTAMP,
+PaidInAdvance BOOLEAN,
+Photo BYTEA,
+PRIMARY KEY (ID)
+);
+
+INSERT INTO Patient (ID, FirstName,LastName,Sex,Weight,Height,BirthDate,EntranceDate,PaidInAdvance,Photo)
+VALUES (10,'Monica','Geller','female',80.25,1.65,'1981-10-10','2009-10-10 12:12:22',FALSE,
+'\\x89504E470D0A1A0A0000000D49484452000000050000000508060000008D6F26E50000001C4944415408D763F9FFFEBFC37F062005C3201284D031F18258CD04000EF535CBD18E0E1F0000000049454E44AE426082');
+
+INSERT INTO Patient (ID, FirstName,LastName,Sex,Weight,Height,BirthDate,EntranceDate,PaidInAdvance,Photo)
+VALUES (11,'Rachel','Green','female',70.22,1.70,'1982-11-12','2008-11-12 09:45:44',TRUE,
+'\\x89504E470D0A1A0A0000000D49484452000000050000000508060000008D6F26E50000001C4944415408D763F9FFFF3FC37F062005C3201284D031F18258CD04000EF535CBD18E0E1F0000000049454E44AE426082');
+
+INSERT INTO Patient (ID, FirstName,LastName,Sex,Weight,Height,BirthDate,EntranceDate,PaidInAdvance,Photo)
+VALUES (12,'Chandler','Bing','male',90.31,1.76,'1978-04-06','2007-03-12 02:13:14',TRUE,
+'\\x89504E470D0A1A0A0000000D49484452000000050000000508060000008D6F26E50000001C4944415408D763F9FFFEBFC37F062005C3201284D031F18258CD04000EF535CBD18E0E1F0000000049454E44AE426082');
diff --git a/src/test/resources/db-tests/positive/RMLTC0016e-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0016e-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..82dd7795
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0016e-PostgreSQL/mapping.ttl
@@ -0,0 +1,37 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+@base <http://example.com/base/> .
+
+
+<TriplesMap1>
+    a rr:TriplesMap;
+
+	rml:logicalSource [ rml:source <#DB_source>; rr:sqlVersion rr:SQL2008; rr:tableName "Patient" ];
+
+    rr:subjectMap [ rr:template "http://example.com/Patient{id}"; ];
+
+    rr:predicateObjectMap
+    [
+		rr:predicate	rdf:type;
+		rr:object		foaf:Person;
+	];
+
+    rr:predicateObjectMap
+    [
+      rr:predicate	ex:photo;
+      rr:objectMap	[ rr:template "data:image/png;hex,{photo}"; ];
+    ];
+    .
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0016e-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0016e-PostgreSQL/output.nq
new file mode 100644
index 00000000..789a3e30
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0016e-PostgreSQL/output.nq
@@ -0,0 +1,6 @@
+<http://example.com/Patient10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Patient10> <http://example.com/photo> <data:image/png;hex,89504E470D0A1A0A0000000D49484452000000050000000508060000008D6F26E50000001C4944415408D763F9FFFEBFC37F062005C3201284D031F18258CD04000EF535CBD18E0E1F0000000049454E44AE426082> .
+<http://example.com/Patient11> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Patient11> <http://example.com/photo> <data:image/png;hex,89504E470D0A1A0A0000000D49484452000000050000000508060000008D6F26E50000001C4944415408D763F9FFFF3FC37F062005C3201284D031F18258CD04000EF535CBD18E0E1F0000000049454E44AE426082> .
+<http://example.com/Patient12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Patient12> <http://example.com/photo> <data:image/png;hex,89504E470D0A1A0A0000000D49484452000000050000000508060000008D6F26E50000001C4944415408D763F9FFFEBFC37F062005C3201284D031F18258CD04000EF535CBD18E0E1F0000000049454E44AE426082> .
diff --git a/src/test/resources/db-tests/positive/RMLTC0016e-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0016e-PostgreSQL/resource.sql
new file mode 100644
index 00000000..51e63e7b
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0016e-PostgreSQL/resource.sql
@@ -0,0 +1,27 @@
+DROP TABLE IF EXISTS Patient;
+
+CREATE TABLE Patient (
+ID INTEGER,
+FirstName VARCHAR(50),
+LastName VARCHAR(50),
+Sex VARCHAR(6),
+Weight REAL,
+Height FLOAT,
+BirthDate DATE,
+EntranceDate TIMESTAMP,
+PaidInAdvance BOOLEAN,
+Photo BYTEA,
+PRIMARY KEY (ID)
+);
+
+INSERT INTO Patient (ID, FirstName,LastName,Sex,Weight,Height,BirthDate,EntranceDate,PaidInAdvance,Photo)
+VALUES (10,'Monica','Geller','female',80.25,1.65,'1981-10-10','2009-10-10 12:12:22',FALSE,
+'\x89504E470D0A1A0A0000000D49484452000000050000000508060000008D6F26E50000001C4944415408D763F9FFFEBFC37F062005C3201284D031F18258CD04000EF535CBD18E0E1F0000000049454E44AE426082');
+
+INSERT INTO Patient (ID, FirstName,LastName,Sex,Weight,Height,BirthDate,EntranceDate,PaidInAdvance,Photo)
+VALUES (11,'Rachel','Green','female',70.22,1.70,'1982-11-12','2008-11-12 09:45:44',TRUE,
+'\x89504E470D0A1A0A0000000D49484452000000050000000508060000008D6F26E50000001C4944415408D763F9FFFF3FC37F062005C3201284D031F18258CD04000EF535CBD18E0E1F0000000049454E44AE426082');
+
+INSERT INTO Patient (ID, FirstName,LastName,Sex,Weight,Height,BirthDate,EntranceDate,PaidInAdvance,Photo)
+VALUES (12,'Chandler','Bing','male',90.31,1.76,'1978-04-06','2007-03-12 02:13:14',TRUE,
+'\x89504E470D0A1A0A0000000D49484452000000050000000508060000008D6F26E50000001C4944415408D763F9FFFEBFC37F062005C3201284D031F18258CD04000EF535CBD18E0E1F0000000049454E44AE426082');
diff --git a/src/test/resources/db-tests/positive/RMLTC0018a-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0018a-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..96e5ee67
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0018a-PostgreSQL/mapping.ttl
@@ -0,0 +1,37 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+@base <http://example.com/base/> .
+
+
+<TriplesMap1>
+    a rr:TriplesMap;
+
+	rml:logicalSource [ rml:source <#DB_source>; rr:sqlVersion rr:SQL2008; rr:tableName "Student" ];
+
+    rr:subjectMap [ rr:template "http://example.com/{id}"; rr:class foaf:Person];
+
+    rr:predicateObjectMap
+    [
+      rr:predicate		ex:id ;
+      rr:objectMap		[ rml:reference "id"; ]
+    ];
+
+    rr:predicateObjectMap
+    [
+      rr:predicate		foaf:name ;
+      rr:objectMap		[ rml:reference "name" ]
+    ]
+    .
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0018a-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0018a-PostgreSQL/output.nq
new file mode 100644
index 00000000..ae8816d4
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0018a-PostgreSQL/output.nq
@@ -0,0 +1,9 @@
+<http://example.com/10> <http://xmlns.com/foaf/0.1/name> "Venus          " .
+<http://example.com/10> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/20> <http://xmlns.com/foaf/0.1/name> "Fernando       " .
+<http://example.com/20> <http://example.com/id> "20"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/20> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/30> <http://xmlns.com/foaf/0.1/name> "David          " .
+<http://example.com/30> <http://example.com/id> "30"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/30> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
diff --git a/src/test/resources/db-tests/positive/RMLTC0018a-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0018a-PostgreSQL/resource.sql
new file mode 100644
index 00000000..b2e9f677
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0018a-PostgreSQL/resource.sql
@@ -0,0 +1,9 @@
+DROP TABLE IF EXISTS Student CASCADE;
+
+CREATE TABLE Student (
+ID INTEGER,
+Name CHAR(15)
+);
+INSERT INTO Student (ID,Name) VALUES (10,'Venus');
+INSERT INTO Student (ID,Name) VALUES (20,'Fernando');
+INSERT INTO Student (ID,Name) VALUES (30,'David');
diff --git a/src/test/resources/db-tests/positive/RMLTC0019a-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0019a-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..d829cad5
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0019a-PostgreSQL/mapping.ttl
@@ -0,0 +1,39 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+     rml:source <#DB_source>;
+     rr:sqlVersion rr:SQL2008;
+     rml:query """
+        SELECT ID, FirstName, LastName
+        FROM Employee
+        WHERE ID < 30
+     """ ;
+     rml:referenceFormulation ql:CSV
+  ];
+
+  rr:subjectMap [ rml:reference "firstname" ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      rml:reference "firstname"
+    ]
+  ] .
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0019a-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0019a-PostgreSQL/output.nq
new file mode 100644
index 00000000..d07559d8
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0019a-PostgreSQL/output.nq
@@ -0,0 +1,2 @@
+<http://example.com/ns#Jhon> <http://xmlns.com/foaf/0.1/name> "http://example.com/ns#Jhon" .
+<http://example.com/base/Carlos> <http://xmlns.com/foaf/0.1/name> "Carlos" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0019a-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0019a-PostgreSQL/resource.sql
new file mode 100644
index 00000000..ae78dc8a
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0019a-PostgreSQL/resource.sql
@@ -0,0 +1,10 @@
+DROP TABLE IF EXISTS Employee;
+
+CREATE TABLE Employee (
+ID INTEGER,
+FirstName VARCHAR(50),
+LastName VARCHAR(50)
+);
+INSERT INTO Employee (ID,FirstName,LastName) VALUES (10,'http://example.com/ns#Jhon','Smith');
+INSERT INTO Employee (ID,FirstName,LastName) VALUES (20,'Carlos','Mendoza');
+INSERT INTO Employee (ID,FirstName,LastName) VALUES (30,'Juan Daniel','Crespo');
diff --git a/src/test/resources/db-tests/positive/RMLTC0019b-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0019b-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..fbed0f6d
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0019b-PostgreSQL/mapping.ttl
@@ -0,0 +1,34 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+     rml:source <#DB_source>;
+     rr:sqlVersion rr:SQL2008;
+     rr:tableName "Employee"
+  ];
+
+  rr:subjectMap [ rml:reference "firstname" ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      rml:reference "firstname"
+    ]
+  ] .
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0019b-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0019b-PostgreSQL/output.nq
new file mode 100644
index 00000000..d07559d8
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0019b-PostgreSQL/output.nq
@@ -0,0 +1,2 @@
+<http://example.com/ns#Jhon> <http://xmlns.com/foaf/0.1/name> "http://example.com/ns#Jhon" .
+<http://example.com/base/Carlos> <http://xmlns.com/foaf/0.1/name> "Carlos" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0019b-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0019b-PostgreSQL/resource.sql
new file mode 100644
index 00000000..ae78dc8a
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0019b-PostgreSQL/resource.sql
@@ -0,0 +1,10 @@
+DROP TABLE IF EXISTS Employee;
+
+CREATE TABLE Employee (
+ID INTEGER,
+FirstName VARCHAR(50),
+LastName VARCHAR(50)
+);
+INSERT INTO Employee (ID,FirstName,LastName) VALUES (10,'http://example.com/ns#Jhon','Smith');
+INSERT INTO Employee (ID,FirstName,LastName) VALUES (20,'Carlos','Mendoza');
+INSERT INTO Employee (ID,FirstName,LastName) VALUES (30,'Juan Daniel','Crespo');
diff --git a/src/test/resources/db-tests/positive/RMLTC0020a-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0020a-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..0828b134
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0020a-PostgreSQL/mapping.ttl
@@ -0,0 +1,32 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rml:    <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql:     <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "Student"
+  ];
+
+    rr:subjectMap [ rr:template "{name}"; rr:termType rr:IRI; ];
+
+    rr:predicateObjectMap
+    [
+    	rr:predicate rdf:type;
+    	rr:object foaf:Person;
+    ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "password" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0020a-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0020a-PostgreSQL/output.nq
new file mode 100644
index 00000000..65071a55
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0020a-PostgreSQL/output.nq
@@ -0,0 +1,5 @@
+<http://example.com/base/http%3A%2F%2Fexample.com%2Fcompany%2FAlice> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/base/Bob> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/base/Bob%2FCharles> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/base/path%2F..%2FDanny> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/base/Emily%20Smith> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
diff --git a/src/test/resources/db-tests/positive/RMLTC0020a-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0020a-PostgreSQL/resource.sql
new file mode 100644
index 00000000..0bee3169
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0020a-PostgreSQL/resource.sql
@@ -0,0 +1,11 @@
+DROP TABLE IF EXISTS Student;
+
+CREATE TABLE Student (
+Name VARCHAR(50)
+);
+
+INSERT INTO Student (Name) VALUES ('http://example.com/company/Alice');
+INSERT INTO Student (Name) VALUES ('Bob');
+INSERT INTO Student (Name) VALUES ('Bob/Charles');
+INSERT INTO Student (Name) VALUES ('path/../Danny');
+INSERT INTO Student (Name) VALUES ('Emily Smith');
diff --git a/src/test/resources/db-tests/positive/RMLTC0020b-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC0020b-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..20239d70
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0020b-PostgreSQL/mapping.ttl
@@ -0,0 +1,32 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rml:    <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql:     <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "Student"
+  ];
+    
+    rr:subjectMap [ rml:reference "name"; rr:termType rr:IRI; ];
+    
+    rr:predicateObjectMap 
+    [
+    	rr:predicate rdf:type;
+    	rr:object foaf:Person;
+    ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "password" .
diff --git a/src/test/resources/db-tests/positive/RMLTC0020b-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC0020b-PostgreSQL/output.nq
new file mode 100644
index 00000000..440d9a9d
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0020b-PostgreSQL/output.nq
@@ -0,0 +1,5 @@
+<http://example.com/base/Bob/Charles> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/base/Bob> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/company/Alice> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/base/path/../Danny> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+
diff --git a/src/test/resources/db-tests/positive/RMLTC0020b-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC0020b-PostgreSQL/resource.sql
new file mode 100644
index 00000000..0bee3169
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC0020b-PostgreSQL/resource.sql
@@ -0,0 +1,11 @@
+DROP TABLE IF EXISTS Student;
+
+CREATE TABLE Student (
+Name VARCHAR(50)
+);
+
+INSERT INTO Student (Name) VALUES ('http://example.com/company/Alice');
+INSERT INTO Student (Name) VALUES ('Bob');
+INSERT INTO Student (Name) VALUES ('Bob/Charles');
+INSERT INTO Student (Name) VALUES ('path/../Danny');
+INSERT INTO Student (Name) VALUES ('Emily Smith');
diff --git a/src/test/resources/db-tests/positive/RMLTC1027-PostgreSQL/mapping.ttl b/src/test/resources/db-tests/positive/RMLTC1027-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..a1b46617
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC1027-PostgreSQL/mapping.ttl
@@ -0,0 +1,37 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student";
+    rr:query "SELECT ID, Name from student";
+];
+
+  rr:subjectMap [
+    rr:template "http://example.com/{ID}/{Name}"
+  ];
+
+  rr:predicateObjectMap [
+    rr:predicate foaf:name;
+    rr:objectMap [
+      rml:reference "Name"
+    ]
+  ].
+
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/db-tests/positive/RMLTC1027-PostgreSQL/output.nq b/src/test/resources/db-tests/positive/RMLTC1027-PostgreSQL/output.nq
new file mode 100644
index 00000000..2b2b83df
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC1027-PostgreSQL/output.nq
@@ -0,0 +1,2 @@
+<http://example.com/10/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" .
+<http://example.com/12/Serena> <http://xmlns.com/foaf/0.1/name> "Serena" .
diff --git a/src/test/resources/db-tests/positive/RMLTC1027-PostgreSQL/resource.sql b/src/test/resources/db-tests/positive/RMLTC1027-PostgreSQL/resource.sql
new file mode 100644
index 00000000..37c291b1
--- /dev/null
+++ b/src/test/resources/db-tests/positive/RMLTC1027-PostgreSQL/resource.sql
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS student CASCADE ;
+CREATE TABLE student (
+  "ID" INTEGER,
+  "Name" VARCHAR(50)
+);
+INSERT INTO student values (10, 'Venus');
+INSERT INTO student values (11, NULL);
+INSERT INTO student values (12, 'Serena');
\ No newline at end of file
diff --git a/src/test/resources/failing/db-tests/negative/RMLTC0002f-PostgreSQL/mapping.ttl b/src/test/resources/failing/db-tests/negative/RMLTC0002f-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..858cb921
--- /dev/null
+++ b/src/test/resources/failing/db-tests/negative/RMLTC0002f-PostgreSQL/mapping.ttl
@@ -0,0 +1,39 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1> a rr:TriplesMap;
+
+  rml:logicalSource [
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "Student"
+  ];
+
+  rr:subjectMap [
+      rr:template "http://example.com/{ID}/{Name}";
+       rr:class foaf:Person
+    ];
+
+    rr:predicateObjectMap
+    [
+      rr:predicate		ex:id ;
+      rr:objectMap		[ rml:reference "ID";  ]
+    ];
+
+    rr:predicateObjectMap
+    [
+      rr:predicate		foaf:name ;
+      rr:objectMap		[ rml:reference "Name" ]
+    ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/failing/db-tests/negative/RMLTC0002f-PostgreSQL/resource.sql b/src/test/resources/failing/db-tests/negative/RMLTC0002f-PostgreSQL/resource.sql
new file mode 100644
index 00000000..4359797c
--- /dev/null
+++ b/src/test/resources/failing/db-tests/negative/RMLTC0002f-PostgreSQL/resource.sql
@@ -0,0 +1,6 @@
+DROP TABLE IF EXISTS Student CASCADE;
+CREATE TABLE Student (
+ID INTEGER,
+Name VARCHAR(15)
+);
+INSERT INTO Student (ID, Name) VALUES(10,'Venus');
diff --git a/src/test/resources/failing/db-tests/negative/RMLTC0004b-PostgreSQL/mapping.ttl b/src/test/resources/failing/db-tests/negative/RMLTC0004b-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..fa47e744
--- /dev/null
+++ b/src/test/resources/failing/db-tests/negative/RMLTC0004b-PostgreSQL/mapping.ttl
@@ -0,0 +1,36 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+  a rr:TriplesMap;
+    
+  rml:logicalSource [ 
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student";
+];
+
+  rr:subjectMap [ 
+    rr:template "http://example.com/{Name}";
+    rr:termType rr:Literal
+  ]; 
+	
+  rr:predicateObjectMap [ 
+    rr:predicate foaf:name; 
+    rr:objectMap [
+      rml:reference "Name"
+    ]
+  ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/failing/db-tests/negative/RMLTC0004b-PostgreSQL/resource.sql b/src/test/resources/failing/db-tests/negative/RMLTC0004b-PostgreSQL/resource.sql
new file mode 100644
index 00000000..67e5510f
--- /dev/null
+++ b/src/test/resources/failing/db-tests/negative/RMLTC0004b-PostgreSQL/resource.sql
@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS student;
+CREATE TABLE student (
+  "Name" VARCHAR(50)
+);
+INSERT INTO student values ('Venus');
diff --git a/src/test/resources/failing/db-tests/negative/RMLTC0007h-PostgreSQL/mapping.ttl b/src/test/resources/failing/db-tests/negative/RMLTC0007h-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..80438386
--- /dev/null
+++ b/src/test/resources/failing/db-tests/negative/RMLTC0007h-PostgreSQL/mapping.ttl
@@ -0,0 +1,34 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@base <http://example.com/base/> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+<TriplesMap1> a rr:TriplesMap;
+    
+  rml:logicalSource [ 
+    rml:source <#DB_source>;
+    rr:sqlVersion rr:SQL2008;
+    rr:tableName "student";
+];
+
+  rr:subjectMap [ 
+    rr:template "http://example.com/Student/{ID}/{Name}";
+    rr:graphMap [ rml:reference "Name"; rr:termType rr:Literal; ]
+  ];
+
+  rr:predicateObjectMap [ 
+    rr:predicate foaf:name;
+    rr:objectMap [
+      rml:reference "Name"
+    ]
+  ].
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/failing/db-tests/negative/RMLTC0007h-PostgreSQL/output.nq b/src/test/resources/failing/db-tests/negative/RMLTC0007h-PostgreSQL/output.nq
new file mode 100644
index 00000000..e69de29b
diff --git a/src/test/resources/failing/db-tests/negative/RMLTC0007h-PostgreSQL/resource.sql b/src/test/resources/failing/db-tests/negative/RMLTC0007h-PostgreSQL/resource.sql
new file mode 100644
index 00000000..ae695f01
--- /dev/null
+++ b/src/test/resources/failing/db-tests/negative/RMLTC0007h-PostgreSQL/resource.sql
@@ -0,0 +1,7 @@
+DROP TABLE IF EXISTS student;
+
+CREATE TABLE student (
+  "ID" INTEGER,
+  "Name" VARCHAR(50)
+);
+INSERT INTO student values ('10', 'Venus');
diff --git a/src/test/resources/failing/db-tests/positive/RMLTC0011a-PostgreSQL/mapping.ttl b/src/test/resources/failing/db-tests/positive/RMLTC0011a-PostgreSQL/mapping.ttl
new file mode 100644
index 00000000..88b8099f
--- /dev/null
+++ b/src/test/resources/failing/db-tests/positive/RMLTC0011a-PostgreSQL/mapping.ttl
@@ -0,0 +1,81 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix rml: <http://semweb.mmlab.be/ns/rml#> .
+@prefix ql: <http://semweb.mmlab.be/ns/ql#> .
+@prefix d2rq: <http://www.wiwiss.fu-berlin.de/suhl/bizer/D2RQ/0.1#> .
+
+@base <http://example.com/base/> .
+
+<TriplesMap1>
+    a rr:TriplesMap;
+
+    rml:logicalSource [ 
+       rml:source <#DB_source>;
+       rr:sqlVersion rr:SQL2008;
+       rml:query """
+       SELECT Student.ID as ID,
+              Student.FirstName as FirstName,
+              Student.LastName as LastName,
+              Sport.Description as Description,
+              Sport.ID as Sport_ID
+       FROM Student,Sport,Student_Sport
+       WHERE Student.ID = Student_Sport.ID_Student
+       AND Sport.ID = Student_Sport.ID_Sport;
+       """ ;
+       rml:referenceFormulation ql:CSV
+   ];
+
+    rr:subjectMap [ rr:template "http://example.com/{id}/{firstname};{lastname}" ];
+	
+    rr:predicateObjectMap
+    [ 
+      rr:predicate	ex:id ; 
+      rr:objectMap	[ rml:reference "id"; ]
+    ];
+
+    rr:predicateObjectMap
+    [ 
+      rr:predicate	ex:firstName ; 
+      rr:objectMap	[ rml:reference "firstname" ]
+    ];
+
+    rr:predicateObjectMap
+    [ 
+      rr:predicate	ex:lastName ; 
+      rr:objectMap	[ rml:reference "lastname" ]
+    ];
+
+    rr:predicateObjectMap
+    [ 
+      rr:predicate	ex:plays ; 
+      rr:objectMap	[ rr:template "http://example.com/{sport_id}/{description}" ]
+    ]
+    .
+
+<TriplesMap2>
+    a rr:TriplesMap;
+
+	rr:logicalTable [ rr:tableName  "Sport" ];
+	
+    rr:subjectMap [ rr:template "http://example.com/{id}/{description}"; ];
+
+    rr:predicateObjectMap
+    [ 
+      rr:predicate	ex:id ; 
+      rr:objectMap	[ rml:reference "id"; ]
+    ];
+
+    rr:predicateObjectMap
+    [ 
+      rr:predicate	ex:description ; 
+      rr:objectMap	[ rml:reference "description" ]
+    ]
+    .
+
+<#DB_source> a d2rq:Database;
+  d2rq:jdbcDSN "CONNECTIONDSN";
+  d2rq:jdbcDriver "org.postgresql.Driver";
+  d2rq:username "postgres";
+  d2rq:password "" .
diff --git a/src/test/resources/failing/db-tests/positive/RMLTC0011a-PostgreSQL/output.nq b/src/test/resources/failing/db-tests/positive/RMLTC0011a-PostgreSQL/output.nq
new file mode 100644
index 00000000..8d0bda97
--- /dev/null
+++ b/src/test/resources/failing/db-tests/positive/RMLTC0011a-PostgreSQL/output.nq
@@ -0,0 +1,20 @@
+<http://example.com/110/Tennis> <http://example.com/description> "Tennis" .
+<http://example.com/110/Tennis> <http://example.com/id> "110"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/10/Venus;Williams> <http://example.com/plays> <http://example.com/110/Tennis> .
+<http://example.com/10/Venus;Williams> <http://example.com/lastName> "Williams" .
+<http://example.com/10/Venus;Williams> <http://example.com/firstName> "Venus" .
+<http://example.com/10/Venus;Williams> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/111/Football> <http://example.com/description> "Football" .
+<http://example.com/111/Football> <http://example.com/id> "111"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/12/David;Villa> <http://example.com/plays> <http://example.com/111/Football> .
+<http://example.com/12/David;Villa> <http://example.com/lastName> "Villa" .
+<http://example.com/12/David;Villa> <http://example.com/firstName> "David" .
+<http://example.com/12/David;Villa> <http://example.com/id> "12"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/112/Formula1> <http://example.com/description> "Formula1" .
+<http://example.com/112/Formula1> <http://example.com/id> "112"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/11/Fernando;Alonso> <http://example.com/lastName> "Alonso" .
+<http://example.com/11/Fernando;Alonso> <http://example.com/firstName> "Fernando" .
+<http://example.com/11/Fernando;Alonso> <http://example.com/id> "11"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/11/Fernando;Alonso> <http://example.com/plays> <http://example.com/111/Football> .
+<http://example.com/11/Fernando;Alonso> <http://example.com/plays> <http://example.com/112/Formula1> .
+
diff --git a/src/test/resources/failing/db-tests/positive/RMLTC0011a-PostgreSQL/resource.sql b/src/test/resources/failing/db-tests/positive/RMLTC0011a-PostgreSQL/resource.sql
new file mode 100644
index 00000000..a256aa31
--- /dev/null
+++ b/src/test/resources/failing/db-tests/positive/RMLTC0011a-PostgreSQL/resource.sql
@@ -0,0 +1,33 @@
+DROP TABLE IF EXISTS Student_Sport;
+DROP TABLE IF EXISTS Sport CASCADE;
+DROP TABLE IF EXISTS Student;
+
+CREATE TABLE Student (
+ID integer PRIMARY KEY,
+FirstName varchar(50),
+LastName varchar(50)
+);
+CREATE TABLE Sport (
+ID integer PRIMARY KEY,
+Description varchar(50)
+);
+CREATE TABLE Student_Sport (
+ID_Student integer,
+ID_Sport integer,
+PRIMARY KEY (ID_Student,ID_Sport),
+FOREIGN KEY (ID_Student) REFERENCES Student(ID),
+FOREIGN KEY (ID_Sport) REFERENCES Sport(ID)
+);
+
+INSERT INTO Student (ID,FirstName,LastName) VALUES (10,'Venus', 'Williams');
+INSERT INTO Student (ID,FirstName,LastName) VALUES (11,'Fernando', 'Alonso');
+INSERT INTO Student (ID,FirstName,LastName) VALUES (12,'David', 'Villa');
+
+INSERT INTO Sport (ID, Description) VALUES (110,'Tennis');
+INSERT INTO Sport (ID, Description) VALUES (111,'Football');
+INSERT INTO Sport (ID, Description) VALUES (112,'Formula1');
+
+INSERT INTO Student_Sport (ID_Student, ID_Sport) VALUES (10,110);
+INSERT INTO Student_Sport (ID_Student, ID_Sport) VALUES (11,111);
+INSERT INTO Student_Sport (ID_Student, ID_Sport) VALUES (11,112);
+INSERT INTO Student_Sport (ID_Student, ID_Sport) VALUES (12,111);
diff --git a/src/test/resources/rml-testcases/RMLTC0002c-CSV/mapping.ttl b/src/test/resources/rml-testcases-negative/RMLTC0007h-CSV/mapping.ttl
similarity index 70%
rename from src/test/resources/rml-testcases/RMLTC0002c-CSV/mapping.ttl
rename to src/test/resources/rml-testcases-negative/RMLTC0007h-CSV/mapping.ttl
index 144f3850..e1aaa325 100644
--- a/src/test/resources/rml-testcases/RMLTC0002c-CSV/mapping.ttl
+++ b/src/test/resources/rml-testcases-negative/RMLTC0007h-CSV/mapping.ttl
@@ -14,11 +14,13 @@
   ];
 
   rr:subjectMap [ 
-    rr:template "http://example.com/{ID}/{Name}"; 
+    rr:template "http://example.com/Student/{ID}/{Name}";
+    rr:graphMap [ rml:reference "Name"; rr:termType rr:Literal; ]
   ];
 
   rr:predicateObjectMap [ 
-    rr:predicate ex:id ; 
-    rr:objectMap [ rml:reference "IDs" ]
+    rr:predicate foaf:name;
+    rr:objectMap [
+      rml:reference "Name"
+    ]
   ].
-
diff --git a/src/test/resources/rml-testcases-negative/RMLTC0007h-CSV/output.nq b/src/test/resources/rml-testcases-negative/RMLTC0007h-CSV/output.nq
new file mode 100644
index 00000000..e69de29b
diff --git a/src/test/resources/rml-testcases/RMLTC0002c-CSV/student.csv b/src/test/resources/rml-testcases-negative/RMLTC0007h-CSV/student.csv
similarity index 100%
rename from src/test/resources/rml-testcases/RMLTC0002c-CSV/student.csv
rename to src/test/resources/rml-testcases-negative/RMLTC0007h-CSV/student.csv
diff --git a/src/test/scala/io/rml/framework/DBTestSync.scala b/src/test/scala/io/rml/framework/DBTestSync.scala
new file mode 100644
index 00000000..2d761da7
--- /dev/null
+++ b/src/test/scala/io/rml/framework/DBTestSync.scala
@@ -0,0 +1,35 @@
+package io.rml.framework
+
+import io.rml.framework.containers.PostgresContainer
+import io.rml.framework.util.server.TestData
+
+import scala.concurrent.ExecutionContextExecutor
+
+class DBTestSync extends StreamTestSync {
+  var container: PostgresContainer = _
+
+  override def setup(): Unit = {
+    super.setup()
+    container = new PostgresContainer()
+    container.start()
+  }
+
+  override protected def passingTests: Array[(String, String)] = Array((s"$testFolder/positive", "noopt"))
+
+  override protected def failingTests: Array[(String, String)] = Array((s"$testFolder/negative", "noopt"))
+
+  override protected def testFolder = "db-tests"
+
+  override protected def beforeTestCase(testCaseName: String): Unit = {
+    container.executeScript(s"${testCaseName}/resource.sql")
+  }
+
+  override protected def afterTestCase(testCaseName: String): Unit = {}
+
+  override protected def teardown(): Unit = {
+    container.stop()
+  };
+
+  override protected def writeData(input: List[TestData])(implicit executor: ExecutionContextExecutor): Unit = {}
+}
+
diff --git a/src/test/scala/io/rml/framework/KafkaStreamTestSync.scala b/src/test/scala/io/rml/framework/KafkaStreamTestSync.scala
index 02f2b747..708330f4 100644
--- a/src/test/scala/io/rml/framework/KafkaStreamTestSync.scala
+++ b/src/test/scala/io/rml/framework/KafkaStreamTestSync.scala
@@ -52,6 +52,7 @@ class KafkaStreamTestSync extends StreamTestSync {
     (testFolder, "noopt"),                // standard streaming tests
     ("stream/kafka_json_ld", "json-ld")   // test with json-ld as output
   )
+  override protected def failingTests: Array[(String, String)] = Array()
 
   override def setup(): Unit = {
     super.setup()
@@ -77,7 +78,11 @@ class KafkaStreamTestSync extends StreamTestSync {
     logInfo("Creating Kafka client created.")
   }
 
-  override def afterTestCase(): Unit = {
+  override protected def beforeTestCase(testCaseName: String): Unit = {
+
+  }
+
+  override def afterTestCase(testCaseName: String): Unit = {
     logInfo("Deleting Kafka input topic(s)...")
     val topics = admin.listTopics().names().get()
     val deleteResults = admin.deleteTopics(topics)
diff --git a/src/test/scala/io/rml/framework/KafkaStreamTestSyncFnO.scala b/src/test/scala/io/rml/framework/KafkaStreamTestSyncFnO.scala
index 3b4eee34..ed0fd8ca 100644
--- a/src/test/scala/io/rml/framework/KafkaStreamTestSyncFnO.scala
+++ b/src/test/scala/io/rml/framework/KafkaStreamTestSyncFnO.scala
@@ -30,6 +30,6 @@ class KafkaStreamTestSyncFnO extends KafkaStreamTestSync {
 
   override def passingTests: Array[(String, String)] = Array(
     (testFolder, "noopt")
-
   )
+  override protected def failingTests: Array[(String, String)] = Array()
 }
diff --git a/src/test/scala/io/rml/framework/MQTTStreamTests.scala b/src/test/scala/io/rml/framework/MQTTStreamTests.scala
index ef62dbe5..6e16580d 100644
--- a/src/test/scala/io/rml/framework/MQTTStreamTests.scala
+++ b/src/test/scala/io/rml/framework/MQTTStreamTests.scala
@@ -75,14 +75,15 @@ class MQTTStreamTests extends StreamTestSync {
   override protected def passingTests: Array[(String, String)] = Array(
     (testFolder, "noopt")
   )
+  override protected def failingTests: Array[(String, String)] = Array()
 
   override protected def testFolder: String = "sandbox/stream/mqtt"
 
-  override protected def beforeTestCase(): Unit = {
+  override protected def beforeTestCase(testCaseName: String): Unit = {
     logInfo("before test case")
   }
 
-  override protected def afterTestCase(): Unit = {
+  override protected def afterTestCase(testCaseName: String): Unit = {
     logInfo("after test case")
   }
 
diff --git a/src/test/scala/io/rml/framework/OutputGenerationTest.scala b/src/test/scala/io/rml/framework/OutputGenerationTest.scala
index c7600828..dad37a11 100644
--- a/src/test/scala/io/rml/framework/OutputGenerationTest.scala
+++ b/src/test/scala/io/rml/framework/OutputGenerationTest.scala
@@ -137,10 +137,11 @@ class OutputGenerationTest extends StaticTestSpec with ReadMappingBehaviour with
     */
   def checkGeneratedOutput(testFolderPath: String, shouldPass: Boolean)(implicit postProcessor: PostProcessor): Unit = {
     Logger.logInfo("checkGeneratedOutput(%s)".format(testFolderPath))
-    val (expectedOutput, expectedOutputFormat) = ExpectedOutputTestUtil.processFilesInTestFolder(testFolderPath).head
-    val tester = TripleGeneratorTestUtil(postProcessor)
     try {
-      var (generatedOutput, generatedOutputFormat) = tester.processFilesInTestFolder(testFolderPath).head
+      val (expectedOutput, expectedOutputFormat) = ExpectedOutputTestUtil.processFilesInTestFolder(testFolderPath).head
+      val tester = TripleGeneratorTestUtil(postProcessor)
+
+      val (generatedOutput, generatedOutputFormat) = tester.processFilesInTestFolder(testFolderPath).head
       val outcome = TestUtil.compareResults(testFolderPath, generatedOutput, expectedOutput, generatedOutputFormat, expectedOutputFormat)
       outcome match {
         case Left(e) => {
diff --git a/src/test/scala/io/rml/framework/StreamTestSync.scala b/src/test/scala/io/rml/framework/StreamTestSync.scala
index c7633a51..abd22739 100644
--- a/src/test/scala/io/rml/framework/StreamTestSync.scala
+++ b/src/test/scala/io/rml/framework/StreamTestSync.scala
@@ -52,13 +52,31 @@ import scala.reflect.io.Directory
   */
 abstract class StreamTestSync extends StaticTestSpec with ReadMappingBehaviour with Logging {
 
-  // first we set the environment right
-  RMLEnvironment.setGeneratorBaseIRI(Some("http://example.com/base/"))
 
+  // constants for running tests
+  // folder containing the test cases
   protected def testFolder: String
 
   // tuples (folder of test data, post processor to use)
+  // when utilising both passing and failing tests, specify the folder relative to the testFolder above
   protected def passingTests: Array[(String, String)]
+  protected def failingTests: Array[(String, String)]
+
+  // first we set the environment right
+  RMLEnvironment.setGeneratorBaseIRI(Some("http://example.com/base/"))
+  // set up Flink
+  val flink: MiniCluster = startFlink
+
+  // read in the test cases
+  val passingTestCases: Array[(Path, String)] = for {
+    (folder, postProcessor) <- passingTests
+    testCase <- StreamDataSourceTestUtil.getTestCaseFolders(folder).sorted
+  } yield (testCase, postProcessor)
+
+  val failingTestCases: Array[(Path, String)] = for {
+    (folder, postProcessor) <- failingTests
+    testCase <- StreamDataSourceTestUtil.getTestCaseFolders(folder).sorted
+  } yield (testCase, postProcessor)
 
   // set up things necessary before running actual tests
   def setup(): Unit = {
@@ -74,52 +92,18 @@ abstract class StreamTestSync extends StaticTestSpec with ReadMappingBehaviour w
   }
 
   // Things to do before running one test case
-  protected def beforeTestCase(): Unit = {}
+  protected def beforeTestCase(testCaseName: String): Unit
 
   // Things to do after running one test case
-  protected def afterTestCase(): Unit
-
-  // tear down
-  protected def teardown(): Unit
-
-  // write data to flink via subclass (Kafka, TCP, ...)
-  protected def writeData(input: List[TestData])(implicit executor: ExecutionContextExecutor)
-
-  // turn the folder + post processor data into test cases
-  logInfo(s"==== Starting ${this.getClass.getSimpleName} ====")
-
-  // check mapping files
-  "A streamer mapping reader" should behave like validMappingFile(testFolder)
-
-  // run setup of subclass
-  setup()
+  protected def afterTestCase(testCaseName: String): Unit
 
-  // set up Flink
-  val flink: MiniCluster = startFlink
-
-  logInfo("Reading test cases")
-  val testCases: Array[(Path, String)] = for {
-    (folder, postProcessor) <- passingTests
-    testCase <- StreamDataSourceTestUtil.getTestCaseFolders(folder).sorted
-  } yield (testCase, postProcessor)
-
-  implicit val env: ExecutionEnvironment = ExecutionEnvironment.getExecutionEnvironment
-  implicit val senv: StreamExecutionEnvironment = StreamExecutionEnvironment.getExecutionEnvironment
-  FunctionsFlinkUtil.putFunctionFilesInFlinkCache(env.getJavaEnv, senv.getJavaEnv,
-    "functions_grel.ttl",
-    "grel_java_mapping.ttl",
-    "fno/functions_idlab.ttl",
-    "fno/functions_idlab_test_classes_java_mapping.ttl"
-  )
-
-  // run the test cases
-  for ((folderPath, postProcessorName) <- testCases) {
+  def executeTest(folderPath: Path, postProcessorName: String, shouldPass: Boolean): Unit = {
     NodeCache.clear();
 
     //it should s"produce triples equal to the expected triples for ${folderPath.getFileName}" in {
     Logger.lineBreak(50)
     logInfo(s"Running test ${folderPath}")
-    beforeTestCase()
+    beforeTestCase(folderPath.toString)
 
     implicit val postProcessor: PostProcessor = TestUtil.pickPostProcessor(postProcessorName)
     val folder = Util.getFile(folderPath.toString)
@@ -127,7 +111,15 @@ abstract class StreamTestSync extends StaticTestSpec with ReadMappingBehaviour w
     implicit val executor: ExecutionContextExecutor = ExecutionContext.fromExecutor(Executors.newCachedThreadPool())
 
     // create data stream and sink
-    val dataStream = StreamTestUtil.createDataStream(folder)
+    val dataStream: DataStream[String] = this match {
+      // if executing DB tests, inject the URL of the database provided by the container defined in the test class
+      case sync: DBTestSync =>
+        val dbURL = sync.container.getURL
+        StreamTestUtil.createDataStreamDB(folder, dbURL)
+      case _ =>
+        StreamTestUtil.createDataStream(folder)
+    }
+
     Logger.logInfo("Datastream created")
     val sink = TestSink2()
     Logger.logInfo("sink created")
@@ -162,47 +154,95 @@ abstract class StreamTestSync extends StaticTestSpec with ReadMappingBehaviour w
     // delete Flink Job
     deleteJob(flink, jobId)
 
-    afterTestCase()
+    afterTestCase(folderPath.toString)
 
-    // check the results
-    val either = TestUtil.compareResults(folderPath.toString, resultTriples, expectedOutput, postProcessor.outputFormat, expectedOutputFormat)
-    either match {
-      case Left(e) => fail(e)
-      case Right(e) => {
-        logInfo(e)
+    val exitStatus = flink.getJobStatus(jobId).get()
+    deleteJob(flink, jobId)
+    afterTestCase(folderPath.toString)
+
+    if (!shouldPass) {
+      if (exitStatus != JobStatus.FAILED) {
+        Logger.logError(s"Job exited with status ${exitStatus}")
+        fail();
       }
-    }
+    } else {
 
-    it should s"produce triples equal to the expected triples for ${folderPath.toString}" in {
+      // check the results
+      val either = TestUtil.compareResults(folderPath.toString, resultTriples, expectedOutput, postProcessor.outputFormat, expectedOutputFormat)
       either match {
         case Left(e) => fail(e)
-        case Right(e) => {
-          logInfo(e)
-          succeed
-        }
+        case Right(e) => logInfo(e)
       }
     }
   }
 
-  // run teardown of subclass
-  teardown()
+  private def submitJob[T](flink: MiniCluster, dataStream: DataStream[T], name: String): JobID = {
+    logInfo(s"Submitting job ${name} to Flink...")
+    val graph = dataStream.executionEnvironment.getStreamGraph
+    graph.setJobName(name)
+    val jobGraph: JobGraph = graph.getJobGraph
+    flink.runDetached(jobGraph)
+    val jobId = jobGraph.getJobID
+    logInfo(s"Job submitted, ID: ${jobId}. Waiting for it to run.")
 
-  /////////////////////////
-  // some helper methods //
-  /////////////////////////
-  protected def getTempDir: File = {
-    val file = Paths.get(System.getProperty("java.io.tmpdir"), "rml-streamer", this.getClass.getSimpleName).toFile
-    if (!file.exists()) {
-      file.mkdir()
+    while (!flink.getJobStatus(jobId).get().equals(JobStatus.RUNNING)
+      && !flink.getJobStatus(jobId).get().equals(JobStatus.FINISHED)
+      && !flink.getJobStatus(jobId).get().equals(JobStatus.FAILED)
+      && !flink.getJobStatus(jobId).get().equals(JobStatus.CANCELED)) {
+      Thread.sleep(500)
+      logInfo(s"Waiting for Flink job to start... Status: ${flink.getJobStatus(jobId).get().name()}")
     }
-    logInfo(s"Temp folder: ${file.toString}")
-    file
+    Thread.sleep(500)
+    logInfo("Flink job started.")
+    jobId
   }
 
-  override def logInfo(log: String) {
-    Logger.logInfo(s"${getClass.getSimpleName}: ${log}")
+  private def deleteJob(flink: MiniCluster, jobId: JobID): Unit = {
+    logInfo(s"Canceling job ${jobId}...")
+    try {
+      flink.cancelJob(jobId).get()
+    } catch {
+      case e: ExecutionException => logInfo("Flink job already stopped.")
+    }
+    Thread.sleep(1000) // also here: even waiting for the future to complete doesn't guarantee that it's completed!
+    logInfo(s"Job ${jobId} canceled.")
+  }
+
+  // turn the folder + post processor data into test cases
+  logInfo(s"==== Starting ${this.getClass.getSimpleName} ====")
+
+  // check mapping files
+  "A streamer mapping reader" should behave like validMappingFile(testFolder)
+
+  // run setup of subclass
+  setup()
+
+  implicit val env: ExecutionEnvironment = ExecutionEnvironment.getExecutionEnvironment
+  implicit val senv: StreamExecutionEnvironment = StreamExecutionEnvironment.getExecutionEnvironment
+  FunctionsFlinkUtil.putFunctionFilesInFlinkCache(env.getJavaEnv, senv.getJavaEnv,
+    "functions_grel.ttl",
+    "grel_java_mapping.ttl",
+    "fno/functions_idlab.ttl",
+    "fno/functions_idlab_test_classes_java_mapping.ttl"
+  )
+
+  // run the test cases
+  for ((folderPath, postProcessorName) <- passingTestCases) {
+    executeTest(folderPath, postProcessorName, shouldPass = true)
   }
 
+  for ((folderPath, postProcessorName) <- failingTestCases) {
+    executeTest(folderPath, postProcessorName, shouldPass = false)
+  }
+
+  // run teardown of subclass
+  teardown()
+
+  protected def teardown(): Unit
+
+  // write data to flink via subclass (Kafka, TCP, ...)
+  protected def writeData(input: List[TestData])(implicit executor: ExecutionContextExecutor)
+
   private def startFlink: MiniCluster = {
     logInfo("Starting Flink...")
     val customConfig = new Configuration()
@@ -221,32 +261,19 @@ abstract class StreamTestSync extends StaticTestSpec with ReadMappingBehaviour w
     flink
   }
 
-  private def submitJob[T](flink: MiniCluster, dataStream: DataStream[T], name: String): JobID = {
-    logInfo(s"Submitting job ${name} to Flink...")
-    val graph = dataStream.executionEnvironment.getStreamGraph
-    graph.setJobName(name)
-    val jobGraph: JobGraph = graph.getJobGraph
-    flink.runDetached(jobGraph)
-    val jobId = jobGraph.getJobID
-    logInfo(s"Job submitted, ID: ${jobId}. Waiting for it to run.")
-
-    while (!flink.getJobStatus(jobId).get().equals(JobStatus.RUNNING)) {
-      Thread.sleep(1000)
-      logInfo("Waiting for Flink job to start...")
+  /////////////////////////
+  // some helper methods //
+  /////////////////////////
+  protected def getTempDir: File = {
+    val file = Paths.get(System.getProperty("java.io.tmpdir"), "rml-streamer", this.getClass.getSimpleName).toFile
+    if (!file.exists()) {
+      file.mkdir()
     }
-    Thread.sleep(1000)
-    logInfo("Flink job started.")
-    jobId
+    logInfo(s"Temp folder: ${file.toString}")
+    file
   }
 
-  private def deleteJob(flink: MiniCluster, jobId: JobID): Unit = {
-    logInfo(s"Canceling job ${jobId}...")
-    try {
-      flink.cancelJob(jobId).get()
-    } catch {
-      case e: ExecutionException => logInfo("Flink job already stopped.")
-    }
-    Thread.sleep(1000)  // also here: even waiting for the future to complete doesn't guarantee that it's completed!
-    logInfo(s"Job ${jobId} canceled.")
+  override def logInfo(log: String) {
+    Logger.logInfo(s"${getClass.getSimpleName}: ${log}")
   }
-}
+}
\ No newline at end of file
diff --git a/src/test/scala/io/rml/framework/TCPStreamTestSync.scala b/src/test/scala/io/rml/framework/TCPStreamTestSync.scala
index bf95b3c0..63771f24 100644
--- a/src/test/scala/io/rml/framework/TCPStreamTestSync.scala
+++ b/src/test/scala/io/rml/framework/TCPStreamTestSync.scala
@@ -40,6 +40,7 @@ class TCPStreamTestSync extends StreamTestSync {
   override def passingTests: Array[(String, String)] = Array(
     (testFolder, "noopt")
   )
+  override protected def failingTests: Array[(String, String)] = Array()
 
 
   override def setup(): Unit = {
@@ -49,9 +50,9 @@ class TCPStreamTestSync extends StreamTestSync {
     serverThread.start()
   }
 
-  override def beforeTestCase(): Unit = {}
+  override def beforeTestCase(testCaseName: String): Unit = {}
 
-  override def afterTestCase(): Unit = {}
+  override def afterTestCase(testCaseName: String): Unit = {}
 
   override def teardown(): Unit = {
     Logger.logInfo("Stopping TCP server")
diff --git a/src/test/scala/io/rml/framework/WebSocketStreamTestSync.scala b/src/test/scala/io/rml/framework/WebSocketStreamTestSync.scala
index 304a10c0..5491b6e0 100644
--- a/src/test/scala/io/rml/framework/WebSocketStreamTestSync.scala
+++ b/src/test/scala/io/rml/framework/WebSocketStreamTestSync.scala
@@ -36,6 +36,7 @@ class WebSocketStreamTestSync extends StreamTestSync {
   override protected def passingTests: Array[(String, String)] = Array(
     (testFolder, "noopt")
   )
+  override protected def failingTests: Array[(String, String)] = Array()
 
 
   override def setup(): Unit = {
@@ -45,11 +46,11 @@ class WebSocketStreamTestSync extends StreamTestSync {
     server.start()
   }
 
-  override protected def beforeTestCase(): Unit = {
+  override protected def beforeTestCase(testCaseName: String): Unit = {
     logInfo("before test case")
   }
 
-  override protected def afterTestCase(): Unit = {
+  override protected def afterTestCase(testCaseName: String): Unit = {
     logInfo("after test case")
   }
 
diff --git a/src/test/scala/io/rml/framework/engine/EngineTest.scala b/src/test/scala/io/rml/framework/engine/EngineTest.scala
index 4ef3775b..67c1c468 100644
--- a/src/test/scala/io/rml/framework/engine/EngineTest.scala
+++ b/src/test/scala/io/rml/framework/engine/EngineTest.scala
@@ -38,6 +38,8 @@ class EngineTest extends FunSuite with Matchers {
     }
 
     override def tag: String = ""
+
+    override def getDataTypes: Map[String, String] = Map.empty
   }
 
   test("testProcessTemplate") {
diff --git a/src/test/scala/io/rml/framework/util/StreamTestUtil.scala b/src/test/scala/io/rml/framework/util/StreamTestUtil.scala
index f9d4103f..e1696d30 100644
--- a/src/test/scala/io/rml/framework/util/StreamTestUtil.scala
+++ b/src/test/scala/io/rml/framework/util/StreamTestUtil.scala
@@ -26,8 +26,8 @@ package io.rml.framework.util
 
 import java.io.File
 import java.util.concurrent.CompletableFuture
-
 import io.rml.framework.Main
+import io.rml.framework.core.model.DatabaseSource
 import io.rml.framework.engine.PostProcessor
 import io.rml.framework.util.fileprocessing.MappingTestUtil
 import io.rml.framework.util.logging.Logger
@@ -46,7 +46,7 @@ import scala.concurrent.{ExecutionContextExecutor, Future}
 object StreamTestUtil {
 
   /**
-    * Create a data stream from mapping file in de specified test case folder.
+    * Create a data stream from mapping file in the specified test case folder.
     * The method won't run it yet as a job in flink cluster.
     *
     * This is used to generate and obtain job graphs which will be used by the
@@ -65,6 +65,29 @@ object StreamTestUtil {
     stream
   }
 
+  /**
+   * Create a data stream from mapping file in the specified test case folder.
+   * This method won't run it yet as a job in the Flink cluster.
+   *
+   * The URL for the database is injected into the logical sources of all maps before the stream is created.
+   * @param testCaseFolder
+   */
+  def createDataStreamDB(testCaseFolder: File, dbURL: String)(implicit senv: StreamExecutionEnvironment,
+                                                              env: ExecutionEnvironment,
+                                                              postProcessor: PostProcessor) : DataStream[String] = {
+    val formattedMapping = MappingTestUtil.processFilesInTestFolder(testCaseFolder.getAbsolutePath)
+    for (map <- formattedMapping.head.triplesMaps) {
+      map.logicalSource.source match {
+        case source: DatabaseSource =>
+          source.setURL(dbURL)
+        case _ =>
+      }
+    }
+
+    val stream = Main.createDataStreamFromFormattedMapping(formattedMapping.head)
+    stream
+  }
+
   /**
     * Cancels a job with the given JobID in the cluster.
     *
diff --git a/src/test/scala/io/rml/framework/util/fileprocessing/TripleGeneratorTestUtil.scala b/src/test/scala/io/rml/framework/util/fileprocessing/TripleGeneratorTestUtil.scala
index 1440bf9a..1cf28c12 100644
--- a/src/test/scala/io/rml/framework/util/fileprocessing/TripleGeneratorTestUtil.scala
+++ b/src/test/scala/io/rml/framework/util/fileprocessing/TripleGeneratorTestUtil.scala
@@ -57,35 +57,63 @@ object TripleGeneratorTestUtil extends TestFilesUtil[(List[String], Format)] {
 
 
   /**
-    * Process the given mapping file and return a list of string containing triples generated
-    * by the mapping process.
-    *
-    * @param file file containing triple maps
-    * @return list of triples generated by processing the mapping file
-    */
-   def processFile(file: File): (List[String], Format) = {
-     try {
-       NodeCache.clear();
-
-       val formattedMapping = Util.readMappingFile(file.getCanonicalPath)
-       val dataSet = Main.createDataSetFromFormattedMapping(formattedMapping).collect
-
-       // we assume quads, since we don't use a post processor
-       val format = NQuads
-       val result = if (dataSet.nonEmpty) dataSet.reduce((a, b) => a + "\n" + b) else ""
-       Logger.logInfo("Input file: " + file)
-       Logger.logInfo("Result from processing: " + result.length)
-       if (result.nonEmpty) {
-         (result.split('\n').toList, format)
-       } else {
-         (List(), format)
-       }
-     }catch{
-       case e: Throwable => {
-         Logger.logError(s"Processing ${file.getName} FAILED!", e)
-         throw e
-       }
-     }
+   * Process the given mapping file into a DataSet and return a list of string containing triples generated
+   * by the mapping process.
+   *
+   * @param file file containing triple maps
+   * @return list of triples generated by processing the mapping file
+   */
+  def processFile(file: File): (List[String], Format) = {
+    try {
+      NodeCache.clear();
+
+      val formattedMapping = Util.readMappingFile(file.getCanonicalPath)
+      val dataSet = Main.createDataSetFromFormattedMapping(formattedMapping).collect
+
+      // we assume quads, since we don't use a post processor
+      val format = NQuads
+      val result = if (dataSet.nonEmpty) dataSet.reduce((a, b) => a + "\n" + b) else ""
+      Logger.logInfo("Input file: " + file)
+      Logger.logInfo("Result from processing: " + result.length)
+      if (result.nonEmpty) {
+        (result.split('\n').toList, format)
+      } else {
+        (List(), format)
+      }
+    } catch {
+      case e: Throwable => {
+        Logger.logError(s"Processing ${file.getName} FAILED!", e)
+        throw e
+      }
+    }
+  }
+
+  /**
+   * Process the given mapping file into a DataStream and return a list of strings containing the triples generated
+   *
+   * @param file file containing the triple maps
+   * @return a list of triples generated by processing the mapping file as a stream
+   */
+  def processFileDataStream(file: File): (List[String], Format) = {
+    try {
+      NodeCache.clear()
+
+      val format = NQuads
+      val formattedMapping = Util.readMappingFile(file.getCanonicalPath)
+      val dataStream = Main.createDataStreamFromFormattedMapping(formattedMapping)
+
+      val result = dataStream.executeAndCollect().toList
+
+      if (result.nonEmpty) {
+        (result, format)
+      } else {
+        (List(), format)
+      }
+    } catch {
+      case e: Throwable =>
+        Logger.logError(s"Processing ${file.getName} FAILED!", e)
+        throw e
+    }
   }
 
 }