refactor(database): simplify and rename methods #171

- Simplify `getDataSources` method to use single-expression syntax.
- Rename `getAllRawDatasource` to `allRawDatasource` for consistency.
- Remove unused `Disposer` import.
- Fix minor formatting issues

Author: phodal

toolsets/database/src/main/kotlin/com/phodal/shire/database/DatabaseSchemaAssistant.kt

@@ -31,31 +31,27 @@ import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.editor.ex.EditorEx
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
-import com.intellij.openapi.util.Disposer
 import com.intellij.psi.PsiManager
 import com.intellij.sql.psi.SqlPsiFacade
 import com.intellij.testFramework.LightVirtualFile
 import java.util.concurrent.CompletableFuture
 
 object DatabaseSchemaAssistant {
-    fun getDataSources(project: Project): List<DbDataSource> {
-        return DbPsiFacade.getInstance(project).dataSources.toList()
-    }
+    fun getDataSources(project: Project): List<DbDataSource> = DbPsiFacade.getInstance(project).dataSources.toList()
 
-    fun getAllRawDatasource(project: Project): List<RawDataSource> {
+    fun allRawDatasource(project: Project): List<RawDataSource> {
         val dbPsiFacade = DbPsiFacade.getInstance(project)
         return dbPsiFacade.dataSources.map { dataSource ->
             dbPsiFacade.getDataSourceManager(dataSource).dataSources
         }.flatten()
     }
 
     fun getDatabase(project: Project, dbName: String): RawDataSource? {
-        return getAllRawDatasource(project).firstOrNull { it.name == dbName }
+        return allRawDatasource(project).firstOrNull { it.name == dbName }
     }
 
     fun getAllTables(project: Project): List<DasTable> {
-        val rawDataSources = getAllRawDatasource(project)
-        return rawDataSources.map {
+        return allRawDatasource(project).map {
             val schemaName = it.name.substringBeforeLast('@')
             DasUtil.getTables(it).filter { table ->
                 table.kind == ObjectKind.TABLE && (table.dasParent?.name == schemaName || isSQLiteTable(it, table))
@@ -76,7 +72,7 @@ object DatabaseSchemaAssistant {
         val file = LightVirtualFile("temp.sql", sql)
         val psiFile = PsiManager.getInstance(project).findFile(file)!!
 
-        val dataSource = getAllRawDatasource(project).firstOrNull()
+        val dataSource = allRawDatasource(project).firstOrNull()
             ?: throw IllegalArgumentException("ShireError[Database]: No database found")
 
         val execOptions = DatabaseSettings.getSettings().execOptions.last()
@@ -98,7 +94,7 @@ object DatabaseSchemaAssistant {
 
                     override fun addRows(context: GridDataRequest.Context, rows: MutableList<out GridRow>) {
                         super.addRows(context, rows)
-                        result += rows;
+                        result += rows
                         /// TODO: fix this use result.size instead of rows.size
                         if (rows.size < 100) {
                             future.complete(result.toString())
@@ -191,6 +187,6 @@ object DatabaseSchemaAssistant {
             "${column.name}: ${column.dasType.toDataType()}"
         }.joinToString(", ")
 
-        return "TableName: ${table.name} Columns: { $columns }"
+        return "TableName: ${table.name}, Columns: { $columns }"
     }
 }

toolsets/database/src/main/kotlin/com/phodal/shire/database/SqlContextBuilder.kt

@@ -40,7 +40,7 @@ object SqlContextBuilder {
     private fun columnType(it: BasicTableOrViewColumn) = it.dasType.specification
 
     fun buildDatabaseInfo(project: Project): String {
-        val dataSources = DatabaseSchemaAssistant.getAllRawDatasource(project)
+        val dataSources = DatabaseSchemaAssistant.allRawDatasource(project)
         return dataSources.joinToString("\n") {
             """
             DatabaseName: ${it.databaseVersion.name}

toolsets/database/src/main/kotlin/com/phodal/shire/database/provider/DatabaseFunctionProvider.kt

@@ -43,7 +43,7 @@ class DatabaseFunctionProvider : ToolchainFunctionProvider {
 
     private fun executeTableFunction(args: List<Any>, project: Project): Any {
         if (args.isEmpty()) {
-            val dataSource = DatabaseSchemaAssistant.getAllRawDatasource(project).firstOrNull()
+            val dataSource = DatabaseSchemaAssistant.allRawDatasource(project).firstOrNull()
                 ?: return "ShireError[Database]: No database found"
             return DatabaseSchemaAssistant.getTableByDataSource(dataSource)
         }