diff --git a/cmake/CodeGen.cmake b/cmake/CodeGen.cmake
index 7dac354..b785254 100644
--- a/cmake/CodeGen.cmake
+++ b/cmake/CodeGen.cmake
@@ -88,6 +88,10 @@ if(ENABLE_CODEGEN AND EXISTS ${GENERATOR_JAR})
                 BYPRODUCTS ${${CORE_NAME}_OUTPUT_FILES}
                 USES_TERMINAL
             )
+            execute_process(
+                COMMAND ${GENERATOR} -b ${BE_UPPER} -c ${CORE_NAME} -r ${REPO_DIR} ${${CORE_NAME}_MAPPING} ${INPUT_FILE}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+                RESULT_VARIABLE return_code)
     	endmacro()
 else()
 	macro(gen_coredsl CORE_NAME INPUT_FILE BACKEND)
diff --git a/dbt-core b/dbt-core
index 3841cdb..3eb12db 160000
--- a/dbt-core
+++ b/dbt-core
@@ -1 +1 @@
-Subproject commit 3841cdb5d95038370e7394fcad133411f75f5e15
+Subproject commit 3eb12db110858534bc99280454a33ed54a74e4e8
diff --git a/tgfs b/tgfs
index d0f3a12..da819d8 160000
--- a/tgfs
+++ b/tgfs
@@ -1 +1 @@
-Subproject commit d0f3a120fdc87c8d675dac9f3b0170243113c804
+Subproject commit da819d8890953a57393c898d12401f454c7c4485