Skip to content

Commit e6aef61

Browse files
nangelov-etinangelov-eti
committed
fix: patch for Informix datasource
1 parent 2dbc587 commit e6aef61

File tree

22 files changed

+374
-70
lines changed

22 files changed

+374
-70
lines changed

‎client/packages/lowcoder/src/i18n/locales/en.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2936,7 +2936,7 @@ export const en = {
29362936
"resetSuccessDesc": "Password Reset Succeeded. The New Password is: {password}",
29372937
"resetLostPasswordSuccess": "Password Reset Succeeded. Please login again.",
29382938
"copyPassword": "Copy Password",
2939-
"poweredByLowcoder": "Powered by: Lowcoder.cloud"
2939+
"poweredByLowcoder": ""
29402940
},
29412941
"preLoad": {
29422942
"jsLibraryHelpText": "Add JavaScript Libraries to Your Current Application via URL Addresses. lodash, day.js, uuid, numbro are Built into the System for Immediate Use. JavaScript Libraries are Loaded Before the Application is Initialized, Which Can Have an Impact on Application Performance.",

‎client/packages/lowcoder/src/pages/common/profileDropdown.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ export default function ProfileDropdown(props: DropDownProps) {
150150
dispatch(profileSettingModalVisible(true));
151151
} else if (e.key === "logout") {
152152
// logout
153-
dispatch(logoutAction({ orgId: currentOrgId }));
153+
dispatch(logoutAction({ organizationId: currentOrgId }));
154154
} else if (e.keyPath.includes("switchOrg")) {
155155
if (e.key === "newOrganization") {
156156
// create new organization

‎client/packages/lowcoder/src/pages/userAuth/formLogin.tsx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import Flex from "antd/es/flex";
2323
const AccountLoginWrapper = styled(FormWrapperMobile)`
2424
display: flex;
2525
flex-direction: column;
26-
margin-bottom: 66px;
2726
2827
.form-input.password-input {
2928
margin-bottom: 0px;
@@ -62,11 +61,7 @@ export default function FormLogin(props: FormLoginProps) {
6261

6362
return (
6463
<>
65-
<LoginCardTitle>{trans("userAuth.login")}</LoginCardTitle>
66-
<AccountLoginWrapper style={(orgId || invitationId) && {
67-
marginBottom: "40px",
68-
marginTop: "-50px",
69-
}}>
64+
<AccountLoginWrapper>
7065
{!props.organizationId && (
7166
<><FormInput
7267
className="form-input"

‎client/packages/lowcoder/src/pages/userAuth/register.tsx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ const StyledPasswordInput = styled(PasswordInput)`
3333
const RegisterContent = styled(FormWrapperMobile)`
3434
display: flex;
3535
flex-direction: column;
36-
margin-bottom: 66px;
3736
`;
3837

3938
function UserRegister() {
@@ -80,11 +79,7 @@ function UserRegister() {
8079
subHeading={registerSubHeading}
8180
type="large"
8281
>
83-
<LoginCardTitle>{trans("userAuth.registerByEmail")}</LoginCardTitle>
84-
<RegisterContent style={organizationId && {
85-
marginBottom: "40px",
86-
marginTop: "-50px",
87-
}}>
82+
<RegisterContent>
8883
{!organizationId && (
8984
<><StyledFormInput
9085
className="form-input"

‎client/packages/lowcoder/src/pages/userAuth/thirdParty/thirdPartyAuth.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ export function ThirdPartyAuth(props: {
134134
});
135135
return (
136136
<ThirdPartyLoginButtonWrapper>
137-
{ Boolean(socialLoginButtons.length === 1) && <Divider style={{ visibility: "hidden" }} /> }
138137
{ Boolean(socialLoginButtons.length > 1) && <Divider /> }
139138
{socialLoginButtons}
140139
</ThirdPartyLoginButtonWrapper>

‎server/api-service/lowcoder-plugins/informixPlugin/plugin.properties

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎server/api-service/lowcoder-plugins/informixPlugin/pom.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
23
<project xmlns="http://maven.apache.org/POM/4.0.0"
34
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
45
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -7,13 +8,13 @@
78
<artifactId>lowcoder-plugins</artifactId>
89
<version>${revision}</version>
910
</parent>
11+
1012
<modelVersion>4.0.0</modelVersion>
11-
12-
13-
13+
<groupId>org.lowcoder.plugins</groupId>
1414
<artifactId>informixPlugin</artifactId>
15-
<version>1.0-SNAPSHOT</version>
15+
1616
<name>informixPlugin</name>
17+
1718
<properties>
1819
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1920
<java.version>17</java.version>

‎server/api-service/lowcoder-plugins/informixPlugin/src/main/java/com/openblocks/plugin/informix/InformixConnector.java renamed to ‎server/api-service/lowcoder-plugins/informixPlugin/src/main/java/org/lowcoder/plugin/informix/InformixConnector.java

File renamed without changes.

‎server/api-service/lowcoder-plugins/informixPlugin/src/main/java/com/openblocks/plugin/informix/InformixPlugin.java renamed to ‎server/api-service/lowcoder-plugins/informixPlugin/src/main/java/org/lowcoder/plugin/informix/InformixPlugin.java

File renamed without changes.

‎server/api-service/lowcoder-plugins/informixPlugin/src/main/java/com/openblocks/plugin/informix/InformixQueryExecutor.java renamed to ‎server/api-service/lowcoder-plugins/informixPlugin/src/main/java/org/lowcoder/plugin/informix/InformixQueryExecutor.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
import org.lowcoder.plugin.sql.SqlBasedQueryExecutor;
55
import org.lowcoder.sdk.exception.PluginException;
66
import org.lowcoder.sdk.models.DatasourceStructure;
7+
import org.lowcoder.sdk.models.DatasourceStructure.Table;
78
import org.lowcoder.sdk.plugin.common.sql.SqlBasedDatasourceConnectionConfig;
89
import org.lowcoder.sdk.plugin.sqlcommand.GuiSqlCommand;
9-
import org.lowcoder.sdk.plugin.sqlcommand.command.mysql.*;
10+
import org.lowcoder.sdk.plugin.sqlcommand.command.informix.*;
1011
import lombok.extern.slf4j.Slf4j;
1112
import org.pf4j.Extension;
1213

@@ -36,7 +37,7 @@ public InformixQueryExecutor() {
3637
@Override
3738
protected DatasourceStructure getDatabaseMetadata(Connection connection,
3839
SqlBasedDatasourceConnectionConfig connectionConfig) {
39-
Map<String, DatasourceStructure.Table> tablesByName = new LinkedHashMap<>();
40+
Map<String, Table> tablesByName = new LinkedHashMap<>();
4041
try (Statement statement = connection.createStatement()) {
4142
parseTableAndColumns(tablesByName, statement);
4243
parseTableKeys(tablesByName, statement);
@@ -46,7 +47,7 @@ protected DatasourceStructure getDatabaseMetadata(Connection connection,
4647
}
4748

4849
DatasourceStructure structure = new DatasourceStructure(new ArrayList<>(tablesByName.values()));
49-
for (DatasourceStructure.Table table : structure.getTables()) {
50+
for (Table table : structure.getTables()) {
5051
table.getKeys().sort(Comparator.naturalOrder());
5152
}
5253
return structure;
@@ -55,12 +56,12 @@ protected DatasourceStructure getDatabaseMetadata(Connection connection,
5556
@Override
5657
protected GuiSqlCommand parseSqlCommand(String guiStatementType, Map<String, Object> detail) {
5758
return switch (guiStatementType.toUpperCase()) {
58-
case "INSERT" -> MysqlInsertCommand.from(detail);
59-
case "UPDATE" -> MysqlUpdateCommand.from(detail);
60-
case "UPSERT" -> MysqlUpsertCommand.from(detail);
61-
case "DELETE" -> MysqlDeleteCommand.from(detail);
62-
case "BULK_INSERT" -> MysqlBulkInsertCommand.from(detail);
63-
case "BULK_UPDATE" -> MysqlBulkUpdateCommand.from(detail);
59+
case "INSERT" -> InformixInsertCommand.from(detail);
60+
case "UPDATE" -> InformixUpdateCommand.from(detail);
61+
case "UPSERT" -> InformixUpsertCommand.from(detail);
62+
case "DELETE" -> InformixDeleteCommand.from(detail);
63+
case "BULK_INSERT" -> InformixBulkInsertCommand.from(detail);
64+
case "BULK_UPDATE" -> InformixBulkUpdateCommand.from(detail);
6465
default -> throw new PluginException(QUERY_ARGUMENT_ERROR, "INVALID_GUI_COMMAND_TYPE", guiStatementType);
6566
};
6667
}

0 commit comments

Comments
 (0)