1. add UT for import ODS 2. fix warning in source code when import ODS file #463

Merged
merged 4 commits into from Jul 1, 2013

Projects

None yet

3 participants

@adamgsoc2013
Contributor

No description provided.

@adamgsoc2013 adamgsoc2013 and 1 other commented on an outdated diff Jun 29, 2013
libraries/plugins/import/ImportOds.class.php
@@ -161,6 +161,9 @@ public function doImport()
* result in increased performance without the need to
* alter the code in any way. It's basically a freebee.
*/
+
+ //fix import warning: simplexml_load_string(): namespace error : Namespace prefix number is not defined
+ $buffer = str_replace("number:", "number_", $buffer);
@adamgsoc2013
adamgsoc2013 Jun 29, 2013 Contributor

Hi Michal, this line change is due to the XML of Open Document Spreadsheet have so many <number: prefix. so the warning are everywhere.

@adamgsoc2013
adamgsoc2013 Jun 29, 2013 Contributor

and will cause UT failed

@nijel
nijel Jul 1, 2013 Member

This is rather a bug in our export code which does not include this namespace. Please use rather real ODS file from LibreOffice than minimalistic one phpMyAdmin generates.

@nijel
nijel Jul 1, 2013 Member

I've fixed the bug on our side in a0cf5b3.

@adamgsoc2013
Owner

Hi Michal, this failure is not related with my test case. It is from the source code changes merged from QA branch.

@xmujay
Contributor
xmujay commented Jun 29, 2013

Hi Adam, It is my fault to cause your commit failed. I have fixed it on #464

Sorry for the inconvenience.

@adamgsoc2013
Contributor

Hi Michal, in the latest commit, I am using OpenOffice ODS file for importing ods testing and remove the changes for source code which you have fixed about the prefix "number"

thanks

@adamgsoc2013 adamgsoc2013 commented on the diff Jul 1, 2013
test/classes/PMA_DisplayResults_test.php
@@ -442,7 +442,7 @@ public function providerForTestGetTableNavigation()
41,
'123',
false,
- '333'
@adamgsoc2013
adamgsoc2013 Jul 1, 2013 Contributor

this is to fix assertion failure due to source merged from QA branch.

@nijel nijel merged commit b8be7d6 into phpmyadmin:master Jul 1, 2013

1 check passed

default The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment