CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 46 Packages Projects Releases Wiki Activity

wip data tables

Browse Source
This commit is contained in:
John Woodlock
2012-09-25 02:45:38 +10:00
parent 30cadb4d0d
commit afd22ea826
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-db/0001a-mifos-platform-base-ddl-schema.sql
+1 -3
View File
@@ -115,10 +115,8 @@ CREATE TABLE `r_enum_value` (
/* used to link MySql tables to Mifos X application tables for additional data needs */
CREATE TABLE `x_registered_table` (
`registered_table_name` varchar(50) NOT NULL,
`registered_table_label` varchar(80) NOT NULL,
`application_table_name` varchar(50) NOT NULL,
PRIMARY KEY (`registered_table_name`),
UNIQUE KEY `registered_table_label` (`registered_table_label`)
PRIMARY KEY (`registered_table_name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- DDL for organisation wide related concepts
mifosng-db/patches/patch-0006-recreate-x_registered_table.sql
+7
View File
@@ -0,0 +1,7 @@
DROP TABLE IF EXISTS `x_registered_table`;
/* used to link MySql tables to Mifos X application tables for additional data needs */
CREATE TABLE `x_registered_table` (
`registered_table_name` varchar(50) NOT NULL,
`application_table_name` varchar(50) NOT NULL,
PRIMARY KEY (`registered_table_name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
mifosng-provider/src/main/java/org/mifosng/platform/api/data/DatatableData.java
+1 -7
View File
@@ -4,13 +4,11 @@ public class DatatableData {
private final String applicationTableName;
private final String registeredTableName;
private final String registeredTableLabel;
public DatatableData(final String applicationTableName,
final String registeredTableName, final String registeredTableLabel) {
final String registeredTableName) {
this.applicationTableName = applicationTableName;
this.registeredTableName = registeredTableName;
this.registeredTableLabel = registeredTableLabel;
}
public String getApplicationTableName() {
@@ -21,8 +19,4 @@ public class DatatableData {
return registeredTableName;
}
public String getRegisteredTableLabel() {
return registeredTableLabel;
}
}
mifosng-provider/src/main/java/org/mifosng/platform/noncore/ReadWriteNonCoreDataServiceImpl.java
+2 -3
View File
@@ -177,7 +177,7 @@ public class ReadWriteNonCoreDataServiceImpl implements
andClause = " and application_table_name = '" + appTable + "'";
}
// PERMITTED datatables
String sql = "select application_table_name, registered_table_name, registered_table_label"
String sql = "select application_table_name, registered_table_name"
+ " from x_registered_table "
+ " where exists"
+ " (select 'f'"
@@ -202,8 +202,7 @@ public class ReadWriteNonCoreDataServiceImpl implements
while (rs.next()) {
datatables.add(new DatatableData(rs
.getString("application_table_name"), rs
.getString("registered_table_name"), rs
.getString("registered_table_label")));
.getString("registered_table_name")));
}
} catch (SQLException e) {