Skip to content

Commit c196243

Browse files
authored
Update Splits to use regex to match other parts of quick codebase
1 parent a4481cf commit c196243

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

models/BaseEntity.cfc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2096,7 +2096,7 @@ component accessors="true" {
20962096
} else if ( !isSimpleValue( arguments.relationName ) ) {
20972097
related = arguments.relationName;
20982098
} else {
2099-
var parts = arguments.relationName.split( "[Aa][Ss]" );
2099+
var parts = arguments.relationName.split( "\s(?:[Aa][Ss]\s)?" );
21002100
related = variables._wirebox.getInstance( trim( parts[ 1 ] ) );
21012101
if ( arrayLen( parts ) > 1 ) {
21022102
related.withAlias( trim( parts[ 2 ] ) );
@@ -2118,7 +2118,7 @@ component accessors="true" {
21182118
} else if ( !isSimpleValue( throughEntityName ) ) {
21192119
throughEntity = throughEntityName;
21202120
} else {
2121-
var parts = throughEntityName.split( "[Aa][Ss]" );
2121+
var parts = throughEntityName.split( "\s(?:[Aa][Ss]\s)?" );
21222122
if ( variables._wirebox.containsInstance( trim( parts[ 1 ] ) ) ) {
21232123
throughEntity = variables._wirebox.getInstance( trim( parts[ 1 ] ) );
21242124
if ( arrayLen( parts ) > 1 ) {

models/Relationships/Builders/HasManyDeepBuilder.cfc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ component accessors="true" {
2727
if ( !isNull( arguments.callback ) ) {
2828
variables.through.append( function() {
2929
var entity = "";
30-
var parts = entityName.split( "[Aa][Ss]" );
30+
var parts = entityName.split( "\s(?:[Aa][Ss]\s)?" );
3131
var entity = variables.wirebox.getInstance( trim( parts[ 1 ] ) );
3232
if ( arrayLen( parts ) > 1 ) {
3333
entity.withAlias( trim( parts[ 2 ] ) );
@@ -78,7 +78,7 @@ component accessors="true" {
7878
if ( !isNull( arguments.callback ) ) {
7979
related = function() {
8080
var entity = "";
81-
var parts = relationName.split( "[Aa][Ss]" );
81+
var parts = relationName.split( "\s(?:[Aa][Ss]\s)?" );
8282
var entity = variables.wirebox.getInstance( trim( parts[ 1 ] ) );
8383
if ( arrayLen( parts ) > 1 ) {
8484
entity.withAlias( trim( parts[ 2 ] ) );

models/Relationships/HasManyDeep.cfc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ component
9797
var segments = arguments.builder
9898
.getQB()
9999
.getTableName()
100-
.split( "[Aa][Ss]" );
100+
.split( "\s(?:[Aa][Ss]\s)?" );
101101
var alias = segments[ 2 ] ?: "";
102102

103103
var chainLength = variables.throughParents.len();
@@ -213,7 +213,7 @@ component
213213
var segments = arguments.builder
214214
.getQB()
215215
.getTableName()
216-
.split( "[Aa][Ss]" );
216+
.split( "\s(?:[Aa][Ss]\s)?" );
217217
var alias = segments[ 2 ] ?: "";
218218

219219
var foreignKeys = [];
@@ -239,7 +239,7 @@ component
239239
var segments = arguments.builder
240240
.getQB()
241241
.getTableName()
242-
.split( "[Aa][Ss]" );
242+
.split( "\s(?:[Aa][Ss]\s)?" );
243243
var alias = segments[ 2 ] ?: "";
244244

245245
var localKeys = [];

0 commit comments

Comments
 (0)