grahamc/hydra - Change 75BCCX2TABRXQFYV73D6QU3VCT7LZUZEOWUK4X5USPWWTBTVJTLQC

Get rid of dependency to SQLite

SQLite isn't properly supported by Hydra for a few years now[1], but Hydra still depends on it. Apart from a slightly bigger closure this can cause confusion by users since Hydra picks up SQLite rather than PostgreSQL by default if HYDRA_DBI isn't configured properly[2]

[1] 78974abb6943533c3d94c7bd3282bf738b7be61c [2] https://logs.nix.samueldr.com/nixos-dev/2020-04-10#3297342;

Created by Maximilian Bosch on April 10, 2020

75BCCX2TABRXQFYV73D6QU3VCT7LZUZEOWUK4X5USPWWTBTVJTLQC

Dependencies

In channels

upstream

main

Change contents

Insertion in .gitignore at line 35 [10.1]
[4.7]
```
tests/jobs/config.nix
```

Replacement in doc/dev-notes.txt at line 11 [12.1]

B:BD[11.69] → [11.69:168]

  $ sqlite3 hydra.sqlite "insert into SystemTypes(system, maxConcurrent) values('i686-linux', 3);"

[11.69]

[12.579]

  $ psql -d hydra <<< "insert into SystemTypes(system, maxConcurrent) values('i686-linux', 3);"

Replacement in doc/dev-notes.txt at line 15 [12.1]

B:BD[12.600] → [12.600:763]

  $ sqlite3 hydra.sqlite "insert into Users(userName, emailAddress, password) values('root', 'e.dolstra@tudelft.nl', '$(echo -n foobar | sha1sum | cut -c1-40)');"

[12.600]

[12.763]

  $ hydra-create-user root --email-address 'e.dolstra@tudelft.nl' \
      --password-hash "$(echo -n foobar | sha1sum | cut -c1-40)"

Replacement in doc/dev-notes.txt at line 22 [12.1]

B:BD[12.843] → [12.843:933]

  $ sqlite3 hydra.sqlite "insert into UserRoles(userName, role) values('root', 'admin');"

[12.843]

[12.933]

  $ hydra-create-user root --role admin

Replacement in doc/dev-notes.txt at line 25 [12.1]

B:BD[12.983] → [12.983:1090]

  
  $ sqlite3 hydra.sqlite "insert into UserRoles(userName, role) values('alice', 'create-projects');"

[12.983]

[12.1090]


  $ hydra-create-user root --role create-projects

Replacement in doc/manual/projects.xml at line 46 [13.114]
B:BD[13.1694] → [13.1694:1730]
```
      get an error message such as:
```
[13.1694]
[13.1730]
```
      get an error message from the database.
```

Replacement in doc/manual/projects.xml at line 48 [13.114]

B:BD[13.1731] → [13.1731:1740]

B:BD[13.1740] → [14.218:257]

∅:D[14.257] → [13.1780:2122]

B:BD[13.1780] → [13.1780:2122]

<screen>
I'm very sorry, but an error occurred:
DBIx::Class::ResultSet::create(): DBI Exception: DBD::SQLite::st execute failed: column name is not unique(19) at dbdimp.c line 402
</screen>
       So try to create the project after entering just the general
       information to figure out if you have chosen a unique name.
       Job sets can be added once the project has been created.

[13.1731]

[13.2122]

      So try to create the project after entering just the general
      information to figure out if you have chosen a unique name.
      Job sets can be added once the project has been created.

Deletion in flake.nix at line 65 [9.1]
B:BD[9.2050] → [9.2050:2076]
```
                DBDSQLite
```

Replacement in flake.nix at line 105 [9.1]

B:BD[9.3021] → [9.3021:3119]

            [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx

[9.3021]

[9.3119]

            [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig libpqxx

Replacement in flake.nix at line 116 [9.1]

B:BD[9.3539] → [9.3539:3614]

            [ sqlite subversion openssh final.nix coreutils findutils pixz

[9.3539]

[9.3614]

            [ subversion openssh final.nix coreutils findutils pixz

Replacement in src/lib/Hydra/Model/DB.pm at line 13 [16.2694]

B:BD[15.419] → [15.419:529]

B:BD[15.529] → [2.0:74]

∅:D[2.74] → [15.596:627]

B:BD[15.596] → [15.596:627]

    my $db = $ENV{"HYDRA_DBI"};
    return $db if defined $db;
    my $path = getHydraPath . '/hydra.sqlite';
    #warn "The Hydra database ($path) does not exist!\n" unless -f $path;
    return "dbi:SQLite:$path";

[15.419]

[15.627]

    return $ENV{"HYDRA_DBI"} || "dbi:Pg:dbname=hydra;";

Deletion in src/script/hydra-init at line 28 [17.2638]

B:BD[17.3345] → [18.0:76]

        $dbh->{Driver}->{Name} eq 'SQLite' ? "$home/sql/hydra-sqlite.sql" :

Replacement in src/script/hydra-init at line 29 [17.2638]

B:BD[18.152] → [18.152:196]

        die "unsupported database type\n");

[18.152]

[17.3520]

        die "unsupported database type $dbh->{Driver}->{Name}\n");

Deletion in src/sql/hydra.sql at line 82 [20.1]

∅:D[6.807] → [19.5604:5726]

B:BD[19.5604] → [19.5604:5726]

#ifdef SQLITE
    ,
    foreign key   (project, name, nixExprInput) references JobsetInputs(project, jobset, name)
#endif

Deletion in src/sql/hydra.sql at line 84 [20.1]
B:BD[21.3366] → [22.1359:1377]
∅:D[22.1377] → [21.3366:3367]
B:BD[21.3366] → [21.3366:3367]
```
#ifdef POSTGRESQL
```
Deletion in src/sql/hydra.sql at line 100 [20.1]
B:BD[23.10349] → [23.10349:10350]
∅:D[23.10350] → [22.1689:1697]
B:BD[22.1689] → [22.1689:1697]
```
#endif
```
Deletion in src/sql/hydra.sql at line 151 [20.1]
B:BD[24.8976] → [19.7519:7537]
```
#ifdef POSTGRESQL
```
Deletion in src/sql/hydra.sql at line 152 [20.1]
B:BD[19.7584] → [19.7584:7590]
∅:D[19.7590] → [20.24:86]
∅:D[24.8976] → [20.24:86]
B:BD[20.24] → [20.24:86]
B:BD[20.86] → [19.7591:7598]
```
#else
    id            integer primary key autoincrement not null,
#endif
```
Deletion in src/sql/hydra.sql at line 234 [20.1]
B:BD[25.117] → [25.117:135]
B:BD[25.135] → [3.0:1]
```
#ifdef POSTGRESQL
```
Deletion in src/sql/hydra.sql at line 248 [20.1]
B:BD[26.3862] → [26.3862:3863]
∅:D[26.3863] → [25.395:402]
B:BD[25.395] → [25.395:402]
```
#endif
```
Deletion in src/sql/hydra.sql at line 318 [20.1]
B:BD[19.8082] → [19.8082:8100]
```
#ifdef POSTGRESQL
```
Deletion in src/sql/hydra.sql at line 319 [20.1]
B:BD[19.8147] → [19.8147:8153]
∅:D[19.8153] → [27.4781:4843]
∅:D[24.10125] → [27.4781:4843]
B:BD[27.4781] → [27.4781:4843]
B:BD[27.4843] → [19.8154:8161]
```
#else
    id            integer primary key autoincrement not null,
#endif
```
Deletion in src/sql/hydra.sql at line 484 [20.1]
B:BD[28.6572] → [28.6572:6590]
```
#ifdef POSTGRESQL
```
Deletion in src/sql/hydra.sql at line 485 [20.1]
B:BD[28.6637] → [28.6637:6712]
```
#else
    id            integer primary key autoincrement not null,
#endif
```
Deletion in src/sql/hydra.sql at line 555 [20.1]
B:BD[29.11643] → [29.11643:11661]
```
#ifdef POSTGRESQL
```
Deletion in src/sql/hydra.sql at line 556 [20.1]
B:BD[29.11708] → [29.11708:11783]
```
#else
    id            integer primary key autoincrement not null,
#endif
```
Deletion in src/sql/hydra.sql at line 588 [20.1]
B:BD[30.4188] → [30.4188:4206]
```
#ifdef POSTGRESQL
```
Deletion in src/sql/hydra.sql at line 595 [20.1]
B:BD[30.4429] → [30.4429:4436]
```
#endif
```
Deletion in src/sql/hydra.sql at line 611 [20.1]
B:BD[31.1559] → [31.1559:1577]
```
#ifdef POSTGRESQL
```
Deletion in src/sql/hydra.sql at line 629 [20.1]
B:BD[31.2240] → [31.2240:2247]
∅:D[31.2247] → [32.4:5]
B:BD[33.12399] → [32.4:5]
```
#endif
```
Deletion in src/sql/hydra.sql at line 673 [20.1]
B:BD[34.1] → [34.1:19]
```
#ifdef POSTGRESQL
```
Deletion in src/sql/hydra.sql at line 689 [20.1]
∅:D[35.108] → [34.202:209]
∅:D[5.1256] → [34.202:209]
B:BD[34.202] → [34.202:209]
```
#endif
```
Resurrecting zombie bytes in tests/Makefile.am at line 17 [37.92]
B:B[36.213] → [7.0:16]
BD:B[36.213] → [7.0:16]
```
  PYTHONPATH= \
```
Deletion in tests/Makefile.am at line 18 [37.92]
B:BD[36.213] → [8.0:16]
```
  PYTHONPATH= \
```
Solving an order conflict in tests/Makefile.am at line 18 [37.92]
[7.16]
[39.10106]
Deletion in tests/Makefile.am at line 33 [37.92]
∅:D[40.27] → [37.147:148]
∅:D[41.27] → [37.147:148]
∅:D[42.149] → [37.147:148]
∅:D[43.250] → [37.147:148]
∅:D[44.330] → [37.147:148]
∅:D[45.516] → [37.147:148]
∅:D[46.1695] → [37.147:148]
B:BD[37.147] → [37.147:148]
B:BD[37.148] → [47.3575:3625]
∅:D[47.3625] → [48.59:117]
B:BD[49.51] → [48.59:117]
```
db.sqlite: $(top_srcdir)/src/sql/hydra-sqlite.sql
	$(TESTS_ENVIRONMENT) $(top_srcdir)/src/script/hydra-init
```

Get rid of dependency to SQLite

Dependencies

In channels

Change contents

Insertion in .gitignore at line 35 [10.1]

Replacement in doc/dev-notes.txt at line 11 [12.1]

Replacement in doc/dev-notes.txt at line 15 [12.1]

Replacement in doc/dev-notes.txt at line 22 [12.1]

Replacement in doc/dev-notes.txt at line 25 [12.1]

Replacement in doc/manual/projects.xml at line 46 [13.114]

Replacement in doc/manual/projects.xml at line 48 [13.114]

Deletion in flake.nix at line 65 [9.1]

Replacement in flake.nix at line 105 [9.1]

Replacement in flake.nix at line 116 [9.1]

Replacement in src/lib/Hydra/Model/DB.pm at line 13 [16.2694]

Deletion in src/script/hydra-init at line 28 [17.2638]

Replacement in src/script/hydra-init at line 29 [17.2638]

Deletion in src/sql/hydra.sql at line 82 [20.1]

Deletion in src/sql/hydra.sql at line 84 [20.1]

Deletion in src/sql/hydra.sql at line 100 [20.1]

Deletion in src/sql/hydra.sql at line 151 [20.1]

Deletion in src/sql/hydra.sql at line 152 [20.1]

Deletion in src/sql/hydra.sql at line 234 [20.1]

Deletion in src/sql/hydra.sql at line 248 [20.1]

Deletion in src/sql/hydra.sql at line 318 [20.1]

Deletion in src/sql/hydra.sql at line 319 [20.1]

Deletion in src/sql/hydra.sql at line 484 [20.1]

Deletion in src/sql/hydra.sql at line 485 [20.1]

Deletion in src/sql/hydra.sql at line 555 [20.1]

Deletion in src/sql/hydra.sql at line 556 [20.1]

Deletion in src/sql/hydra.sql at line 588 [20.1]

Deletion in src/sql/hydra.sql at line 595 [20.1]

Deletion in src/sql/hydra.sql at line 611 [20.1]

Deletion in src/sql/hydra.sql at line 629 [20.1]

Deletion in src/sql/hydra.sql at line 673 [20.1]

Deletion in src/sql/hydra.sql at line 689 [20.1]

Resurrecting zombie bytes in tests/Makefile.am at line 17 [37.92]

Deletion in tests/Makefile.am at line 18 [37.92]

Solving an order conflict in tests/Makefile.am at line 18 [37.92]

Deletion in tests/Makefile.am at line 33 [37.92]