enso-org/enso
1
1
Fork 0
mirror of https://github.com/enso-org/enso.git synced 2024-12-23 09:22:41 +03:00
Code Issues Projects Releases Wiki Activity

Make excel writer work for all types (#9846)

Browse Source 
* New Test

* Improve DateTime recognition

* Re-enable slow test

* If there is a time take it regardless of format

* If there is a time take it regardless of format

* Code Review Changes
This commit is contained in:
AdRiley 2024-05-03 09:09:54 +03:00 committed by GitHub
parent a44bb2b1b1
commit f647045214
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
std-bits/table/src/main/java/org/enso/table/excel/ExcelRow.java
View File

@ -46,7 +46,10 @@ public class ExcelRow {
return dateTime.toLocalTime();
}
if (dateTime.getHour() == 0 && dateTime.getMinute() == 0 && dateTime.getSecond() == 0) {
return dateTime.toLocalDate();
var dateFormat = cell.getCellStyle().getDataFormatString();
if (!dateFormat.contains("h") && !dateFormat.contains("H")) {
return dateTime.toLocalDate();
}
}
return dateTime.atZone(ZoneId.systemDefault());
} else {

4
std-bits/table/src/main/java/org/enso/table/write/ExcelWriter.java
View File

@ -14,6 +14,7 @@ import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.enso.table.data.column.storage.BoolStorage;
import org.enso.table.data.column.storage.Storage;
import org.enso.table.data.column.storage.datetime.DateTimeStorage;
import org.enso.table.data.column.storage.numeric.AbstractLongStorage;
import org.enso.table.data.column.storage.numeric.DoubleStorage;
import org.enso.table.data.table.Column;
@ -498,6 +499,9 @@ public class ExcelWriter {
cell.setCellValue(longStorage.getItem(j));
} else if (storage instanceof BoolStorage boolStorage) {
cell.setCellValue(boolStorage.getItem(j));
} else if (storage instanceof DateTimeStorage dateTimeStorage) {
cell.setCellValue(dateTimeStorage.getItem(j).toLocalDateTime());
cell.setCellStyle(getDateTimeStyle(workbook, "yyyy-MM-dd HH:mm:ss"));
} else {
Object value = storage.getItemBoxed(j);
switch (value) {

16
test/Table_Tests/data/all_data_types.csv Normal file
View File

@ -0,0 +1,16 @@
id_integer,name_char,age_integer,salary_integer,join_date_date,is_active_boolean,start_time_time,appointment_datetime_datetime_withtimezone,height_cm_float
1,John Doe,18,-2147483648,2000-01-01,true,00:00:00,2000-01-01 00:00:00,150.2
2,Jane Smith,25,0,2010-05-20,false,06:30:00,2015-12-31 23:59:59,160.0
3,Mike Johnson,40,10000,1966-02-10,true,,1995-06-15 15:30:00,170.0
4,Sarah Parker,22,25000,2022-03-05,,18:45:00,2023-12-31 00:00:00,165.0
5,David Brown,30,50000,1980-11-12,true,21:15:00,1970-01-01 08:00:00,180.0
6,Lisa Wilson,28,35000,2005-09-30,false,09:30:00,2010-12-31 12:00:00,155.0
7,Chris Lee,35,70000,2000-07-18,true,15:45:00,1999-12-31 23:59:59,
8,Emily Adams,20,999,2021-12-22,false,03:00:00,2024-04-27 15:00:00,140.0
9,Michael Taylor,33,68000,2010-03-08,true,08:30:00,2015-06-30 17:30:00,172.2
10,Amy Chen,23,63000,,false,12:15:00,2018-12-31 19:00:00,160.0
11,André Müller,45,2147483647,1970-01-01,true,00:00:00,1999-12-31 14:00:00,185.8
12,Елена Иванова,18,1000,2000-01-01,false,06:00:00,,120.0
13,John,,,2010-10-05,true,15:30:00,2015-06-30 16:45:00,125.0
14,田中 花子,20,-2147483648,1980-04-25,false,22:00:00,1966-01-01 08:45:00,140.0
15,김 영희,22,50000,2015-01-08,true,08:00:00,2016-12-31 00:00:00,150.0
1 id_integer name_char age_integer salary_integer join_date_date is_active_boolean start_time_time appointment_datetime_datetime_withtimezone height_cm_float
2 1 John Doe 18 -2147483648 2000-01-01 true 00:00:00 2000-01-01 00:00:00 150.2
3 2 Jane Smith 25 0 2010-05-20 false 06:30:00 2015-12-31 23:59:59 160.0
4 3 Mike Johnson 40 10000 1966-02-10 true 1995-06-15 15:30:00 170.0
5 4 Sarah Parker 22 25000 2022-03-05 18:45:00 2023-12-31 00:00:00 165.0
6 5 David Brown 30 50000 1980-11-12 true 21:15:00 1970-01-01 08:00:00 180.0
7 6 Lisa Wilson 28 35000 2005-09-30 false 09:30:00 2010-12-31 12:00:00 155.0
8 7 Chris Lee 35 70000 2000-07-18 true 15:45:00 1999-12-31 23:59:59
9 8 Emily Adams 20 999 2021-12-22 false 03:00:00 2024-04-27 15:00:00 140.0
10 9 Michael Taylor 33 68000 2010-03-08 true 08:30:00 2015-06-30 17:30:00 172.2
11 10 Amy Chen 23 63000 false 12:15:00 2018-12-31 19:00:00 160.0
12 11 André Müller 45 2147483647 1970-01-01 true 00:00:00 1999-12-31 14:00:00 185.8
13 12 Елена Иванова 18 1000 2000-01-01 false 06:00:00 120.0
14 13 John 2010-10-05 true 15:30:00 2015-06-30 16:45:00 125.0
15 14 田中 花子 20 -2147483648 1980-04-25 false 22:00:00 1966-01-01 08:45:00 140.0
16 15 김 영희 22 50000 2015-01-08 true 08:00:00 2016-12-31 00:00:00 150.0

9
test/Table_Tests/src/IO/Excel_Spec.enso
View File

@ -157,6 +157,15 @@ spec_write suite_builder suffix test_sheet_name =
written.read 'EnsoSheet' . should_equal data.table
written.close
group_builder.specify 'should be able to round trip all the data types' <|
alltypes = enso_project.data / "transient" / "alltypes."+suffix
alltypes.delete_if_exists . should_succeed
t1 = enso_project.data/'all_data_types.csv' . read
t1.write alltypes (Excel_Format.Sheet "AllTypes") . should_succeed
t2 = alltypes.read (Excel_Format.Sheet "AllTypes")
t2.should_equal t1
group_builder.specify 'should write a table to non-existent file in append mode as a new sheet with headers' <|
out = data.create_out
data.table.write out on_existing_file=Existing_File_Behavior.Append on_problems=Report_Error . should_succeed