1.1 --- a/mdr/extras/jdbcstorage/src/org/netbeans/mdr/persistence/jdbcimpl/JdbcStorage.java Fri Oct 21 15:21:22 2005 +0000
1.2 +++ b/mdr/extras/jdbcstorage/src/org/netbeans/mdr/persistence/jdbcimpl/JdbcStorage.java Sat Oct 22 17:18:49 2005 +0000
1.3 @@ -51,6 +51,8 @@
1.4
1.5 private final String schemaName;
1.6
1.7 + private final String schemaAuthName;
1.8 +
1.9 private final String userName;
1.10
1.11 private final String storageId;
1.12 @@ -92,6 +94,8 @@
1.13
1.14 schemaName = properties.getProperty(
1.15 JdbcStorageFactory.STORAGE_SCHEMA_NAME);
1.16 + schemaAuthName = properties.getProperty(
1.17 + JdbcStorageFactory.STORAGE_SCHEMA_AUTH_NAME);
1.18 userName = properties.getProperty(
1.19 JdbcStorageFactory.STORAGE_USER_NAME);
1.20
1.21 @@ -369,8 +373,16 @@
1.22 rollbackConnection();
1.23 if (realSchema) {
1.24 String sql = "create schema " + getQualifiedSchemaName();
1.25 - if (!isBlank(userName)) {
1.26 - sql = sql + " authorization " + userName;
1.27 + String authName = null;
1.28 + if (!isBlank(schemaAuthName)) {
1.29 + if (!schemaAuthName.equals("!NONE")) {
1.30 + authName = schemaAuthName;
1.31 + }
1.32 + } else if (!isBlank(userName)) {
1.33 + authName = userName;
1.34 + }
1.35 + if (authName != null) {
1.36 + sql = sql + " authorization " + authName;
1.37 }
1.38 jdbcStmt.execute(sql);
1.39 }
2.1 --- a/mdr/extras/jdbcstorage/src/org/netbeans/mdr/persistence/jdbcimpl/JdbcStorageFactory.java Fri Oct 21 15:21:22 2005 +0000
2.2 +++ b/mdr/extras/jdbcstorage/src/org/netbeans/mdr/persistence/jdbcimpl/JdbcStorageFactory.java Sat Oct 22 17:18:49 2005 +0000
2.3 @@ -42,6 +42,9 @@
2.4 public static final String STORAGE_USER_NAME =
2.5 PROPERTY_PREFIX + "userName";
2.6
2.7 + public static final String STORAGE_SCHEMA_AUTH_NAME =
2.8 + PROPERTY_PREFIX + "schemaAuthName";
2.9 +
2.10 public static final String STORAGE_PASSWORD =
2.11 PROPERTY_PREFIX + "password";
2.12
3.1 --- a/mdr/extras/jdbcstorage/src/org/netbeans/mdr/persistence/jdbcimpl/package.html Fri Oct 21 15:21:22 2005 +0000
3.2 +++ b/mdr/extras/jdbcstorage/src/org/netbeans/mdr/persistence/jdbcimpl/package.html Sat Oct 22 17:18:49 2005 +0000
3.3 @@ -62,6 +62,11 @@
3.4 write their contents if they have all been created previously by
3.5 another user)
3.6
3.7 +<li>MDRStorageProperty.org.netbeans.mdr.persistence.jdbcimpl.schemaAuthName
3.8 += name to use in the AUTHORIZATION clause for the schema which will contain
3.9 +the MDR tables; if set to !NONE, the clause is omitted; if not set,
3.10 +the value of the userName property is used if set
3.11 +
3.12 <li>MDRStorageProperty.org.netbeans.mdr.persistence.jdbcimpl.password =
3.13 password corresponding to userName
3.14