Hi,
I'm trying to use Turbine with some existing tables - and thus producing
my own map class and I'm finding a few quirks with integrating it -
mainly due to spurious strings around the code, such as "VISITORID". So
I'm going to submit a few patches to try and reduce these and ease my
integration - but if they get integrated, I can still use the core
Turbine.
If I am stepping on anyones toes - sorry - its just that I am coding
this today - so I either send this in, or diverge my copy of Turbine -
and I don't want to lose all your support :-) If these patches are
going in the wrong direction - let me know.
So here is the first one - it should be standalone.
Index:
/opt/Apache-Turbine/src/java/org/apache/turbine/util/db/map/TurbineMapBuilder.java
===================================================================
RCS file:
/home/cvsroot/Turbine-20000422/org/apache/turbine/util/db/map/TurbineMapBuilder.java,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 TurbineMapBuilder.java
108,198c108,146
< /**
< Visitor.VISITORID
< */
< public String getVisitor_VisitorId()
< {
< return "Visitor.VISITORID";
< }
< /**
< Visitor.LASTLOGIN
< */
< public String getVisitor_LastLogin()
< {
< return "Visitor.LASTLOGIN";
< }
< /**
< Visitor.LOGINID
< */
< public String getVisitor_Username()
< {
< return "Visitor.LOGINID";
< }
< /**
< Visitor.PASSWORD_VALUE
< */
< public String getVisitor_Password()
< {
< return "Visitor.PASSWORD_VALUE";
< }
< /**
< Visitor.OBJECTDATA
< */
< public String getVisitor_ObjectData()
< {
< return "Visitor.OBJECTDATA";
< }
< /**
< UserRole.ROLEID
< */
< public String getRole_RoleId()
< {
< return "UserRole.ROLEID";
< }
< /**
< UserRole.ROLENAME
< */
< public String getRole_Name()
< {
< return "UserRole.ROLENAME";
< }
< /**
< Permission.PERMISSIONID
< */
< public String getPermission_PermissionId()
< {
< return "Permission.PERMISSIONID";
< }
< /**
< Permission.PERMISSION
< */
< public String getPermission_Name()
< {
< return "Permission.PERMISSION";
< }
< /**
< VisitorRole.VISITORID
< */
< public String getVisitorRole_VisitorId()
< {
< return "VisitorRole.VISITORID";
< }
< /**
< VisitorRole.ROLEID
< */
< public String getVisitorRole_RoleId()
< {
< return "VisitorRole.ROLEID";
< }
< /**
< RolePermission.PERMISSIONID
< */
< public String getRolePermission_PermissionId()
< {
< return "RolePermission.PERMISSIONID";
< }
< /**
< RolePermission.ROLEID
< */
< public String getRolePermission_RoleId()
< {
< return "RolePermission.ROLEID";
< }
---
>
> public String getVisitorId() { return "VISITORID"; }
> public String getVisitor_VisitorId() { return
>getTableVisitor()+"."+getVisitorId(); }
>
> public String getLastLogin() { return "LASTLOGIN"; }
> public String getVisitor_LastLogin() { return
>getTableVisitor()+"."+getLastLogin(); }
>
> public String getUsername() { return "LOGINID"; }
> public String getVisitor_Username() { return
>getTableVisitor()+"."+getUsername(); }
>
> public String getPassword() { return "PASSWORD_VALUE"; }
> public String getVisitor_Password() { return
>getTableVisitor()+"."+getPassword(); }
>
> public String getObjectData() { return "OBJECTDATA"; }
> public String getVisitor_ObjectData() { return
>getTableVisitor()+"."+getObjectData(); }
>
>
>
> public String getRoleId() { return "ROLEID"; }
> public String getRole_RoleId() { return getTableRole()+"."+getRoleId(); }
>
> public String getRoleName() { return "ROLENAME"; }
> public String getRole_Name() { return getTableRole()+"."+getRoleName(); }
>
>
>
> public String getPermissionId() { return "PERMISSIONID"; }
> public String getPermission_PermissionId() { return
>getTablePermission()+"."+getPermissionId(); }
>
> public String getPermissionName() { return "PERMISSION"; }
> public String getPermission_Name() { return
>getTablePermission()+"."+getPermissionName(); }
>
> public String getVisitorRole_VisitorId() { return
>getTableVisitorRole()+"."+getVisitorId(); }
> public String getVisitorRole_RoleId() { return
>getTableVisitorRole()+"."+getRoleId(); }
>
> public String getRolePermission_PermissionId() { return
>getTableRolePermission()+"."+getPermissionId(); }
> public String getRolePermission_RoleId() { return
>getTableRolePermission()+"."+getRoleId(); }
>
>
252,256c200,204
< dbMap.addTable("Visitor");
< dbMap.addTable("UserRole");
< dbMap.addTable("Permission");
< dbMap.addTable("VisitorRole");
< dbMap.addTable("RolePermission");
---
> dbMap.addTable(getTableVisitor());
> dbMap.addTable(getTableRole());
> dbMap.addTable(getTablePermission());
> dbMap.addTable(getTableVisitorRole());
> dbMap.addTable(getTableRolePermission());
260,261c208,209
< TableMap tMap = dbMap.getTable("Visitor");
< tMap.addPrimaryKey("VISITORID", integer);
---
> TableMap tMap = dbMap.getTable(getTableVisitor());
> tMap.addPrimaryKey(getVisitorId(), integer);
265,266c213,214
< tMap.addColumn("LOGINID", string);
< tMap.addColumn("PASSWORD_VALUE", string);
---
> tMap.addColumn(getUsername(), string);
> tMap.addColumn(getPassword(), string);
281c229
< tMap.addColumn("LASTLOGIN", date);
---
> tMap.addColumn(getLastLogin(), date);
285,288c233,235
< tMap = dbMap.getTable("UserRole");
< tMap.addPrimaryKey("ROLEID", integer);
< tMap.addColumn("ROLENAME", string);
<
---
> tMap = dbMap.getTable(getTableRole());
> tMap.addPrimaryKey(getRoleId(), integer);
> tMap.addColumn(getRoleName(), string);
290,293c237,239
< tMap = dbMap.getTable("Permission");
< tMap.addPrimaryKey("PERMISSIONID", integer);
< tMap.addColumn("PERMISSION", string);
<
---
> tMap = dbMap.getTable(getTablePermission());
> tMap.addPrimaryKey(getPermissionId(), integer);
> tMap.addColumn(getPermissionName(), string);
295,298c241,243
< tMap = dbMap.getTable("RolePermission");
< tMap.addForeignPrimaryKey("PERMISSIONID", integer,
"Permission", "PERMISSIONID");
< tMap.addForeignPrimaryKey("ROLEID", integer, "UserRole",
"ROLEID");
<
---
> tMap = dbMap.getTable(getTableRolePermission());
> tMap.addForeignPrimaryKey(getPermissionId(), integer, getTablePermission(),
>getPermissionId());
> tMap.addForeignPrimaryKey(getRoleId(), integer, getTableRole(), getRoleId());
300,302c245,247
< tMap = dbMap.getTable("VisitorRole");
< tMap.addForeignPrimaryKey("VISITORID", integer, "Visitor",
"VISITORID");
< tMap.addForeignPrimaryKey("ROLEID", integer, "UserRole",
"ROLEID");
---
> tMap = dbMap.getTable(getTableVisitorRole());
> tMap.addForeignPrimaryKey(getVisitorId(), integer, getTableVisitor(),
>getVisitorId());
> tMap.addForeignPrimaryKey(getRoleId(), integer, getTableRole(), getRoleId());
------------------------------------------------------------
To subscribe: [EMAIL PROTECTED]
To unsubscribe: [EMAIL PROTECTED]
Problems?: [EMAIL PROTECTED]
