Skip to content

[CDA-175] - Exporting Union query that has a uses a query with a calc… #202

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[CDA-175] - Exporting Union query that has a uses a query with a calc… #202

Show file tree
Hide file tree
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
12 changes: 12 additions & 0 deletions core/src/main/java/pt/webdetails/cda/utils/TableModelUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,6 +471,12 @@ public static TableModel appendTableModel( final TableModel tableModelA, final T
final TypedTableModel typedTableModel = new TypedTableModel( colNames, colTypes, rowCount );
for ( int r = 0; r < tableModelA.getRowCount(); r++ ) {
for ( int c = 0; c < colTypes.length; c++ ) {
if ( c < typedTableModel.getColumnCount() && c < tableModelA.getColumnCount() ) {
if ( !typedTableModel.getColumnClass( c ).equals( tableModelA.getColumnClass( c ) ) ) {
logger.error( "type mismatch, appending '" + tableModelA.getColumnClass( c ).getName() + "' to '"
+ typedTableModel.getColumnClass( c ).getName() + "'" );
}
}
typedTableModel.setValueAt( tableModelA.getValueAt( r, c ), r, c );
}
}
Expand All @@ -479,6 +485,12 @@ public static TableModel appendTableModel( final TableModel tableModelA, final T
int rowCountOffset = tableModelA.getRowCount();
for ( int r = 0; r < tableModelB.getRowCount(); r++ ) {
for ( int c = 0; c < colTypes.length; c++ ) {
if ( c < typedTableModel.getColumnCount() && c < tableModelB.getColumnCount() ) {
if ( !typedTableModel.getColumnClass( c ).equals( tableModelB.getColumnClass( c ) ) ) {
logger.error( "type mismatch, appending '" + tableModelB.getColumnClass( c ).getName() + "' to '"
+ typedTableModel.getColumnClass( c ).getName() + "'" );
}
}
typedTableModel.setValueAt( tableModelB.getValueAt( r, c ), r + rowCountOffset, c );
}
}
Expand Down
75 changes: 42 additions & 33 deletions core/src/main/java/pt/webdetails/robochef/TableModelInput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

import javax.swing.table.TableModel;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.pentaho.di.core.row.RowMeta;
import org.pentaho.di.core.row.RowMetaInterface;
import org.pentaho.di.core.row.ValueMetaInterface;
Expand All @@ -28,6 +30,7 @@
import org.pentaho.di.core.row.value.ValueMetaString;

public class TableModelInput extends RowProducerBridge {
private static final Log logger = LogFactory.getLog( TableModelInput.class );
public synchronized Callable<Boolean> getCallableRowProducer( final TableModel tableModel,
final boolean markFinished ) {
final Callable<Boolean> callable = new Callable<Boolean>() {
Expand Down Expand Up @@ -60,42 +63,48 @@ private Object getDataObjectForColumn( final ValueMetaInterface valueMeta, final
}

Object newValue;
switch( valueMeta.getType() ) {
case ValueMetaInterface.TYPE_STRING:
newValue = String.valueOf( value );
break;
case ValueMetaInterface.TYPE_NUMBER:
if ( value instanceof Double ) {
newValue = value;
} else {
newValue = Double.valueOf( value.toString() );
}
break;
case ValueMetaInterface.TYPE_INTEGER:
if ( value instanceof Long ) {
try {
switch ( valueMeta.getType() ) {
case ValueMetaInterface.TYPE_STRING:
newValue = String.valueOf( value );
break;
case ValueMetaInterface.TYPE_NUMBER:
if ( value instanceof Double ) {
newValue = value;
} else {
newValue = Double.valueOf( value.toString() );
}
break;
case ValueMetaInterface.TYPE_INTEGER:
if ( value instanceof Long ) {
newValue = value;
} else {
newValue = Long.valueOf( value.toString() );
}
break;
case ValueMetaInterface.TYPE_DATE:
newValue = value;
} else {
newValue = Long.valueOf( value.toString() );
}
break;
case ValueMetaInterface.TYPE_DATE:
newValue = value;
break;
case ValueMetaInterface.TYPE_BIGNUMBER:
if ( value instanceof java.math.BigDecimal ) {
break;
case ValueMetaInterface.TYPE_BIGNUMBER:
if ( value instanceof java.math.BigDecimal ) {
newValue = value;
} else {
newValue = java.math.BigDecimal.valueOf( ( (java.math.BigInteger) value ).doubleValue() );
}
break;
case ValueMetaInterface.TYPE_BOOLEAN:
newValue = value;
} else {
newValue = java.math.BigDecimal.valueOf( ( (java.math.BigInteger) value ).doubleValue() );
}
break;
case ValueMetaInterface.TYPE_BOOLEAN:
newValue = value;
break;
default:
throw new IllegalArgumentException(
String.format( "ValueMeta mismatch %s (%s)", valueMeta.toString(), value ) );
break;
default:
throw new IllegalArgumentException(
String.format( "ValueMeta mismatch %s (%s)", valueMeta.toString(), value ) );
}
return newValue;
} catch ( NumberFormatException e ) {
logger.error( "type mismatch in column '" + valueMeta.getName() + "' expecting '" + valueMeta.getTypeDesc()
+ "' received '" + value.getClass().getName() + "'" );
throw e;
}
return newValue;
}

private RowMetaInterface getRowMetaForTableModel( final TableModel tableModel ) throws IllegalArgumentException {
Expand Down