Merge branch 'feature-PRESIDECMS-2713_use-faster-dbinfo-where-availab…

…le' into release-10.25.0
pixl8 · Sep 25, 2023 · 3406640 · 3406640
2 parents 24bb9ce + 25c8d64
commit 3406640
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 12 deletions.
diff --git a/system/services/database/DbInfoService.cfc b/system/services/database/DbInfoService.cfc
@@ -7,6 +7,7 @@ component {
 
 // CONSTRUCTOR
 	public any function init() {
+		variables.hasModernDbInfo = structKeyExists( getTagData( "CF", "DBINFO" ).attributes, "filter" ); // Lucee 6
 		return this;
 	}
 
@@ -21,17 +22,31 @@ component {
 
 	public query function getTableInfo( required string tableName, required string dsn ) {
 		var table = "";
+		var attrCol = {
+			  type       = "tables"
+			, name       = "table"
+			, pattern    = "#arguments.tableName#"
+			, datasource = "#arguments.dsn#"
+		}
+		if ( variables.hasModernDbInfo ){
+			attrCol.filter = "TABLE"; // this is much faster
+		}
 
-		dbinfo type="tables" name="table" pattern="#arguments.tableName#" datasource="#arguments.dsn#";
+		dbinfo attributeCollection=attrCol;
 
 		return table;
 	}
 
-	public query function getTableColumns( required string tableName, required string dsn ) {
+	public query function getTableColumns( required string tableName, required string dsn, boolean detail=false ) {
 		var columns = "";
+		var attrCol = {
+			  type       = ( variables.hasModernDbInfo && !arguments.detail ) ? "columns_minimal" : "columns"
+			, name       = "columns"
+			, table      = arguments.tableName
+			, datasource = arguments.dsn
+		}
 
-		dbinfo type="columns" name="columns" table=arguments.tableName datasource=arguments.dsn;
-
+		dbinfo attributeCollection=attrCol;
 		return columns;
 	}
 
@@ -91,4 +106,8 @@ component {
 
 		return constraints;
 	}
+
+	public boolean function hasModernDbInfo(){
+		return variables.hasModernDbInfo;
+	}
 }
diff --git a/system/services/presideObjects/SqlSchemaSynchronizer.cfc b/system/services/presideObjects/SqlSchemaSynchronizer.cfc
@@ -51,6 +51,7 @@ component {
 				dbVersion.append( obj.sql.table.version );
 			}
 		}
+		StructDelete( variables, "columnCache" ); // cache no longer required, release memory
 		dbVersion.sort( "text" );
 		dbVersion = Hash( dbVersion.toList() );
 		if ( ( versions.db.db ?: "" ) neq dbVersion ) {
@@ -102,7 +103,7 @@ component {
 			}
 			_syncForeignKeys( objects );
 
-			for( dsn in dsns ){
+			for( var dsn in dsns ){
 				_setDatabaseObjectVersion(
 					  entityType = "db"
 					, entityName = "db"
@@ -167,7 +168,7 @@ component {
 	) {
 		var adapter        = _getAdapter( dsn = arguments.dsn );
 		var tableExists    =  _tableExists( tableName=arguments.tableName, dsn=arguments.dsn );
-		var tableColumns   = tableExists ? valueList( _getTableColumns( tableName=arguments.tableName, dsn=arguments.dsn ).COLUMN_NAME ) : "";
+		var tableColumns   = tableExists ? _getTableColumns( tableName=arguments.tableName, dsn=arguments.dsn ) : [];
 		var columnSql      = "";
 		var colName        = "";
 		var column         = "";
@@ -188,7 +189,7 @@ component {
 
 		for( colName in ListToArray( arguments.dbFieldList ) ) {
 			colMeta = arguments.properties[ colName ];
-			if( listFindNoCase( tableColumns, colName ) && _skipSync( colMeta ) ) {
+			if( _skipSync( colMeta ) && ArrayContainsNoCase( tableColumns, colName ) ) {
 				continue;
 			}
 			column = sql.columns[ colName ] = StructNew();
@@ -346,7 +347,7 @@ component {
 		, required boolean skipSync
 
 	) {
-		var columnsFromDb   = _getTableColumns( tableName=arguments.tableName, dsn=arguments.dsn );
+		var columnsFromDb   = _getTableColumnsWithForeignKeys( tableName=arguments.tableName, dsn=arguments.dsn, detail=true );
 		var indexesFromDb   = _getTableIndexes( tableName=arguments.tableName, dsn=arguments.dsn );
 		var dbColumnNames   = ValueList( columnsFromDb.column_name );
 		var colsSql         = arguments.generatedSql.columns;
@@ -538,9 +539,9 @@ component {
 		for( keyName in keys ){
 			key = keys[ keyName ];
 			if ( key.fk_table eq arguments.foreignTableName and key.fk_column eq arguments.foreignColumnName ) {
-				sql = adapter.getDropForeignKeySql( tableName = key.fk_table, foreignKeyName = keyName );
+				dropSql = adapter.getDropForeignKeySql( tableName = key.fk_table, foreignKeyName = keyName );
 
-				_runSql( sql = sql, dsn = arguments.dsn );
+				_runSql( sql = dropSql, dsn = arguments.dsn );
 			}
 		}
 	}
@@ -702,7 +703,30 @@ component {
 		return variables._tableCache[ arguments.dsn ][ arguments.tableName ] ?: false;
 	}
 
-	private query function _getTableColumns() {
+	private array function _getTableColumns() {
+		try {
+			if ( _getDbInfoService().hasModernDbInfo() ){
+				// with the faster version, we can fetch the entire schema in one call.
+				if ( !StructKeyExists( variables, "columnCache" )){
+					variables.columnCache =  _getTableColumnCache( argumentCollection = arguments );
+				}
+				if ( StructKeyExists( variables.columnCache, arguments.tableName ) ) {
+					return variables.columnCache[ arguments.tableName ];
+				} else {
+					return [];
+				}
+			}
+			var tableColumns = _getDbInfoService().getTableColumns( argumentCollection = arguments );
+			return QueryColumnData( tableColumns, "COLUMN_NAME" );
+		} catch( any e ) {
+			if ( e.message contains "there is no table that match the following pattern" ) {
+				return [];
+			}
+			rethrow;
+		}
+	}
+
+	private query function _getTableColumnsWithForeignKeys() {
 		try {
 			return _getDbInfoService().getTableColumns( argumentCollection = arguments );
 		} catch( any e ) {
@@ -771,6 +795,18 @@ component {
 		}
 	}
 
+	private struct function _getTableColumnCache(){
+		var srcColumns = _getDbInfoService().getTableColumns( tableName="%", dsn=arguments.dsn, detail=false );
+		var columns = {};
+		loop query=srcColumns {
+			if ( !StructKeyExists( columns, srcColumns.table_name ) ) {
+				columns[ srcColumns.table_name ] = [];
+			}
+			ArrayAppend( columns[ srcColumns.table_name ], srcColumns.column_name );
+		}
+		return columns;
+	}
+
 
 
 // GETTERS AND SETTERS

diff --git a/system/services/presideObjects/SqlSchemaVersioning.cfc b/system/services/presideObjects/SqlSchemaVersioning.cfc
@@ -21,7 +21,7 @@ component singleton=true {
 		var versionRecords = "";
 		var versionRecord  = "";
 
-		for( dsn in dsns ){
+		for( dsn in arguments.dsns ){
 			_checkVersionsTableExistance( dsn = dsn );
 			versionRecords = _runSql(
 				  sql = "select entity_type, entity_name, parent_entity_name, version_hash from _preside_generated_entity_versions order by entity_type, parent_entity_name"