Merge lp:~danielturcanu/zorba/csv_conv_module into lp:~zorba-coders/zorba/data-converters-module

Proposed by Daniel Turcanu
Status: Merged
Approved by: Sorin Marian Nasoi
Approved revision: 81
Merged at revision: 81
Proposed branch: lp:~danielturcanu/zorba/csv_conv_module
Merge into: lp:~zorba-coders/zorba/data-converters-module
Diff against target: 26 lines (+2/-14)
1 file modified
src/com/zorba-xquery/www/modules/converters/csv-options.xsd (+2/-14)
To merge this branch: bzr merge lp:~danielturcanu/zorba/csv_conv_module
Reviewer Review Type Date Requested Status
Cezar Andrei Approve
Matthias Brantner Approve
Review via email: mp+92072@code.launchpad.net

This proposal supersedes a proposal from 2012-02-02.

Commit message

Changed type in csv options from xs:string to xs:boolean

Description of the change

Changed type in csv options from xs:string to xs:boolean

To post a comment you must log in.
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

The attempt to merge lp:~danielturcanu/zorba/csv_conv_module into lp:zorba/data-converters-module failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job csv_conv_module-2012-02-04T03-11-59.159Z is finished.
  The final status was:

  3 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Cezar Andrei (cezar-andrei) wrote : Posted in a previous version of this proposal

Not 100% backwards compatible in the schema sense but previous instances should still be valid. Daniel, you still need to fix the 3 tests failing.

review: Approve
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job csv_conv_module-2012-02-08T18-47-40.291Z is finished. The final status was:

All tests succeeded!

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve, 1 Pending.

Revision history for this message
Cezar Andrei (cezar-andrei) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job csv_conv_module-2012-02-14T13-36-36.362Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/com/zorba-xquery/www/modules/converters/csv-options.xsd'
2--- src/com/zorba-xquery/www/modules/converters/csv-options.xsd 2011-08-17 23:28:43 +0000
3+++ src/com/zorba-xquery/www/modules/converters/csv-options.xsd 2012-02-08 16:49:52 +0000
4@@ -35,20 +35,8 @@
5 </restriction>
6 </simpleType>
7 </attribute>
8- <attribute name="ignore-foreign-input" default="false">
9- <simpleType>
10- <restriction base="string">
11- <pattern value="true|false"/>
12- </restriction>
13- </simpleType>
14- </attribute>
15- <attribute name="accept-all-lines" default="false">
16- <simpleType>
17- <restriction base="string">
18- <pattern value="true|false"/>
19- </restriction>
20- </simpleType>
21- </attribute>
22+ <attribute name="ignore-foreign-input" type="boolean" default="false"/>
23+ <attribute name="accept-all-lines" type="boolean" default="false"/>
24 </complexType>
25 <complexType name="start-from-rowType">
26 <attribute name="line">

Subscribers

People subscribed via source and target branches

to all changes: