Skip to content

Commit

Permalink
Merge pull request #1821 from schemacrawler/issue1815
Browse files Browse the repository at this point in the history 
Fix #1815 - show column default value in the output
  • Loading branch information
@sualeh
sualeh authored Dec 29, 2024
2 parents 4a7ebce + 5f9a3bf commit 4e988fd
Show file tree
Hide file tree
Showing 158 changed files with 8,980 additions and 8,351 deletions.
33 changes: 23 additions & 10 deletions .github/workflows/integration-tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,29 @@ jobs:
--batch-mode \
-Ddistrib \
clean package
- id: gather-expected-results
name: Gather expected results for failed tests
if: always()
shell: bash
run: |
# Gather expected results
echo "Gather expected results"
# DEBUG
echo "Current working directory:"
pwd
echo "Show expected results directories:"
find . -type d -name "unit_tests_results_output" -exec echo {} \;
# Save expected results files
echo "Zip expected results:"
.github/scripts/unit-tests-results-output.sh $(realpath .)
- id: upload-unit-tests-results-output
name: Upload expected results files
uses: actions/upload-artifact@v4
if: always()
with:
name: expected-results-${{ matrix.os }}-${{ matrix.java }}
path: ./unit_tests_results_output.zip
retention-days: 5

# INSTALL GRAPHVIZ, AND RERUN DIAGRAM TESTS
- id: install-graphviz
Expand All @@ -68,13 +91,3 @@ jobs:
schemacrawler-diagram,schemacrawler-scripting \
--also-make \
package
# Save expected results files
.github/scripts/unit-tests-results-output.sh
- id: upload-unit-tests-results-output
name: Upload expected results files
uses: actions/upload-artifact@v4
if: always()
with:
name: unit-tests-results-output
path: ./unit-tests-results-output.zip
retention-days: 5
18 changes: 10 additions & 8 deletions schemacrawler-commandline/src/test/resources/ExecuteCommandTest.executeSchemaCommand.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Contact details for book authors
STATE CHARACTER(2)
POSTALCODE VARCHAR(10)
COUNTRY VARCHAR(50)
default 'USA'

Primary Key

Expand Down Expand Up @@ -66,15 +67,15 @@ Foreign Keys
Z_FK_AUTHOR [foreign key, with no action]
AUTHORID (0..many)--> PUBLIC.BOOKS.AUTHORS.ID

SYS_FK_10120 [foreign key, with no action]
SYS_FK_10118 [foreign key, with no action]
BOOKID (0..many)--> PUBLIC.BOOKS.BOOKS.ID

Indexes

Z_FK_AUTHOR [non-unique index]
AUTHORID ascending

SYS_FK_10120 [non-unique index]
SYS_FK_10118 [non-unique index]
BOOKID ascending

UIDX_BOOKAUTHORS [unique index]
Expand Down Expand Up @@ -111,7 +112,7 @@ Foreign Keys
FK_SALES_BOOK [foreign key, with no action]
ID <--(0..many) PUBLIC."PUBLISHER SALES".SALES.BOOKID

SYS_FK_10120 [foreign key, with no action]
SYS_FK_10118 [foreign key, with no action]
ID <--(0..many) PUBLIC.BOOKS.BOOKAUTHORS.BOOKID

FK_PREVIOUSEDITION [foreign key, with no action]
Expand Down Expand Up @@ -142,7 +143,7 @@ Primary Key

Foreign Keys

SYS_FK_10130 [foreign key, with no action]
SYS_FK_10128 [foreign key, with no action]
"Id" <--(0..1) PUBLIC.BOOKS."Celebrity Updates"."Celebrity Id"

Indexes
Expand All @@ -164,15 +165,15 @@ Primary Key

Foreign Keys

SYS_FK_10130 [foreign key, with no action]
SYS_FK_10128 [foreign key, with no action]
"Celebrity Id" (0..1)--> PUBLIC.BOOKS."Celebrities"."Id"

Indexes

"PK Celebrity Updates" [unique index]
"Celebrity Id" ascending

SYS_FK_10130 [non-unique index]
SYS_FK_10128 [non-unique index]
"Celebrity Id" ascending


Expand All @@ -182,6 +183,7 @@ PUBLIC.BOOKS.COUPONS [table]
ID INTEGER NOT NULL
DATA CLOB
COUPONS INTEGER ARRAY
default ARRAY[]
BOOKS VARCHAR(20) ARRAY[10]

Primary Key
Expand Down Expand Up @@ -243,7 +245,7 @@ List of book publishers

Primary Key

SYS_PK_10126 [primary key]
SYS_PK_10124 [primary key]
ID

Foreign Keys
Expand All @@ -253,7 +255,7 @@ FK_ΒΙΒΛΊΑ_PUBLISHERS [foreign key, with no action]

Indexes

SYS_PK_10126 [unique index]
SYS_PK_10124 [unique index]
ID ascending


Expand Down
18 changes: 10 additions & 8 deletions schemacrawler-commandline/src/test/resources/ExecuteCommandTest.executeTestCommand.3.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Contact details for book authors
STATE CHARACTER(2)
POSTALCODE VARCHAR(10)
COUNTRY VARCHAR(50)
default 'USA'

Primary Key

Expand Down Expand Up @@ -66,15 +67,15 @@ Foreign Keys
Z_FK_AUTHOR [foreign key, with no action]
AUTHORID (0..many)--> PUBLIC.BOOKS.AUTHORS.ID

SYS_FK_10120 [foreign key, with no action]
SYS_FK_10118 [foreign key, with no action]
BOOKID (0..many)--> PUBLIC.BOOKS.BOOKS.ID

Indexes

Z_FK_AUTHOR [non-unique index]
AUTHORID ascending

SYS_FK_10120 [non-unique index]
SYS_FK_10118 [non-unique index]
BOOKID ascending

UIDX_BOOKAUTHORS [unique index]
Expand Down Expand Up @@ -111,7 +112,7 @@ Foreign Keys
FK_SALES_BOOK [foreign key, with no action]
ID <--(0..many) PUBLIC."PUBLISHER SALES".SALES.BOOKID

SYS_FK_10120 [foreign key, with no action]
SYS_FK_10118 [foreign key, with no action]
ID <--(0..many) PUBLIC.BOOKS.BOOKAUTHORS.BOOKID

FK_PREVIOUSEDITION [foreign key, with no action]
Expand Down Expand Up @@ -142,7 +143,7 @@ Primary Key

Foreign Keys

SYS_FK_10130 [foreign key, with no action]
SYS_FK_10128 [foreign key, with no action]
"Id" <--(0..1) PUBLIC.BOOKS."Celebrity Updates"."Celebrity Id"

Indexes
Expand All @@ -164,15 +165,15 @@ Primary Key

Foreign Keys

SYS_FK_10130 [foreign key, with no action]
SYS_FK_10128 [foreign key, with no action]
"Celebrity Id" (0..1)--> PUBLIC.BOOKS."Celebrities"."Id"

Indexes

"PK Celebrity Updates" [unique index]
"Celebrity Id" ascending

SYS_FK_10130 [non-unique index]
SYS_FK_10128 [non-unique index]
"Celebrity Id" ascending


Expand All @@ -182,6 +183,7 @@ PUBLIC.BOOKS.COUPONS [table]
ID INTEGER NOT NULL
DATA CLOB
COUPONS INTEGER ARRAY
default ARRAY[]
BOOKS VARCHAR(20) ARRAY[10]

Primary Key
Expand Down Expand Up @@ -243,7 +245,7 @@ List of book publishers

Primary Key

SYS_PK_10126 [primary key]
SYS_PK_10124 [primary key]
ID

Foreign Keys
Expand All @@ -253,7 +255,7 @@ FK_ΒΙΒΛΊΑ_PUBLISHERS [foreign key, with no action]

Indexes

SYS_PK_10126 [unique index]
SYS_PK_10124 [unique index]
ID ascending


Expand Down
18 changes: 10 additions & 8 deletions schemacrawler-commandline/src/test/resources/catalog_attributes_output/showRemarks.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Overwritten remarks line 2
STATE CHARACTER(2)
POSTALCODE VARCHAR(10)
COUNTRY VARCHAR(50)
default 'USA'

Primary Key

Expand Down Expand Up @@ -70,15 +71,15 @@ Foreign Keys
Z_FK_AUTHOR [foreign key, with no action]
AUTHORID (0..many)--> PUBLIC.BOOKS.AUTHORS.ID

SYS_FK_10120 [foreign key, with no action]
SYS_FK_10118 [foreign key, with no action]
BOOKID (0..many)--> PUBLIC.BOOKS.BOOKS.ID

Indexes

Z_FK_AUTHOR [non-unique index]
AUTHORID ascending

SYS_FK_10120 [non-unique index]
SYS_FK_10118 [non-unique index]
BOOKID ascending

UIDX_BOOKAUTHORS [unique index]
Expand Down Expand Up @@ -115,7 +116,7 @@ Foreign Keys
FK_SALES_BOOK [foreign key, with no action]
ID <--(0..many) PUBLIC."PUBLISHER SALES".SALES.BOOKID

SYS_FK_10120 [foreign key, with no action]
SYS_FK_10118 [foreign key, with no action]
ID <--(0..many) PUBLIC.BOOKS.BOOKAUTHORS.BOOKID

FK_PREVIOUSEDITION [foreign key, with no action]
Expand Down Expand Up @@ -146,7 +147,7 @@ Primary Key

Foreign Keys

SYS_FK_10130 [foreign key, with no action]
SYS_FK_10128 [foreign key, with no action]
"Id" <--(0..1) PUBLIC.BOOKS."Celebrity Updates"."Celebrity Id"

Indexes
Expand All @@ -168,15 +169,15 @@ Primary Key

Foreign Keys

SYS_FK_10130 [foreign key, with no action]
SYS_FK_10128 [foreign key, with no action]
"Celebrity Id" (0..1)--> PUBLIC.BOOKS."Celebrities"."Id"

Indexes

"PK Celebrity Updates" [unique index]
"Celebrity Id" ascending

SYS_FK_10130 [non-unique index]
SYS_FK_10128 [non-unique index]
"Celebrity Id" ascending


Expand All @@ -186,6 +187,7 @@ PUBLIC.BOOKS.COUPONS [table]
ID INTEGER NOT NULL
DATA CLOB
COUPONS INTEGER ARRAY
default ARRAY[]
BOOKS VARCHAR(20) ARRAY[10]

Primary Key
Expand Down Expand Up @@ -247,7 +249,7 @@ List of book publishers

Primary Key

SYS_PK_10126 [primary key]
SYS_PK_10124 [primary key]
ID

Foreign Keys
Expand All @@ -257,7 +259,7 @@ FK_ΒΙΒΛΊΑ_PUBLISHERS [foreign key, with no action]

Indexes

SYS_PK_10126 [unique index]
SYS_PK_10124 [unique index]
ID ascending


Expand Down
15 changes: 10 additions & 5 deletions ...crawler-commandline/src/test/resources/command_line_output/commandLineColorOverrides.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,11 @@ <h2>Tables</h2>
<td class='minwidth'>COUNTRY</td>
<td class='minwidth'>VARCHAR(50)</td>
</tr>
<tr>
<td class='spacer'></td>
<td class='minwidth'></td>
<td class='minwidth'>default 'USA'</td>
</tr>
<tr>
<td colspan='3'></td>
</tr>
Expand Down Expand Up @@ -377,7 +382,7 @@ <h2>Tables</h2>
<td colspan='3'></td>
</tr>
<tr>
<td colspan='2' class='name'>SYS_FK_10120</td>
<td colspan='2' class='name'>SYS_FK_10118</td>
<td class='description right'>[foreign key, with no action]</td>
</tr>
<tr>
Expand Down Expand Up @@ -454,7 +459,7 @@ <h2>Tables</h2>
<td colspan='3'></td>
</tr>
<tr>
<td colspan='2' class='name'>SYS_FK_10120</td>
<td colspan='2' class='name'>SYS_FK_10118</td>
<td class='description right'>[foreign key, with no action]</td>
</tr>
<tr>
Expand Down Expand Up @@ -518,7 +523,7 @@ <h2>Tables</h2>
<td colspan='3'></td>
</tr>
<tr>
<td colspan='2' class='name'>SYS_FK_10130</td>
<td colspan='2' class='name'>SYS_FK_10128</td>
<td class='description right'>[foreign key, with no action]</td>
</tr>
<tr>
Expand Down Expand Up @@ -570,7 +575,7 @@ <h2>Tables</h2>
<td colspan='3'></td>
</tr>
<tr>
<td colspan='2' class='name'>SYS_FK_10130</td>
<td colspan='2' class='name'>SYS_FK_10128</td>
<td class='description right'>[foreign key, with no action]</td>
</tr>
<tr>
Expand Down Expand Up @@ -719,7 +724,7 @@ <h2>Tables</h2>
<td colspan='3'></td>
</tr>
<tr>
<td colspan='2' class='name'>SYS_PK_10126</td>
<td colspan='2' class='name'>SYS_PK_10124</td>
<td class='description right'>[primary key]</td>
</tr>
<tr>
Expand Down
Loading

0 comments on commit 4e988fd

Please sign in to comment.