-
Notifications
You must be signed in to change notification settings - Fork 25
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.
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
Fix/ctas oracle column definitions #237
base: main
Are you sure you want to change the base?
Changes from all commits
8c076b3
9406db1
8df877b
543c731
dc38093
a768135
689719c
9323bf2
3618284
a6bd27d
dee6463
17abbba
cd1aca1
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -63,6 +63,7 @@ | |
import org.alfasoftware.morf.sql.element.ConcatenatedField; | ||
import org.alfasoftware.morf.sql.element.FieldReference; | ||
import org.alfasoftware.morf.sql.element.Function; | ||
import org.alfasoftware.morf.sql.element.NullFieldLiteral; | ||
import org.alfasoftware.morf.sql.element.SqlParameter; | ||
import org.alfasoftware.morf.sql.element.TableReference; | ||
import org.apache.commons.lang3.StringUtils; | ||
|
@@ -96,6 +97,8 @@ class OracleDialect extends SqlDialect { | |
*/ | ||
public static final String NULLS_LAST = "NULLS LAST"; | ||
|
||
private static final String CANNOT_CONVERT_NULL_STATEMENT_TO_SQL = "Cannot convert a null statement to SQL"; | ||
|
||
/** | ||
* Database platforms may order nulls first or last. My SQL always orders nulls first, Oracle defaults to ordering nulls last. | ||
* Fortunately on Oracle it is possible to specify that nulls should be ordered first. | ||
|
@@ -1105,11 +1108,26 @@ public Collection<String> renameTableStatements(Table fromTable, Table toTable) | |
*/ | ||
@Override | ||
public Collection<String> addTableFromStatements(Table table, SelectStatement selectStatement) { | ||
List<AliasedField> fieldsToInclude = new ArrayList<>(); | ||
|
||
for(AliasedField field: selectStatement.getFields()) { | ||
if (field instanceof NullFieldLiteral || field instanceof FieldReference) { | ||
Column column = table.columns().get(selectStatement.getFields().indexOf(field)); | ||
fieldsToInclude.add(new Cast( | ||
field, | ||
column.getType(), | ||
column.getWidth(), | ||
column.getScale()).as(column.getName())); | ||
} else { | ||
fieldsToInclude.add(field); | ||
} | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
I think we want to handle all fields, including expressions, etc. |
||
|
||
Builder<String> result = ImmutableList.<String>builder(); | ||
result.add(new StringBuilder() | ||
.append(createTableStatement(table, true)) | ||
.append(" AS ") | ||
.append(convertStatementToSQL(selectStatement)) | ||
.append(convertStatementToSQL(selectStatement.shallowCopy().withFields(fieldsToInclude).build())) | ||
.toString() | ||
); | ||
result.add("ALTER TABLE " + schemaNamePrefix() + table.getName() + " NOPARALLEL LOGGING"); | ||
|
@@ -1123,7 +1141,6 @@ public Collection<String> addTableFromStatements(Table table, SelectStatement se | |
return result.build(); | ||
} | ||
|
||
|
||
/** | ||
* Builds the remaining statements (triggers, sequences and comments). | ||
* | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Was this not possible to add as tests for all dialects? |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,188 @@ | ||
package org.alfasoftware.morf.jdbc.oracle; | ||
|
||
import org.alfasoftware.morf.metadata.DataType; | ||
import org.alfasoftware.morf.metadata.Table; | ||
import org.alfasoftware.morf.sql.SelectStatement; | ||
import org.junit.Test; | ||
|
||
import static org.alfasoftware.morf.metadata.SchemaUtils.*; | ||
import static org.alfasoftware.morf.sql.SqlUtils.*; | ||
import static org.junit.Assert.assertEquals; | ||
|
||
public class TestOracleDialectBespokeFunctionality { | ||
|
||
|
||
|
||
@Test | ||
public void testConvertStatementToSQL() { | ||
Table table = table("SomeTable") | ||
.columns( | ||
column("someField", DataType.STRING, 3).primaryKey(), | ||
column("otherField", DataType.DECIMAL, 3), | ||
column("nullField", DataType.STRING, 3) | ||
).indexes( | ||
index("SomeTable_1").columns("otherField") | ||
); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Notice that this index is not present in the resulting SQL (which is correct and by design). |
||
|
||
SelectStatement selectStatement = select(field("someField"), field("otherField"), nullLiteral()).from(tableRef("OtherTable")); | ||
|
||
OracleDialect oracleDialect = new OracleDialect("TEST"); | ||
String result = oracleDialect.addTableFromStatements(table, selectStatement).toString(); | ||
|
||
String expectedResult = "[CREATE TABLE TEST.SomeTable (" + | ||
"someField NOT NULL, " + | ||
"otherField NOT NULL, " + | ||
"nullField NOT NULL, " + | ||
"CONSTRAINT SomeTable_PK PRIMARY KEY (someField) " + | ||
"USING INDEX (CREATE UNIQUE INDEX TEST.SomeTable_PK ON TEST.SomeTable (someField))) " + | ||
"PARALLEL NOLOGGING " + | ||
"AS SELECT " + | ||
"CAST(someField AS NVARCHAR2(3)) AS someField, " + | ||
"CAST(otherField AS DECIMAL(3,0)) AS otherField, " + | ||
"CAST(null AS NVARCHAR2(3)) AS nullField " + | ||
"FROM TEST.OtherTable, " + | ||
"ALTER TABLE TEST.SomeTable NOPARALLEL LOGGING, " + | ||
"ALTER INDEX TEST.SomeTable_PK NOPARALLEL LOGGING, " + | ||
"COMMENT ON TABLE TEST.SomeTable IS 'REALNAME:[SomeTable]', " + | ||
"COMMENT ON COLUMN TEST.SomeTable.someField IS 'REALNAME:[someField]/TYPE:[STRING]', " + | ||
"COMMENT ON COLUMN TEST.SomeTable.otherField IS 'REALNAME:[otherField]/TYPE:[DECIMAL]', " + | ||
"COMMENT ON COLUMN TEST.SomeTable.nullField IS 'REALNAME:[nullField]/TYPE:[STRING]']"; | ||
assertEquals(expectedResult, result); | ||
} | ||
|
||
@Test | ||
public void testDistinctStatement() { | ||
OracleDialect oracleDialect = new OracleDialect("TEST"); | ||
|
||
Table table = table("SomeTable") | ||
.columns( | ||
column("someField", DataType.STRING, 3).primaryKey(), | ||
column("otherField", DataType.DECIMAL, 3) | ||
).indexes( | ||
index("SomeTable_1").columns("otherField") | ||
); | ||
|
||
SelectStatement selectStatement = select(field("someField"), field("otherField")).from(tableRef("OtherTable")); | ||
SelectStatement distinctSelectStatement = selectStatement.shallowCopy().distinct().build(); | ||
|
||
String result = oracleDialect.addTableFromStatements(table, distinctSelectStatement).toString(); | ||
|
||
String expectedResult = "[CREATE TABLE TEST.SomeTable (" + | ||
"someField NOT NULL, " + | ||
"otherField NOT NULL, " + | ||
"CONSTRAINT SomeTable_PK PRIMARY KEY (someField) " + | ||
"USING INDEX (CREATE UNIQUE INDEX TEST.SomeTable_PK ON TEST.SomeTable (someField))) " + | ||
"PARALLEL NOLOGGING " + | ||
"AS SELECT DISTINCT " + | ||
"CAST(someField AS NVARCHAR2(3)) AS someField, " + | ||
"CAST(otherField AS DECIMAL(3,0)) AS otherField FROM TEST.OtherTable, " + | ||
"ALTER TABLE TEST.SomeTable NOPARALLEL LOGGING, " + | ||
"ALTER INDEX TEST.SomeTable_PK NOPARALLEL LOGGING, " + | ||
"COMMENT ON TABLE TEST.SomeTable IS 'REALNAME:[SomeTable]', " + | ||
"COMMENT ON COLUMN TEST.SomeTable.someField IS 'REALNAME:[someField]/TYPE:[STRING]', " + | ||
"COMMENT ON COLUMN TEST.SomeTable.otherField IS 'REALNAME:[otherField]/TYPE:[DECIMAL]']"; | ||
assertEquals(expectedResult, result); | ||
} | ||
|
||
|
||
@Test | ||
public void testAllStatement() { | ||
OracleDialect oracleDialect = new OracleDialect("TEST"); | ||
|
||
Table table = table("SomeTable") | ||
.columns( | ||
column("someField", DataType.STRING, 3).primaryKey(), | ||
column("otherField", DataType.DECIMAL, 3) | ||
).indexes( | ||
index("SomeTable_1").columns("otherField") | ||
); | ||
|
||
SelectStatement selectStatement = select().from(tableRef("OtherTable")); | ||
SelectStatement distinctSelectStatement = selectStatement.shallowCopy().distinct().build(); | ||
|
||
String result = oracleDialect.addTableFromStatements(table, distinctSelectStatement).toString(); | ||
|
||
String expectedResult = "[CREATE TABLE TEST.SomeTable (" + | ||
"someField NOT NULL, " + | ||
"otherField NOT NULL, " + | ||
"CONSTRAINT SomeTable_PK PRIMARY KEY (someField) " + | ||
"USING INDEX (CREATE UNIQUE INDEX TEST.SomeTable_PK ON TEST.SomeTable (someField))) " + | ||
"PARALLEL NOLOGGING " + | ||
"AS SELECT DISTINCT * FROM TEST.OtherTable, " + | ||
"ALTER TABLE TEST.SomeTable NOPARALLEL LOGGING, " + | ||
"ALTER INDEX TEST.SomeTable_PK NOPARALLEL LOGGING, " + | ||
"COMMENT ON TABLE TEST.SomeTable IS 'REALNAME:[SomeTable]', " + | ||
"COMMENT ON COLUMN TEST.SomeTable.someField IS 'REALNAME:[someField]/TYPE:[STRING]', " + | ||
"COMMENT ON COLUMN TEST.SomeTable.otherField IS 'REALNAME:[otherField]/TYPE:[DECIMAL]']"; | ||
assertEquals(expectedResult, result); | ||
} | ||
|
||
@Test | ||
public void testUpdateStatement() { | ||
OracleDialect oracleDialect = new OracleDialect("TEST"); | ||
|
||
Table table = table("SomeTable") | ||
.columns( | ||
column("someField", DataType.STRING, 3).primaryKey(), | ||
column("otherField", DataType.DECIMAL, 3) | ||
).indexes( | ||
index("SomeTable_1").columns("otherField") | ||
); | ||
|
||
SelectStatement selectStatement = select().from(tableRef("OtherTable")); | ||
SelectStatement updateSelectStatement = selectStatement.shallowCopy().forUpdate().build(); | ||
|
||
String result = oracleDialect.addTableFromStatements(table, updateSelectStatement).toString(); | ||
|
||
String expectedResult = "[CREATE TABLE TEST.SomeTable (" + | ||
"someField NOT NULL, " + | ||
"otherField NOT NULL, " + | ||
"CONSTRAINT SomeTable_PK PRIMARY KEY (someField) " + | ||
"USING INDEX (CREATE UNIQUE INDEX TEST.SomeTable_PK ON TEST.SomeTable (someField))) " + | ||
"PARALLEL NOLOGGING " + | ||
"AS SELECT * FROM TEST.OtherTable " + | ||
"FOR UPDATE, " + | ||
"ALTER TABLE TEST.SomeTable NOPARALLEL LOGGING, " + | ||
"ALTER INDEX TEST.SomeTable_PK NOPARALLEL LOGGING, " + | ||
"COMMENT ON TABLE TEST.SomeTable IS 'REALNAME:[SomeTable]', " + | ||
"COMMENT ON COLUMN TEST.SomeTable.someField IS 'REALNAME:[someField]/TYPE:[STRING]', " + | ||
"COMMENT ON COLUMN TEST.SomeTable.otherField IS 'REALNAME:[otherField]/TYPE:[DECIMAL]']"; | ||
assertEquals(expectedResult, result); | ||
} | ||
|
||
@Test(expected = IllegalArgumentException.class) | ||
public void testUpdateForDistinctStatement() { | ||
OracleDialect oracleDialect = new OracleDialect("TEST"); | ||
|
||
Table table = table("SomeTable") | ||
.columns( | ||
column("someField", DataType.STRING, 3).primaryKey(), | ||
column("otherField", DataType.DECIMAL, 3) | ||
).indexes( | ||
index("SomeTable_1").columns("otherField") | ||
); | ||
|
||
SelectStatement selectStatement = select().from(tableRef("OtherTable")); | ||
SelectStatement distinctSelectStatement = selectStatement.shallowCopy().forUpdate().distinct().build(); | ||
|
||
String result = oracleDialect.addTableFromStatements(table, distinctSelectStatement).toString(); | ||
} | ||
|
||
@Test(expected = IllegalArgumentException.class) | ||
public void testIllegalArgumentExeptionIsThrown() { | ||
OracleDialect oracleDialect = new OracleDialect("TEST"); | ||
|
||
Table table = table("SomeTable") | ||
.columns( | ||
column("someField", DataType.STRING, 3).primaryKey(), | ||
column("otherField", DataType.DECIMAL, 3), | ||
column("nullField", DataType.STRING, 3) | ||
).indexes( | ||
index("SomeTable_1").columns("otherField") | ||
); | ||
|
||
oracleDialect.convertStatementToSQL((SelectStatement) null); | ||
} | ||
|
||
|
||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rename to
replaceFields()