Skip to content

Restore of the switch to EOSchemaSynchronizationFactory. Warning: #566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
spelletier wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Restore of the switch to EOSchemaSynchronizationFactory. Warning: #566

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 45 additions & 43 deletions Frameworks/PlugIns/FrontBasePlugIn/Sources/com/webobjects/jdbcadaptor/_FrontBasePlugIn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@
import com.webobjects.eoaccess.EOJoin;
import com.webobjects.eoaccess.EORelationship;
import com.webobjects.eoaccess.EOSQLExpression;
import com.webobjects.eoaccess.EOSchemaSynchronization;
import com.webobjects.eoaccess.EOSynchronizationFactory;
import com.webobjects.eoaccess.synchronization.EOSchemaGenerationOptions;
import com.webobjects.eoaccess.synchronization.EOSchemaSynchronization;
import com.webobjects.eoaccess.synchronization.EOSchemaSynchronizationFactory;
import com.webobjects.eocontrol.EOAndQualifier;
import com.webobjects.eocontrol.EOKeyValueQualifier;
import com.webobjects.eocontrol.EOQualifier;
Expand Down Expand Up @@ -114,7 +115,7 @@ public boolean canDescribeStoredProcedure(String s) {
}

@Override
public EOSynchronizationFactory createSynchronizationFactory() {
public EOSchemaSynchronizationFactory createSchemaSynchronizationFactory() {
return new _FrontBasePlugIn.FrontbaseSynchronizationFactory(_adaptor);
}

Expand Down Expand Up @@ -237,6 +238,7 @@ public Properties connectionPropertiesForConnectionDictionary(NSDictionary conne
* framework and this can be used as a hard-coded equivalent.
* </P>
*/
@SuppressWarnings("unchecked")
@Override
public NSDictionary<String, Object> jdbcInfo() {
// you can swap this code out to write the property list out in order // to get a fresh copy of the
Expand Down Expand Up @@ -485,7 +487,7 @@ private boolean _newPrimaryKeys(int keyBatchSize, EOEntity eoentity, JDBCChannel
attributesToFetch.addObject(generatedPrimaryKeyAttribute);
}

sql.append(')');
sql.append(")");

boolean pksGenerated = false;
EOSQLExpression eosqlexpression = expressionFactory().expressionForString(sql.toString());
Expand Down Expand Up @@ -645,7 +647,7 @@ else if (upperExternalType.equals("CLOB"))
return -1;
}

public static class FrontbaseSynchronizationFactory extends EOSynchronizationFactory {
public static class FrontbaseSynchronizationFactory extends EOSchemaSynchronizationFactory {

public FrontbaseSynchronizationFactory(EOAdaptor eoadaptor) {
super(eoadaptor);
Expand All @@ -665,10 +667,10 @@ public static boolean boolValueForKeyDefault(NSDictionary nsdictionary, String s
}

@Override
public String schemaCreationScriptForEntities(NSArray<EOEntity> allEntities, NSDictionary<String, String> options) {
public String schemaCreationScriptForEntities(NSArray<EOEntity> allEntities, EOSchemaGenerationOptions options) {
StringBuffer result = new StringBuffer();
if (options == null) {
options = NSDictionary.emptyDictionary();
options = new EOSchemaGenerationOptions();
}
NSArray<EOSQLExpression> statements = schemaCreationStatementsForEntities(allEntities, options);
int i = 0;
Expand All @@ -686,7 +688,7 @@ public String schemaCreationScriptForEntities(NSArray<EOEntity> allEntities, NSD
* </span>
*/
@Override
public NSArray<EOSQLExpression> schemaCreationStatementsForEntities(NSArray<EOEntity> entities, NSDictionary<String, String> options) {
public NSArray<EOSQLExpression> schemaCreationStatementsForEntities(NSArray<EOEntity> entities, EOSchemaGenerationOptions options) {
NSMutableArray<EOSQLExpression> result = new NSMutableArray<EOSQLExpression>();

if (entities == null || entities.count() == 0)
Expand All @@ -699,34 +701,34 @@ public NSArray<EOSQLExpression> schemaCreationStatementsForEntities(NSArray<EOEn
result.addObject(_expressionForString("SET TRANSACTION ISOLATION LEVEL SERIALIZABLE, LOCKING PESSIMISTIC"));

NSDictionary<String, Object> connectionDict = entities.lastObject().model().connectionDictionary();
if (boolValueForKeyDefault(options, "dropDatabase", false)) {
if (options.dropDatabase()) {
result.addObjectsFromArray(dropDatabaseStatementsForConnectionDictionary(connectionDict, null));
}
if (boolValueForKeyDefault(options, "createDatabase", false)) {
if (options.createDatabase()) {
result.addObjectsFromArray(createDatabaseStatementsForConnectionDictionary(connectionDict, null));
}
if (boolValueForKeyDefault(options, "dropPrimaryKeySupport", true)) {
if (options.dropPrimaryKeySupport()) {
NSArray<NSArray<EOEntity>> entityGroups = primaryKeyEntityGroupsForEntities(entities);
result.addObjectsFromArray(dropPrimaryKeySupportStatementsForEntityGroups(entityGroups));
}
if (boolValueForKeyDefault(options, "dropTables", true)) {
if (options.dropTables()) {
NSArray<NSArray<EOEntity>> entityGroups = tableEntityGroupsForEntities(entities);
result.addObjectsFromArray(dropTableStatementsForEntityGroups(entityGroups));
}
if (boolValueForKeyDefault(options, "createTables", true)) {
if (options.createTables()) {
NSArray<NSArray<EOEntity>> entityGroups = tableEntityGroupsForEntities(entities);
result.addObjectsFromArray(createTableStatementsForEntityGroups(entityGroups));
result.addObjectsFromArray(createIndexStatementsForEntityGroups(entityGroups));
}
if (boolValueForKeyDefault(options, "createPrimaryKeySupport", true)) {
if (options.createPrimaryKeySupport()) {
NSArray<NSArray<EOEntity>> entityGroups = primaryKeyEntityGroupsForEntities(entities);
result.addObjectsFromArray(primaryKeySupportStatementsForEntityGroups(entityGroups));
}
if (boolValueForKeyDefault(options, "primaryKeyConstraints", true)) {
if (options.primaryKeyConstraints()) {
NSArray<NSArray<EOEntity>> entityGroups = tableEntityGroupsForEntities(entities);
result.addObjectsFromArray(primaryKeyConstraintStatementsForEntityGroups(entityGroups));
}
if (boolValueForKeyDefault(options, "foreignKeyConstraints", false)) {
if (options.foreignKeyConstraints()) {
NSArray<NSArray<EOEntity>> entityGroups = tableEntityGroupsForEntities(entities);
for (NSArray<EOEntity> entityGroup : entityGroups) {
result.addObjectsFromArray(_foreignKeyConstraintStatementsForEntityGroup(entityGroup));
Expand Down Expand Up @@ -776,9 +778,9 @@ public NSArray<EOSQLExpression> dropTableStatementsForEntityGroup(NSArray<EOEnti

@Override
public NSArray<EOSQLExpression> primaryKeySupportStatementsForEntityGroup(NSArray<EOEntity> entityGroup) {
if (entityGroup == null)
if (entityGroup == null) {
return NSArray.emptyArray();

}
NSMutableArray<EOSQLExpression> result = new NSMutableArray<EOSQLExpression>();

for (int i = entityGroup.count() - 1; i >= 0; i--) {
Expand Down Expand Up @@ -832,7 +834,7 @@ public NSArray<EOSQLExpression> foreignKeyConstraintStatementsForRelationship(EO
NSArray<EOAttribute> attributes = relationship.sourceAttributes();

for (int i = 0; i < attributes.count(); i++) {
constraint.append('_');
constraint.append("_");
if (i != 0)
fkSql.append(", ");

Expand All @@ -844,7 +846,7 @@ public NSArray<EOSQLExpression> foreignKeyConstraintStatementsForRelationship(EO
}

fkSql.append(") REFERENCES ");
constraint.append('_');
constraint.append("_");

String referencedExternalName = relationship.destinationEntity().externalName();
fkSql.append(quoteTableName(referencedExternalName.toUpperCase()));
Expand All @@ -855,7 +857,7 @@ public NSArray<EOSQLExpression> foreignKeyConstraintStatementsForRelationship(EO
attributes = relationship.destinationAttributes();

for (int i = 0; i < attributes.count(); i++) {
constraint.append('_');
constraint.append("_");
if (i != 0)
fkSql.append(", ");

Expand Down Expand Up @@ -904,9 +906,9 @@ public NSArray<EOSQLExpression> createTableStatementsForEntityGroup(NSArray<EOEn
NSMutableArray<String> nsmutablearray = new NSMutableArray<String>();
int j = entityGroup != null ? entityGroup.count() : 0;

if (j == 0)
if (j == 0) {
return NSArray.emptyArray();

}
// 出力バッファーを準備
StringBuilder columns = new StringBuilder();

Expand Down Expand Up @@ -967,9 +969,9 @@ public NSArray<EOSQLExpression> createIndexStatementsForEntityGroup(NSArray<EOEn
EOEntity eoentity = null;
int j = entityGroup != null ? entityGroup.count() : 0;

if (j == 0)
if (j == 0) {
return NSArray.emptyArray();

}
eosqlexpression = _expressionForEntity(entityGroup.objectAtIndex(0));

for (int i = 0; i < j; i++) {
Expand Down Expand Up @@ -1004,14 +1006,14 @@ public String columnTypeStringForAttribute(EOAttribute eoattribute) {
}

@Override
public NSArray<EOSQLExpression> statementsToConvertColumnType(String columnName, String tableName, ColumnTypes oldType, ColumnTypes newType, NSDictionary<String, String> options) {
public NSArray<EOSQLExpression> statementsToConvertColumnType(String columnName, String tableName, ColumnTypes oldType, ColumnTypes newType, EOSchemaGenerationOptions options) {
String columnTypeString = statementToCreateDataTypeClause(newType);
NSArray<EOSQLExpression> statements = new NSArray<EOSQLExpression>(_expressionForString("alter column " + quoteTableName(tableName) + "." + quoteTableName(columnName) + " to " + columnTypeString));
return statements;
}

@Override
public NSArray<EOSQLExpression> statementsToModifyColumnNullRule(String columnName, String tableName, boolean allowsNull, NSDictionary<String, String> options) {
public NSArray<EOSQLExpression> statementsToModifyColumnNullRule(String columnName, String tableName, boolean allowsNull, EOSchemaGenerationOptions options) {
NSArray<EOSQLExpression> statements;
if (allowsNull) {
if (USE_NAMED_CONSTRAINTS) {
Expand All @@ -1033,7 +1035,7 @@ public NSArray<EOSQLExpression> statementsToModifyColumnNullRule(String columnNa
}

@Override
public NSArray<EOSQLExpression> statementsToDeleteColumnNamed(String columnName, String tableName, NSDictionary<String, String> options) {
public NSArray<EOSQLExpression> statementsToDeleteColumnNamed(String columnName, String tableName, EOSchemaGenerationOptions options) {
return new NSArray<EOSQLExpression>(_expressionForString("alter table " + quoteTableName(tableName) + " drop column \"" + columnName.toUpperCase() + "\" cascade"));
}

Expand All @@ -1043,7 +1045,7 @@ public String _columnCreationClauseForAttribute(EOAttribute attribute) {
}

@Override
public NSArray<EOSQLExpression> statementsToInsertColumnForAttribute(EOAttribute attribute, NSDictionary<String, String> options) {
public NSArray<EOSQLExpression> statementsToInsertColumnForAttribute(EOAttribute attribute, EOSchemaGenerationOptions options) {
String clause = _columnCreationClauseForAttribute(attribute);
return new NSArray<EOSQLExpression>(_expressionForString("alter table " + quoteTableName(attribute.entity().externalName()) + " add " + clause));
}
Expand Down Expand Up @@ -1084,12 +1086,12 @@ private String statementToCreateDataTypeClause(EOSchemaSynchronization.ColumnTyp
}

@Override
public NSArray<EOSQLExpression> statementsToRenameColumnNamed(String columnName, String tableName, String newName, NSDictionary<String, String> options) {
public NSArray<EOSQLExpression> statementsToRenameColumnNamed(String columnName, String tableName, String newName, EOSchemaGenerationOptions options) {
return new NSArray<EOSQLExpression>(_expressionForString("alter column name " + quoteTableName(tableName) + "." + quoteTableName(columnName) + " to " + quoteTableName(newName)));
}

@Override
public NSArray<EOSQLExpression> statementsToRenameTableNamed(String tableName, String newName, NSDictionary<String, String> options) {
public NSArray<EOSQLExpression> statementsToRenameTableNamed(String tableName, String newName, EOSchemaGenerationOptions options) {
return new NSArray<EOSQLExpression>(_expressionForString("alter table name " + quoteTableName(tableName) + " to " + quoteTableName(newName)));
}

Expand Down Expand Up @@ -1136,9 +1138,9 @@ public NSArray<EOSQLExpression> primaryKeyConstraintStatementsForEntityGroup(NSA
StringBuilder pkSql = new StringBuilder(" PRIMARY KEY (");

for (int j = 0; j < keys.count(); j++) {
constraint.append('_');
constraint.append("_");
if (j != 0)
pkSql.append(',');
pkSql.append(",");

pkSql.append("\"");
String columnName = entity.attributeNamed(keys.objectAtIndex(j)).columnName();
Expand Down Expand Up @@ -1550,7 +1552,7 @@ else if (j == -1 && k == -1)
sb.append(orderByClause);
}
if (lockClause != null && lockClause.length() > 0) {
sb.append(' ');
sb.append(" ");
sb.append(lockClause);
}
return sb.toString();
Expand Down Expand Up @@ -1732,16 +1734,16 @@ public String sqlStringForKeyValueQualifier(EOKeyValueQualifier eokeyvaluequalif
value = sqlStringForValue(qualifier, attrubute);

sql.append(column);
sql.append(' ');
sql.append(" ");
sql.append(sqlStringForSelector(nsselector, qualifier));
sql.append(' ');
sql.append(" ");
sql.append(value);
}

if (value.indexOf(sqlEscapeChar) != -1 && flag) {
sql.append(" ESCAPE '");
sql.append(sqlEscapeChar);
sql.append('\'');
sql.append("'");
}
return sql.toString();
}
Expand Down Expand Up @@ -1796,7 +1798,7 @@ public String formatValueForAttribute(Object obj, EOAttribute eoattribute) {
StringBuffer time = new StringBuffer("TIME '");
Date d = (Date)eoattribute.adaptorValueByConvertingAttributeValue(obj);
TIME_FORMATTER.get().format(d, time, new FieldPosition(0));
time.append('\'');
time.append("'");
return time.toString();
}

Expand All @@ -1806,15 +1808,15 @@ public String formatValueForAttribute(Object obj, EOAttribute eoattribute) {
SimpleDateFormat formatter = TIME_FORMATTER.get();
formatter.format(d, time, new FieldPosition(0));
time.append(getTimeZone(formatter.getTimeZone()));
time.append('\'');
time.append("'");
return time.toString();
}

case FrontBaseTypes.FB_Timestamp: {
StringBuffer time = new StringBuffer("TIMESTAMP '");
Date d = (Date)eoattribute.adaptorValueByConvertingAttributeValue(obj);
TIMESTAMP_FORMATTER.get().format(d, time, new FieldPosition(0));
time.append('\'');
time.append("'");
return time.toString();
}
case FrontBaseTypes.FB_TimestampTZ: {
Expand All @@ -1823,14 +1825,14 @@ public String formatValueForAttribute(Object obj, EOAttribute eoattribute) {
SimpleDateFormat formatter = TIMESTAMP_FORMATTER.get();
formatter.format(d, time, new FieldPosition(0));
time.append(getTimeZone(formatter.getTimeZone()));
time.append('\'');
time.append("'");
return time.toString();
}
case FrontBaseTypes.FB_Date: {
StringBuffer time = new StringBuffer("DATE '");
Date d = (Date)eoattribute.adaptorValueByConvertingAttributeValue(obj);
DATE_FORMATTER.get().format(d, time, new FieldPosition(0));
time.append('\'');
time.append("'");
return time.toString();
}
case FrontBaseTypes.FB_Boolean: {
Expand Down Expand Up @@ -1976,7 +1978,7 @@ String formatBit(NSData data) {
result.append(heximals[b % 16]);
}

result.append('\'');
result.append("'");
return result.toString();
}

Expand Down