Skip to content

Commit f428849

Browse files
Nemo157syphar
authored andcommitted
Don't write rustc_version to releases
1 parent 0c6f85f commit f428849

File tree

5 files changed

+19
-12
lines changed

5 files changed

+19
-12
lines changed
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
ALTER TABLE releases ADD COLUMN doc_rustc_version VARCHAR(100);
2+
3+
UPDATE releases SET doc_rustc_version = (
4+
SELECT builds.rustc_version
5+
FROM builds
6+
WHERE builds.rid = releases.id
7+
ORDER BY builds.build_time DESC
8+
LIMIT 1
9+
);
10+
11+
ALTER TABLE releases ALTER COLUMN doc_rustc_version SET NOT NULL;
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE releases DROP COLUMN doc_rustc_version;

src/db/add_package.rs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ pub(crate) async fn add_package_into_database(
3030
conn: &mut sqlx::PgConnection,
3131
metadata_pkg: &MetadataPackage,
3232
source_dir: &Path,
33-
res: &BuildResult,
3433
default_target: &str,
3534
source_files: Value,
3635
doc_targets: Vec<String>,
@@ -56,14 +55,14 @@ pub(crate) async fn add_package_into_database(
5655
rustdoc_status, test_status, license, repository_url,
5756
homepage_url, description, description_long, readme,
5857
keywords, have_examples, downloads, files,
59-
doc_targets, is_library, doc_rustc_version,
58+
doc_targets, is_library,
6059
documentation_url, default_target, features,
6160
repository_id, archive_storage
6261
)
6362
VALUES (
6463
$1, $2, $3, $4, $5, $6, $7, $8, $9,
6564
$10, $11, $12, $13, $14, $15, $16, $17, $18,
66-
$19, $20, $21, $22, $23, $24, $25, $26,
65+
$19, $20, $21, $22, $23, $24, $25
6766
)
6867
ON CONFLICT (crate_id, version) DO UPDATE
6968
SET release_time = $3,
@@ -84,12 +83,11 @@ pub(crate) async fn add_package_into_database(
8483
files = $18,
8584
doc_targets = $19,
8685
is_library = $20,
87-
doc_rustc_version = $21,
88-
documentation_url = $22,
89-
default_target = $23,
90-
features = $24,
91-
repository_id = $25,
92-
archive_storage = $26
86+
documentation_url = $21,
87+
default_target = $22,
88+
features = $23,
89+
repository_id = $24,
90+
archive_storage = $25
9391
RETURNING id",
9492
crate_id,
9593
&metadata_pkg.version,
@@ -111,7 +109,6 @@ pub(crate) async fn add_package_into_database(
111109
source_files,
112110
serde_json::to_value(doc_targets)?,
113111
is_library,
114-
&res.rustc_version,
115112
metadata_pkg.documentation,
116113
default_target,
117114
features as Vec<Feature>,

src/docbuilder/rustwide_builder.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,6 @@ impl RustwideBuilder {
563563
&mut async_conn,
564564
cargo_metadata,
565565
&build.host_source_dir(),
566-
&res.result,
567566
&res.target,
568567
files_list,
569568
successful_targets,

src/test/fakes.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,6 @@ impl<'a> FakeRelease<'a> {
477477
&mut async_conn,
478478
&package,
479479
crate_dir,
480-
last_build_result,
481480
default_target,
482481
source_meta,
483482
self.doc_targets,

0 commit comments

Comments
 (0)