Compare text

Find the difference between two text files

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

Tools

Untitled diff

Created 9 years agoDiff never expires

14 removals

110 lines

15 additions

110 lines

<?xml version="1.0"?>

<external-schema filename="external/author.schema.xml"/>

<foreign-key foreignTable="author" onDelete="SETNULL">

</foreign-key>

<foreign-key foreignTable="publisher" onDelete="SETNULL">

</foreign-key>

</validator>

</validator>

</table>

<foreign-key foreignTable="book" onDelete="CASCADE">

</foreign-key>

</table>

</database>

</table>

<foreign-key foreignTable="book" onDelete="CASCADE">

</foreign-key>

<foreign-key foreignTable="book_club_list" onDelete="CASCADE">

</foreign-key>

</table>

</database>

</validator>

</validator>

</validator>

</table>

</database>

</database>

</table>

</database>

<foreign-key foreignTable="book" onDelete="CASCADE">

</foreign-key>

</validator>

</validator>

</table>

</database>

</table>

</database>

</multixml>

Saved diffs

Original text

Open file

<?xml version="1.0"?>
<multixml>
  <database defaultIdMethod="native" name="bookstore" package="core.book">
    <table description="Book Table" name="book">
      <behavior name="auto_add_pk"/>
      <column description="Foreign Key Author" name="author_id" type="INTEGER"/>
      <column autoIncrement="true" name="id" primaryKey="true" required="true" type="Integer"/>
      <column description="ISBN Number" name="isbn" phpName="ISBN" required="true" size="24" type="VARCHAR"/>
      <column description="Foreign Key Publisher" name="publisher_id" type="INTEGER"/>
      <column description="Book Title" name="title" required="true" size="255" type="VARCHAR"/>
      <foreign-key foreignTable="author" onDelete="SETNULL">
        <reference foreign="id" local="author_id"/>
      </foreign-key>
      <foreign-key foreignTable="publisher" onDelete="SETNULL">
        <reference foreign="id" local="publisher_id"/>
      </foreign-key>
      <validator column="isbn">
        <rule message="The ISBN contains invalid characters." name="notMatch" value="/[^\d-]+/"/>
      </validator>
      <validator column="title">
        <rule message="Book title must not be longer than ${value} characters." name="maxLength" value="255"/>
        <rule message="Book title must be more than ${value} characters long." name="minLength" value="10"/>
        <rule message="Book title already in database." name="unique"/>
      </validator>
    </table>
    <table name="media">
      <behavior name="auto_add_pk"/>
      <column description="Book ID for this media collection." name="book_id" required="true" type="INTEGER"/>
      <column description="The image of the book cover." lazyLoad="true" name="cover_image" type="BLOB"/>
      <column description="An excerpt from the book." lazyLoad="true" name="excerpt" type="CLOB"/>
      <foreign-key foreignTable="book" onDelete="CASCADE">
        <reference foreign="id" local="book_id"/>
      </foreign-key>
    </table>
  </database>
  <database defaultIdMethod="native" name="bookstore" package="addon.club">
    <table description="Reading list for a book club." name="book_club_list">
      <behavior name="auto_add_pk"/>
      <column description="The name of the teacher in charge of summer reading." name="group_leader" required="true" size="100" type="VARCHAR"/>
      <column autoIncrement="true" name="id" primaryKey="true" required="true" type="Integer"/>
      <column description="The theme, if applicable, for the reading list." name="theme" size="50" type="VARCHAR"/>
    </table>
    <table description="Cross-reference table for many-to-many relationship between book rows and book_club_list rows." name="book_x_list" phpName="BookListRel">
      <column description="Fkey to book_club_list.id" name="book_club_list_id" primaryKey="true" type="INTEGER"/>
      <column description="Fkey to book.id" name="book_id" primaryKey="true" type="INTEGER"/>
      <foreign-key foreignTable="book" onDelete="CASCADE">
        <reference foreign="id" local="book_id"/>
      </foreign-key>
      <foreign-key foreignTable="book_club_list" onDelete="CASCADE">
        <reference foreign="id" local="book_club_list_id"/>
      </foreign-key>
    </table>
  </database>
  <database defaultIdMethod="native" name="bookstore" package="core.author">
    <table description="Author Table" name="author">
      <behavior name="auto_add_pk"/>
      <column description="The authors age" name="age" type="INTEGER"/>
      <column description="E-Mail Address" name="email" size="128" type="VARCHAR"/>
      <column description="First Name" name="first_name" required="true" size="128" type="VARCHAR"/>
      <column autoIncrement="true" name="id" primaryKey="true" required="true" type="Integer"/>
      <column description="Last Name" name="last_name" required="true" size="128" type="VARCHAR"/>
      <validator column="age">
        <rule message="Impressive age! Just kidding, hm?" name="maxValue" value="100"/>
        <rule message="Please enter a positive number." name="minValue" value="0"/>
      </validator>
      <validator column="email">
        <rule message="Please enter a valid email address." name="match" value="/^([a-zA-Z0-9])+([\.a-zA-Z0-9_-])*@([a-zA-Z0-9])+(\.[a-zA-Z0-9_-]+)+$/"/>
      </validator>
      <validator column="last_name">
        <rule message="The last name field is required." name="required"/>
      </validator>
    </table>
  </database>
  <database defaultIdMethod="native" name="bookstore" package="core.book"/>
  <database defaultIdMethod="native" name="bookstore" package="core.publisher">
    <table description="Publisher Table" name="publisher">
      <behavior name="auto_add_pk"/>
      <column autoIncrement="true" name="id" primaryKey="true" required="true" type="Integer"/>
      <column default="Penguin" description="Publisher Name" name="name" required="true" size="128" type="VARCHAR"/>
    </table>
  </database>
  <database defaultIdMethod="native" name="bookstore" package="core.review">
    <table description="Book Review" name="review">
      <behavior name="auto_add_pk"/>
      <column description="Book ID for this review" name="book_id" required="true" type="INTEGER"/>
      <column description="Does reviewer recommend book?" name="recommended" required="true" type="BOOLEAN"/>
      <column default="01/01/2001" description="Date of Review" name="review_date" required="true" type="DATE"/>
      <column description="Reviewer Name" name="reviewed_by" required="true" size="128" type="VARCHAR"/>
      <column description="The status of this review." name="status" size="8" type="VARCHAR"/>
      <foreign-key foreignTable="book" onDelete="CASCADE">
        <reference foreign="id" local="book_id"/>
      </foreign-key>
      <validator column="reviewed_by">
        <rule message="The reviewed by field is required." name="required"/>
      </validator>
      <validator column="status">
        <rule message="Invalid status. (new, reviewed, archived)" name="validValues" value="new|reviewed|archived"/>
      </validator>
    </table>
  </database>
  <database defaultIdMethod="native" name="bookstore-log" package="util.log">
    <table description="Used to test multiple databases support" name="log" phpName="BookstoreLog">
      <behavior name="auto_add_pk"/>
      <column description="Log priority" name="ident" required="true" size="24" type="CHAR"/>
      <column description="Log message" name="message" required="true" type="LONGVARCHAR"/>
      <column description="Log priority" name="priority" required="true" type="INTEGER"/>
      <column description="Log time" name="time" required="true" type="TIMESTAMP"/>
    </table>
  </database>
</multixml>

Changed text

Open file

<?xml version="1.0"?>
<multixml>
  <database defaultIdMethod="native" name="bookstore" package="core.book">
    <external-schema filename="external/author.schema.xml"/>
    <table description="Book Table" name="book">
      <behavior name="auto_add_pk"/>
      <column description="Foreign Key Author" name="author_id" required="false" type="INTEGER"/>
      <column description="ISBN Number" name="isbn" phpName="ISBN" required="true" size="24" type="VARCHAR"/>
      <column description="Foreign Key Publisher" name="publisher_id" required="false" type="INTEGER"/>
      <column description="Book Title" name="title" required="true" size="255" type="VARCHAR"/>
      <foreign-key foreignTable="author" onDelete="SETNULL">
        <reference foreign="id" local="author_id"/>
      </foreign-key>
      <foreign-key foreignTable="publisher" onDelete="SETNULL">
        <reference foreign="id" local="publisher_id"/>
      </foreign-key>
      <validator column="isbn" translate="none">
        <rule message="The ISBN contains invalid characters." name="notMatch" value="/[^\d-]+/"/>
      </validator>
      <validator column="title" translate="none">
        <rule message="Book title must not be longer than ${value} characters." name="maxLength" value="255"/>
        <rule message="Book title must be more than ${value} characters long." name="minLength" value="10"/>
        <rule message="Book title already in database." name="unique"/>
      </validator>
    </table>
    <table name="media">
      <behavior name="auto_add_pk"/>
      <column description="Book ID for this media collection." name="book_id" required="true" type="INTEGER"/>
      <column description="The image of the book cover." lazyLoad="true" name="cover_image" type="BLOB"/>
      <column description="An excerpt from the book." lazyLoad="true" name="excerpt" type="CLOB"/>
      <foreign-key foreignTable="book" onDelete="CASCADE">
        <reference foreign="id" local="book_id"/>
      </foreign-key>
    </table>
  </database>
  <database defaultIdMethod="native" name="bookstore" package="addon.club">
    <!-- this table exists to test the many-to-many -->
    <table description="Reading list for a book club." name="book_club_list">
      <behavior name="auto_add_pk"/>
      <column description="The name of the teacher in charge of summer reading." name="group_leader" required="true" size="100" type="VARCHAR"/>
      <column description="The theme, if applicable, for the reading list." name="theme" required="false" size="50" type="VARCHAR"/>
    </table>
    <table description="Cross-reference table for many-to-many relationship between book rows and book_club_list rows." name="book_x_list" phpName="BookListRel">
      <column description="Fkey to book_club_list.id" name="book_club_list_id" primaryKey="true" type="INTEGER"/>
      <column description="Fkey to book.id" name="book_id" primaryKey="true" type="INTEGER"/>
      <foreign-key foreignTable="book" onDelete="CASCADE">
        <reference foreign="id" local="book_id"/>
      </foreign-key>
      <foreign-key foreignTable="book_club_list" onDelete="CASCADE">
        <reference foreign="id" local="book_club_list_id"/>
      </foreign-key>
    </table>
  </database>
  <database defaultIdMethod="native" name="bookstore" package="core.author">
    <table description="Author Table" name="author">
      <behavior name="auto_add_pk"/>
      <column description="The authors age" name="age" type="INTEGER"/>
      <column description="E-Mail Address" name="email" size="128" type="VARCHAR"/>
      <column description="First Name" name="first_name" required="true" size="128" type="VARCHAR"/>
      <column description="Last Name" name="last_name" required="true" size="128" type="VARCHAR"/>
      <validator column="age" translate="none">
        <rule message="Impressive age! Just kidding, hm?" name="maxValue" value="100"/>
        <rule message="Please enter a positive number." name="minValue" value="0"/>
      </validator>
      <validator column="email" translate="none">
        <rule message="Please enter a valid email address." name="match" value="/^([a-zA-Z0-9])+([\.a-zA-Z0-9_-])*@([a-zA-Z0-9])+(\.[a-zA-Z0-9_-]+)+$/"/>
      </validator>
      <validator column="last_name" translate="none">
        <rule message="The last name field is required." name="required"/>
      </validator>
    </table>
  </database>
  <database defaultIdMethod="native" name="bookstore" package="core.book">
    <!-- This table exists to explore/test the handling of BLOB/CLOB objects. -->
  </database>
  <database defaultIdMethod="native" name="bookstore" package="core.publisher">
    <table description="Publisher Table" name="publisher">
      <behavior name="auto_add_pk"/>
      <column default="Penguin" description="Publisher Name" name="name" required="true" size="128" type="VARCHAR"/>
    </table>
  </database>
  <database defaultIdMethod="native" name="bookstore" package="core.review">
    <table description="Book Review" name="review">
      <behavior name="auto_add_pk"/>
      <column description="Book ID for this review" name="book_id" required="true" type="INTEGER"/>
      <column description="Does reviewer recommend book?" name="recommended" required="true" type="BOOLEAN"/>
      <column default="01/01/2001" description="Date of Review" name="review_date" required="true" type="DATE"/>
      <column description="Reviewer Name" name="reviewed_by" required="true" size="128" type="VARCHAR"/>
      <column description="The status of this review." name="status" size="8" type="VARCHAR"/>
      <foreign-key foreignTable="book" onDelete="CASCADE">
        <reference foreign="id" local="book_id"/>
      </foreign-key>
      <validator column="reviewed_by" translate="none">
        <rule message="The reviewed by field is required." name="required"/>
      </validator>
      <validator column="status" translate="none">
        <rule message="Invalid status. (new, reviewed, archived)" name="validValues" value="new|reviewed|archived"/>
      </validator>
    </table>
  </database>
  <database defaultIdMethod="native" name="bookstore-log" package="util.log">
    <table description="Used to test multiple databases support" name="log" phpName="BookstoreLog">
      <behavior name="auto_add_pk"/>
      <column description="Log priority" name="ident" required="true" size="24" type="CHAR"/>
      <column description="Log message" name="message" required="true" type="LONGVARCHAR"/>
      <column description="Log priority" name="priority" required="true" type="INTEGER"/>
      <column description="Log time" name="time" required="true" type="TIMESTAMP"/>
    </table>
  </database>
</multixml>