Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

migrate last possible non-macro sqlx usage to macro, in db::add_package #2430

Merged
merged 1 commit into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 28 additions & 28 deletions src/db/add_package.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ pub(crate) async fn add_package_into_database(
let features = get_features(metadata_pkg);
let is_library = metadata_pkg.is_library();

let release_id: i32 = sqlx::query_scalar(
let release_id: i32 = sqlx::query_scalar!(
"INSERT INTO releases (
crate_id, version, release_time,
dependencies, target_name, yanked, build_status,
Expand Down Expand Up @@ -92,34 +92,34 @@ pub(crate) async fn add_package_into_database(
repository_id = $26,
archive_storage = $27
RETURNING id",
crate_id,
&metadata_pkg.version,
registry_data.release_time,
serde_json::to_value(dependencies)?,
metadata_pkg.package_name(),
registry_data.yanked,
res.successful,
has_docs,
false, // TODO: Add test status somehow
metadata_pkg.license,
metadata_pkg.repository,
metadata_pkg.homepage,
metadata_pkg.description,
rustdoc,
readme,
serde_json::to_value(&metadata_pkg.keywords)?,
has_examples,
registry_data.downloads,
source_files,
serde_json::to_value(doc_targets)?,
is_library,
&res.rustc_version,
metadata_pkg.documentation,
default_target,
features as Vec<Feature>,
repository_id,
archive_storage
)
.bind(crate_id)
.bind(&metadata_pkg.version)
.bind(registry_data.release_time)
.bind(serde_json::to_value(dependencies)?)
.bind(metadata_pkg.package_name())
.bind(registry_data.yanked)
.bind(res.successful)
.bind(has_docs)
.bind(false) // TODO: Add test status somehow
.bind(&metadata_pkg.license)
.bind(&metadata_pkg.repository)
.bind(&metadata_pkg.homepage)
.bind(&metadata_pkg.description)
.bind(rustdoc)
.bind(readme)
.bind(serde_json::to_value(&metadata_pkg.keywords)?)
.bind(has_examples)
.bind(registry_data.downloads)
.bind(source_files)
.bind(serde_json::to_value(doc_targets)?)
.bind(is_library)
.bind(&res.rustc_version)
.bind(&metadata_pkg.documentation)
.bind(default_target)
.bind(features)
.bind(repository_id)
.bind(archive_storage)
.fetch_one(&mut *conn)
.await?;

Expand Down
Loading