Development-tools/Dynamic-Form-Tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Handle databases that do not support user-defined types

Browse Source 
Add a null check to prevent NullPointerException when a database does not support user-defined data types.
This commit is contained in:
skidus
2025-10-18 16:07:51 +07:00
parent ed7e7a8856
commit c40ce04f73
5 changed files with 53 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/sdk/generators/GUtils.java
View File

@@ -1,6 +1,7 @@
package com.sdk.generators;
import com.intellij.database.model.DasColumn;
import com.intellij.database.model.DasObject;
import com.intellij.database.model.ObjectKind;
import com.intellij.database.psi.DbObject;
import com.intellij.database.psi.DbTable;
@@ -63,15 +64,18 @@ public class GUtils {
public static void createUserDefineType(DbTable table) {
String schemaName = table.getParent() != null ? table.getParent().getName() : "";
DasUtil.getCatalogObject(table).getDasChildren(ObjectKind.SCHEMA).forEach(schema -> {
if (schema.getName().equals("public") || schema.getName().equals(schemaName)) {
schema.getDasChildren(ObjectKind.OBJECT_TYPE).forEach(domain -> {
String domainName = domain.getName();
String domainScript = ((DbObject) domain).getText();
userDefType.put(domainName, getRawType(domainScript));
});
}
});
DasObject objCatalog = DasUtil.getCatalogObject(table);
if (objCatalog != null) {
objCatalog.getDasChildren(ObjectKind.SCHEMA).forEach(schema -> {
if (schema.getName().equals("public") || schema.getName().equals(schemaName)) {
schema.getDasChildren(ObjectKind.OBJECT_TYPE).forEach(domain -> {
String domainName = domain.getName();
String domainScript = ((DbObject) domain).getText();
userDefType.put(domainName, getRawType(domainScript));
});
}
});
}
}
public static String getFieldType(DasColumn column) {

23
src/main/resources/META-INF/plugin.xml
View File

@@ -10,6 +10,29 @@
Right-click on a package and select "Generate Database Action Models" to start.
]]></description>
<change-notes><![CDATA[
## [1.1.2]
fix: Update plugin version display
Corrected the plugin version display in the IDE.
## [1.1.1]
fix: Correctly generate primary keys
The generator was failing to identify primary key columns, resulting in generated beans without them. This has been fixed by updating the code to use the `getColumnsRef()` method, which correctly retrieves the column names for the primary key.
## Release Notes
### New Features and Enhancements
* **DTO Generation:** Introduced new functionality to generate Data Transfer Object (DTO) classes alongside ActionBeans. This includes new FreeMarker templates (`actionDTO.ftl`, `actionDTO.extend.ftl`) and updated logic in `GeneratorServices.java`.
* **ActionField and DTOField Enhancements:** Implemented enhancements related to the generation of `ActionField` and `DTOField` within the generated classes.
### Refactoring and Improvements
* **Project Structure Refactoring:** The project structure has been reorganized. Generator-related classes were moved to a new package (`com.sdk.generators.actionmodels`), and template directory names were standardized to `src/main/resources/templates`.
* **Build System Updates:** Updated `build.gradle.kts`, `plugin.xml`, and Gradle wrapper files to reflect the structural and functional enhancements.
]]></change-notes>
<depends>com.intellij.modules.platform</depends>
<depends>com.intellij.modules.java</depends>
<depends>com.intellij.database</depends>