reduce bin filename length

Signed-off-by: usamoi <[email protected]>
pgcentralfoundation · Feb 7, 2024 · 5566cea · 5566cea
1 parent c10fa1a
commit 5566cea
Show file tree

Hide file tree

Showing 54 changed files with 111 additions and 3 deletions.
diff --git a/cargo-pgrx/src/command/new.rs b/cargo-pgrx/src/command/new.rs
@@ -57,7 +57,7 @@ pub(crate) fn create_crate_template(
     create_dotcargo_config_toml(&path, name)?;
     create_lib_rs(&path, name, is_bgworker)?;
     create_git_ignore(&path, name)?;
-    create_pgrx_embed_rs(&path, name)?;
+    create_pgrx_embed_rs(&path)?;
 
     Ok(())
 }
@@ -148,11 +148,11 @@ fn create_git_ignore(path: &PathBuf, _name: &str) -> Result<(), std::io::Error>
     Ok(())
 }
 
-fn create_pgrx_embed_rs(path: &PathBuf, name: &str) -> Result<(), std::io::Error> {
+fn create_pgrx_embed_rs(path: &PathBuf) -> Result<(), std::io::Error> {
     let mut filename = path.clone();
     filename.push("src");
     filename.push("bin");
-    filename.push(format!("pgrx_embed_{name}.rs"));
+    filename.push(format!("pgrx_embed.rs"));
     let mut file = std::fs::File::create(filename)?;
     file.write_all(include_bytes!("../templates/pgrx_embed_rs"))?;
     Ok(())

diff --git a/cargo-pgrx/src/templates/cargo_toml b/cargo-pgrx/src/templates/cargo_toml
@@ -6,6 +6,10 @@ edition = "2021"
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_{name}"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/pgrx-examples/aggregate/Cargo.toml b/pgrx-examples/aggregate/Cargo.toml
@@ -17,6 +17,10 @@ publish = false
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_aggregate"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...aggregate/src/bin/pgrx_embed_aggregate.rs → ...-examples/aggregate/src/bin/pgrx_embed.rs b/...aggregate/src/bin/pgrx_embed_aggregate.rs → ...-examples/aggregate/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/arrays/Cargo.toml b/pgrx-examples/arrays/Cargo.toml
@@ -17,6 +17,10 @@ publish = false
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_arrays"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...mples/arrays/src/bin/pgrx_embed_arrays.rs → pgrx-examples/arrays/src/bin/pgrx_embed.rs b/...mples/arrays/src/bin/pgrx_embed_arrays.rs → pgrx-examples/arrays/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/bad_ideas/Cargo.toml b/pgrx-examples/bad_ideas/Cargo.toml
@@ -17,6 +17,10 @@ publish = false
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_bad_ideas"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...bad_ideas/src/bin/pgrx_embed_bad_ideas.rs → ...-examples/bad_ideas/src/bin/pgrx_embed.rs b/...bad_ideas/src/bin/pgrx_embed_bad_ideas.rs → ...-examples/bad_ideas/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/bgworker/Cargo.toml b/pgrx-examples/bgworker/Cargo.toml
@@ -17,6 +17,10 @@ publish = false
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_bgworker"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...s/bgworker/src/bin/pgrx_embed_bgworker.rs → pgrx-examples/bgworker/src/bin/pgrx_embed.rs b/...s/bgworker/src/bin/pgrx_embed_bgworker.rs → pgrx-examples/bgworker/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/bytea/Cargo.toml b/pgrx-examples/bytea/Cargo.toml
@@ -17,6 +17,10 @@ publish = false
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_bytea"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...xamples/bytea/src/bin/pgrx_embed_bytea.rs → pgrx-examples/bytea/src/bin/pgrx_embed.rs b/...xamples/bytea/src/bin/pgrx_embed_bytea.rs → pgrx-examples/bytea/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/composite_type/Cargo.toml b/pgrx-examples/composite_type/Cargo.toml
@@ -17,6 +17,10 @@ publish = false
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_composite_type"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...type/src/bin/pgrx_embed_composite_type.rs → ...ples/composite_type/src/bin/pgrx_embed.rs b/...type/src/bin/pgrx_embed_composite_type.rs → ...ples/composite_type/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/custom_libname/Cargo.toml b/pgrx-examples/custom_libname/Cargo.toml
@@ -18,6 +18,10 @@ publish = false
 crate-type = ["cdylib", "lib"]
 name = "other_name"
 
+[[bin]]
+name = "pgrx_embed_custom_libname"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...name/src/bin/pgrx_embed_custom_libname.rs → ...ples/custom_libname/src/bin/pgrx_embed.rs b/...name/src/bin/pgrx_embed_custom_libname.rs → ...ples/custom_libname/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/custom_sql/Cargo.toml b/pgrx-examples/custom_sql/Cargo.toml
@@ -17,6 +17,10 @@ publish = false
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_custom_sql"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...stom_sql/src/bin/pgrx_embed_custom_sql.rs → ...examples/custom_sql/src/bin/pgrx_embed.rs b/...stom_sql/src/bin/pgrx_embed_custom_sql.rs → ...examples/custom_sql/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/custom_types/Cargo.toml b/pgrx-examples/custom_types/Cargo.toml
@@ -17,6 +17,10 @@ publish = false
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_custom_types"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/..._types/src/bin/pgrx_embed_custom_types.rs → ...amples/custom_types/src/bin/pgrx_embed.rs b/..._types/src/bin/pgrx_embed_custom_types.rs → ...amples/custom_types/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/datetime/Cargo.toml b/pgrx-examples/datetime/Cargo.toml
@@ -17,6 +17,10 @@ publish = false
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_datetime"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...s/datetime/src/bin/pgrx_embed_datetime.rs → pgrx-examples/datetime/src/bin/pgrx_embed.rs b/...s/datetime/src/bin/pgrx_embed_datetime.rs → pgrx-examples/datetime/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/errors/Cargo.toml b/pgrx-examples/errors/Cargo.toml
@@ -17,6 +17,10 @@ publish = false
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_errors"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...mples/errors/src/bin/pgrx_embed_errors.rs → pgrx-examples/errors/src/bin/pgrx_embed.rs b/...mples/errors/src/bin/pgrx_embed_errors.rs → pgrx-examples/errors/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/nostd/Cargo.toml b/pgrx-examples/nostd/Cargo.toml
@@ -17,6 +17,10 @@ publish = false
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_nostd"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...xamples/nostd/src/bin/pgrx_embed_nostd.rs → pgrx-examples/nostd/src/bin/pgrx_embed.rs b/...xamples/nostd/src/bin/pgrx_embed_nostd.rs → pgrx-examples/nostd/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/numeric/Cargo.toml b/pgrx-examples/numeric/Cargo.toml
@@ -18,6 +18,10 @@ rust-version = "1.58"
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_numeric"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...les/numeric/src/bin/pgrx_embed_numeric.rs → pgrx-examples/numeric/src/bin/pgrx_embed.rs b/...les/numeric/src/bin/pgrx_embed_numeric.rs → pgrx-examples/numeric/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/operators/Cargo.toml b/pgrx-examples/operators/Cargo.toml
@@ -17,6 +17,10 @@ publish = false
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_operators"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...operators/src/bin/pgrx_embed_operators.rs → ...-examples/operators/src/bin/pgrx_embed.rs b/...operators/src/bin/pgrx_embed_operators.rs → ...-examples/operators/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/pgtrybuilder/Cargo.toml b/pgrx-examples/pgtrybuilder/Cargo.toml
@@ -17,6 +17,10 @@ publish = false
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_pgtrybuilder"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...uilder/src/bin/pgrx_embed_pgtrybuilder.rs → ...amples/pgtrybuilder/src/bin/pgrx_embed.rs b/...uilder/src/bin/pgrx_embed_pgtrybuilder.rs → ...amples/pgtrybuilder/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/range/Cargo.toml b/pgrx-examples/range/Cargo.toml
@@ -17,6 +17,10 @@ publish = false
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_range"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...xamples/range/src/bin/pgrx_embed_range.rs → pgrx-examples/range/src/bin/pgrx_embed.rs b/...xamples/range/src/bin/pgrx_embed_range.rs → pgrx-examples/range/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/schemas/Cargo.toml b/pgrx-examples/schemas/Cargo.toml
@@ -17,6 +17,10 @@ publish = false
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_schemas"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...les/schemas/src/bin/pgrx_embed_schemas.rs → pgrx-examples/schemas/src/bin/pgrx_embed.rs b/...les/schemas/src/bin/pgrx_embed_schemas.rs → pgrx-examples/schemas/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/shmem/Cargo.toml b/pgrx-examples/shmem/Cargo.toml
@@ -17,6 +17,10 @@ publish = false
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_shmem"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...xamples/shmem/src/bin/pgrx_embed_shmem.rs → pgrx-examples/shmem/src/bin/pgrx_embed.rs b/...xamples/shmem/src/bin/pgrx_embed_shmem.rs → pgrx-examples/shmem/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/spi/Cargo.toml b/pgrx-examples/spi/Cargo.toml
@@ -17,6 +17,10 @@ publish = false
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_spi"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/pgrx-examples/spi/src/bin/pgrx_embed_spi.rs → pgrx-examples/spi/src/bin/pgrx_embed.rs b/pgrx-examples/spi/src/bin/pgrx_embed_spi.rs → pgrx-examples/spi/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/spi_srf/Cargo.toml b/pgrx-examples/spi_srf/Cargo.toml
@@ -18,6 +18,10 @@ rust-version = "1.58"
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_spi_srf"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...les/spi_srf/src/bin/pgrx_embed_spi_srf.rs → pgrx-examples/spi_srf/src/bin/pgrx_embed.rs b/...les/spi_srf/src/bin/pgrx_embed_spi_srf.rs → pgrx-examples/spi_srf/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/srf/Cargo.toml b/pgrx-examples/srf/Cargo.toml
@@ -17,6 +17,10 @@ publish = false
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_srf"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/pgrx-examples/srf/src/bin/pgrx_embed_srf.rs → pgrx-examples/srf/src/bin/pgrx_embed.rs b/pgrx-examples/srf/src/bin/pgrx_embed_srf.rs → pgrx-examples/srf/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/strings/Cargo.toml b/pgrx-examples/strings/Cargo.toml
@@ -17,6 +17,10 @@ publish = false
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_strings"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...les/strings/src/bin/pgrx_embed_strings.rs → pgrx-examples/strings/src/bin/pgrx_embed.rs b/...les/strings/src/bin/pgrx_embed_strings.rs → pgrx-examples/strings/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/triggers/Cargo.toml b/pgrx-examples/triggers/Cargo.toml
@@ -17,6 +17,10 @@ publish = false
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_triggers"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...s/triggers/src/bin/pgrx_embed_triggers.rs → pgrx-examples/triggers/src/bin/pgrx_embed.rs b/...s/triggers/src/bin/pgrx_embed_triggers.rs → pgrx-examples/triggers/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/versioned_custom_libname_so/Cargo.toml b/pgrx-examples/versioned_custom_libname_so/Cargo.toml
@@ -18,6 +18,10 @@ publish = false
 crate-type = ["cdylib", "lib"]
 name = "versioned_othername"
 
+[[bin]]
+name = "pgrx_embed_versioned_custom_libname_so"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...pgrx_embed_versioned_custom_libname_so.rs → ...d_custom_libname_so/src/bin/pgrx_embed.rs b/...pgrx_embed_versioned_custom_libname_so.rs → ...d_custom_libname_so/src/bin/pgrx_embed.rs
diff --git a/pgrx-examples/versioned_so/Cargo.toml b/pgrx-examples/versioned_so/Cargo.toml
@@ -17,6 +17,10 @@ publish = false
 [lib]
 crate-type = ["cdylib", "lib"]
 
+[[bin]]
+name = "pgrx_embed_versioned_so"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = ["pg13"]
 pg12 = ["pgrx/pg12", "pgrx-tests/pg12" ]

diff --git a/...ned_so/src/bin/pgrx_embed_versioned_so.rs → ...amples/versioned_so/src/bin/pgrx_embed.rs b/...ned_so/src/bin/pgrx_embed_versioned_so.rs → ...amples/versioned_so/src/bin/pgrx_embed.rs
diff --git a/pgrx-tests/Cargo.toml b/pgrx-tests/Cargo.toml
@@ -23,6 +23,10 @@ edition = "2021"
 [lib]
 crate-type = [ "cdylib", "lib" ]
 
+[[bin]]
+name = "pgrx_embed_pgrx-tests"
+path = "./src/bin/pgrx_embed.rs"
+
 [features]
 default = [ "proptest" ]
 pg12 = [ "pgrx/pg12" ]

diff --git a/pgrx-tests/src/bin/pgrx_embed_pgrx-tests.rs → pgrx-tests/src/bin/pgrx_embed.rs b/pgrx-tests/src/bin/pgrx_embed_pgrx-tests.rs → pgrx-tests/src/bin/pgrx_embed.rs