chore(CI): Test with full null support

coldbox-modules · Sep 9, 2021 · 98b0df9 · 98b0df9
1 parent 13debdd
commit 98b0df9
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 8 deletions.
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
@@ -14,6 +14,7 @@ jobs:
         cfengine: ["lucee@5", "lucee@be", "adobe@2016", "adobe@2018", "adobe@be"]
         coldbox: ["coldbox@5", "coldbox@6", "coldbox@be"]
         javaVersion: ["openjdk8", "openjdk11"]
+        fullNull: ["true", "false"]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
@@ -35,4 +36,6 @@ jobs:
         run: box server start cfengine=${{ matrix.cfengine }} javaVersion=${{ matrix.javaVersion }} --noSaveSettings
 
       - name: Run TestBox Tests
+        env:
+          FULL_NULL: ${{matrix.fullNull}}
         run: box testbox run
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -21,6 +21,7 @@ jobs:
       matrix:
         cfengine: ["lucee@5", "adobe@2016", "adobe@2018"]
         coldbox: ["coldbox@5", "coldbox@6"]
+        fullNull: ["true", "false"]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
@@ -42,6 +43,8 @@ jobs:
         run: box server start cfengine=${{ matrix.cfengine }} --noSaveSettings
 
       - name: Run TestBox Tests
+        env:
+          FULL_NULL: ${{matrix.fullNull}}
         run: box testbox run
 
   format:

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -15,6 +15,7 @@ jobs:
       matrix:
         cfengine: ["lucee@5", "adobe@2016", "adobe@2018"]
         coldbox: ["coldbox@5", "coldbox@6"]
+        fullNull: ["true", "false"]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
@@ -36,6 +37,8 @@ jobs:
         run: box server start cfengine=${{ matrix.cfengine }} --noSaveSettings
 
       - name: Run TestBox Tests
+        env:
+          FULL_NULL: ${{matrix.fullNull}}
         run: box testbox run
 
   # release:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,6 +16,7 @@ jobs:
       matrix:
         cfengine: ["lucee@5", "adobe@2016", "adobe@2018"]
         coldbox: ["coldbox@5", "coldbox@6"]
+        fullNull: ["true", "false"]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
@@ -37,6 +38,8 @@ jobs:
         run: box server start cfengine=${{ matrix.cfengine }} --noSaveSettings
 
       - name: Run TestBox Tests
+        env:
+          FULL_NULL: ${{matrix.fullNull}}
         run: box testbox run
 
   release:

diff --git a/box.json b/box.json
@@ -36,7 +36,7 @@
         "cbpaginator":"^2.4.0"
     },
     "devDependencies":{
-        "testbox":"^3.0.0"
+        "testbox":"be"
     },
     "installPaths":{
         "testbox":"testbox/",

diff --git a/models/Grammars/BaseGrammar.cfc b/models/Grammars/BaseGrammar.cfc
@@ -242,7 +242,7 @@ component displayname="Grammar" accessors="true" singleton {
      * @return string
      */
     private string function compileFrom( required QueryBuilder query, required any from ) {
-        return "FROM " & wrapTable( from );
+        return "FROM " & wrapTable( arguments.from );
     }
 
     /**

diff --git a/models/Grammars/SqlServerGrammar.cfc b/models/Grammars/SqlServerGrammar.cfc
@@ -1,4 +1,4 @@
-component extends="qb.models.Grammars.BaseGrammar" singleton {
+component extends="qb.models.Grammars.BaseGrammar" singleton accessors="true" {
 
     /**
      * The parameter limit for SQL Server grammar.

diff --git a/tests/Application.cfc b/tests/Application.cfc
@@ -1,6 +1,15 @@
 component {
+
+    this.enableNullSupport = shouldEnableFullNullSupport();
+
     this.mappings[ "/tests" ] = getDirectoryFromPath( getCurrentTemplatePath() );
     this.mappings[ "/qb" ] = expandPath( "/" );
     this.mappings[ "/cbpaginator" ] = expandPath( "/modules/cbpaginator" );
     this.mappings[ "/testbox" ] = this.mappings[ "/qb" ] & "/testbox";
+
+    function shouldEnableFullNullSupport() {
+        var system = createObject( "java", "java.lang.System" );
+        var value = system.getEnv( "FULL_NULL" );
+        return isNull( value ) ? false : !!value;
+    }
 }
diff --git a/tests/runner.cfm b/tests/runner.cfm
@@ -10,7 +10,7 @@
 <cfparam name="url.propertiesSummary" 	default="false" type="boolean">
 
 <!--- Code Coverage requires FusionReactor --->
-<cfparam name="url.coverageEnabled"					default="true">
+<cfparam name="url.coverageEnabled"					default="false">
 <cfparam name="url.coveragePathToCapture"			default="#expandPath( '/qb' )#">
 <cfparam name="url.coverageWhitelist"				default="">
 <cfparam name="url.coverageBlacklist"				default="/testbox,/tests,/docs,/modules">

diff --git a/tests/specs/Query/MySQLQueryBuilderSpec.cfc b/tests/specs/Query/MySQLQueryBuilderSpec.cfc
@@ -822,7 +822,8 @@ component extends="tests.resources.AbstractQueryBuilderSpec" {
     }
 
     private function getBuilder() {
-        variables.grammar = getMockBox().createMock( "qb.models.Grammars.MySQLGrammar" ).init();
+        variables.utils = getMockBox().createMock( "qb.models.Query.QueryUtils" ).init();
+        variables.grammar = getMockBox().createMock( "qb.models.Grammars.MySQLGrammar" ).init( variables.utils );
         var builder = getMockBox().createMock( "qb.models.Query.QueryBuilder" ).init( grammar );
         return builder;
     }

diff --git a/tests/specs/Query/OracleQueryBuilderSpec.cfc b/tests/specs/Query/OracleQueryBuilderSpec.cfc
@@ -843,7 +843,8 @@ component extends="tests.resources.AbstractQueryBuilderSpec" {
     }
 
     private function getBuilder() {
-        variables.grammar = prepareMock( new qb.models.Grammars.OracleGrammar() );
+        variables.utils = getMockBox().createMock( "qb.models.Query.QueryUtils" ).init();
+        variables.grammar = getMockBox().createMock( "qb.models.Grammars.OracleGrammar" ).init( variables.utils );
         var builder = new qb.models.Query.QueryBuilder( variables.grammar );
         return builder;
     }

diff --git a/tests/specs/Query/PostgresQueryBuilderSpec.cfc b/tests/specs/Query/PostgresQueryBuilderSpec.cfc
@@ -840,7 +840,8 @@ component extends="tests.resources.AbstractQueryBuilderSpec" {
     }
 
     private function getBuilder() {
-        variables.grammar = getMockBox().createMock( "qb.models.Grammars.PostgresGrammar" ).init();
+        variables.utils = getMockBox().createMock( "qb.models.Query.QueryUtils" ).init();
+        variables.grammar = getMockBox().createMock( "qb.models.Grammars.PostgresGrammar" ).init( variables.utils );
         var builder = getMockBox().createMock( "qb.models.Query.QueryBuilder" ).init( grammar );
         return builder;
     }

diff --git a/tests/specs/Query/SqlServerQueryBuilderSpec.cfc b/tests/specs/Query/SqlServerQueryBuilderSpec.cfc
@@ -828,7 +828,8 @@ component extends="tests.resources.AbstractQueryBuilderSpec" {
     }
 
     private function getBuilder() {
-        variables.grammar = getMockBox().createMock( "qb.models.Grammars.SqlServerGrammar" ).init();
+        variables.utils = getMockBox().createMock( "qb.models.Query.QueryUtils" ).init();
+        variables.grammar = getMockBox().createMock( "qb.models.Grammars.SqlServerGrammar" ).init( variables.utils );
         var builder = getMockBox().createMock( "qb.models.Query.QueryBuilder" ).init( grammar );
         return builder;
     }