diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-10 07:36:51 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-10 07:36:51 +0100 |
| commit | b782c46e518afd0713f92fabb76aea9a7c3e5d77 (patch) | |
| tree | c28dc5d4f45988a01c56876d1ae41d92a73d6191 /hubzilla_er | |
| parent | eaa47760bc7bb024b4c41bd41be62fd16f1237ec (diff) | |
| parent | 7ec687988746e1037d86d25186c2dd5f2addb15b (diff) | |
| download | volse-hubzilla-b782c46e518afd0713f92fabb76aea9a7c3e5d77.tar.gz volse-hubzilla-b782c46e518afd0713f92fabb76aea9a7c3e5d77.tar.bz2 volse-hubzilla-b782c46e518afd0713f92fabb76aea9a7c3e5d77.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'hubzilla_er')
| -rw-r--r-- | hubzilla_er/Makefile | 17 | ||||
| -rw-r--r-- | hubzilla_er/zot.xml | 4 |
2 files changed, 20 insertions, 1 deletions
diff --git a/hubzilla_er/Makefile b/hubzilla_er/Makefile new file mode 100644 index 000000000..f36f01007 --- /dev/null +++ b/hubzilla_er/Makefile @@ -0,0 +1,17 @@ +#makefile for schemaspy + + +#NOTE: This makefile sucks. It needs to have all run the script, and check that schemaspy and mysqlconn are present. + +schemaspy:: + wget "http://downloads.sourceforge.net/project/schemaspy/schemaspy/SchemaSpy%205.0.0/schemaSpy_5.0.0.jar?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fschemaspy%2F&ts=1447051240&use_mirror=iweb" + +mysqlconn:: + wget http://central.maven.org/maven2/mysql/mysql-connector-java/5.1.17/mysql-connector-java-5.1.17.jar + +#TODO: install java and graphviz or check it is there + +install: schemaspy mysqlconn + +run: + ../util/schemaspy diff --git a/hubzilla_er/zot.xml b/hubzilla_er/zot.xml index f33e273eb..c1450b4fc 100644 --- a/hubzilla_er/zot.xml +++ b/hubzilla_er/zot.xml @@ -328,7 +328,9 @@ <child column="channel_id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="mail"/> <child column="channel_id" foreignKey="Implied Constraint" implied="true" onDeleteCascade="false" table="profext"/> </column> - <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="channel_account_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"/> + <column autoUpdated="false" defaultValue="0" digits="0" id="1" name="channel_account_id" nullable="false" remarks="" size="10" type="INT UNSIGNED"> + <foreignKey table="account" column="account_id"/> + </column> <column autoUpdated="false" defaultValue="0" digits="0" id="2" name="channel_primary" nullable="false" remarks="" size="0" type="BIT"/> <column autoUpdated="false" defaultValue="" digits="0" id="3" name="channel_name" nullable="false" remarks="" size="255" type="CHAR"/> <column autoUpdated="false" defaultValue="" digits="0" id="4" name="channel_address" nullable="false" remarks="" size="255" type="CHAR"/> |