Merge branch 'feat/shorter-type-replacements' of https://github.com/supabase-community/postgres_lsp into feat/shorter-type-replacements

Author: juleswritescode

Cargo.lock

@@ -69,7 +69,7 @@ pgt_console = { path = "./crates/pgt_console", version = "0.0.0"
 pgt_diagnostics = { path = "./crates/pgt_diagnostics", version = "0.0.0" }
 pgt_diagnostics_categories = { path = "./crates/pgt_diagnostics_categories", version = "0.0.0" }
 pgt_diagnostics_macros = { path = "./crates/pgt_diagnostics_macros", version = "0.0.0" }
-pgt_flags = { path = "./crates/pgt_flags", version = "0.0.0" }
+pgt_env  = { path = "./crates/pgt_env", version = "0.0.0" }
 pgt_fs = { path = "./crates/pgt_fs", version = "0.0.0" }
 pgt_hover = { path = "./crates/pgt_hover", version = "0.0.0" }
 pgt_lexer = { path = "./crates/pgt_lexer", version = "0.0.0" }

Cargo.toml

@@ -24,7 +24,7 @@ pgt_analyse = { workspace = true }
 pgt_configuration = { workspace = true }
 pgt_console = { workspace = true }
 pgt_diagnostics = { workspace = true }
-pgt_flags = { workspace = true }
+pgt_env  = { workspace = true }
 pgt_fs = { workspace = true }
 pgt_lsp = { workspace = true }
 pgt_text_edit = { workspace = true }

crates/pgt_cli/Cargo.toml

@@ -1,6 +1,6 @@
 use crate::commands::daemon::default_pgt_log_path;
 use crate::{CliDiagnostic, CliSession};
-use pgt_flags::pgt_env;
+use pgt_env::pgt_env;
 use std::fs::{create_dir, remove_dir_all};
 use std::path::PathBuf;
 

crates/pgt_cli/src/commands/clean.rs

@@ -10,7 +10,6 @@ use commands::check::CheckCommandPayload;
 use pgt_console::{ColorMode, Console};
 use pgt_fs::OsFileSystem;
 use pgt_workspace::{App, DynRef, Workspace, WorkspaceRef};
-use std::env;
 
 mod changed;
 mod cli_options;
@@ -32,10 +31,7 @@ pub use panic::setup_panic_handler;
 pub use reporter::{DiagnosticsPayload, Reporter, ReporterVisitor, TraversalSummary};
 pub use service::{SocketTransport, open_transport};
 
-pub(crate) const VERSION: &str = match option_env!("PGT_VERSION") {
- Some(version) => version,
- None => env!("CARGO_PKG_VERSION"),
-};
+pub(crate) use pgt_env::VERSION;
 
 /// Global context for an execution of the CLI
 pub struct CliSession<'app> {

crates/pgt_cli/src/lib.rs

@@ -21,6 +21,7 @@ pgt_analyse = { workspace = true }
 pgt_analyser = { workspace = true }
 pgt_console = { workspace = true }
 pgt_diagnostics = { workspace = true }
+pgt_env = { workspace = true }
 pgt_text_size = { workspace = true }
 rustc-hash = { workspace = true }
 schemars = { workspace = true, features = ["indexmap1"], optional = true }

crates/pgt_configuration/Cargo.toml

@@ -1,7 +1,6 @@
 //! This module contains the configuration of `postgrestools.jsonc`
 //!
-//! The configuration is divided by "tool", and then it's possible to further customise it
-//! by language. The language might further options divided by tool.
+//! The configuration is divided by "tool".
 
 pub mod analyser;
 pub mod database;
@@ -34,6 +33,7 @@ use files::{FilesConfiguration, PartialFilesConfiguration, partial_files_configu
 use migrations::{
  MigrationsConfiguration, PartialMigrationsConfiguration, partial_migrations_configuration,
 };
+use pgt_env::PGT_WEBSITE;
 use plpgsql_check::{
  PartialPlPgSqlCheckConfiguration, PlPgSqlCheckConfiguration,
  partial_pl_pg_sql_check_configuration,
@@ -44,10 +44,7 @@ pub use typecheck::{
 };
 use vcs::VcsClientKind;
 
-pub const VERSION: &str = match option_env!("PGT_VERSION") {
- Some(version) => version,
- None => "0.0.0",
-};
+pub use pgt_env::VERSION;
 
 /// The configuration that is contained inside the configuration file.
 #[derive(Clone, Debug, Default, Deserialize, Eq, Partial, PartialEq, Serialize)]
@@ -106,7 +103,7 @@ impl PartialConfiguration {
  /// Returns the initial configuration.
  pub fn init() -> Self {
  Self {
- schema: Some(format!("https://pgtools.dev/schemas/{VERSION}/schema.json")),
+ schema: Some(format!("{}/schemas/{VERSION}/schema.json", PGT_WEBSITE)),
  extends: Some(StringSet::default()),
  files: Some(PartialFilesConfiguration {
  ignore: Some(Default::default()),

crates/pgt_configuration/src/lib.rs

@@ -12,6 +12,7 @@ version = "0.0.0"
 
 
 [dependencies]
+pgt_env = { workspace = true }
 schemars = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
 

crates/pgt_diagnostics_categories/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 authors.workspace = true
 categories.workspace = true
-description = "<DESCRIPTION>"
+description = "Environment variables and configuration for Postgres Tools"
 edition.workspace = true
 homepage.workspace = true
 keywords.workspace = true
 license.workspace = true
-name = "pgt_flags"
+name = "pgt_env"
 repository.workspace = true
 version = "0.0.0"
 

crates/pgt_flags/Cargo.toml renamed to crates/pgt_env/Cargo.toml

@@ -1,19 +1,34 @@
-//! A simple implementation of feature flags.
+//! Environment variables and configuration constants for Postgres Tools.
+//!
+//! This module provides:
+//! - Environment variable definitions for runtime configuration
+//! - Static constants like version information and website URL
+//! - Helper functions for checking build status
 
 use pgt_console::fmt::{Display, Formatter};
 use pgt_console::{DebugDisplay, KeyValuePair, markup};
 use std::env;
-use std::ops::Deref;
 use std::sync::{LazyLock, OnceLock};
 
 /// Returns `true` if this is an unstable build of Postgres Tools
 pub fn is_unstable() -> bool {
- PGT_VERSION.deref().is_none()
+ VERSION == "0.0.0"
 }
 
 /// The internal version of Postgres Tools. This is usually supplied during the CI build
 pub static PGT_VERSION: LazyLock<Option<&str>> = LazyLock::new(|| option_env!("PGT_VERSION"));
 
+/// The version of Postgres Tools with fallback logic
+pub const VERSION: &str = match option_env!("PGT_VERSION") {
+ Some(version) => version,
+ None => match option_env!("CARGO_PKG_VERSION") {
+ Some(pkg_version) => pkg_version,
+ None => "0.0.0",
+ },
+};
+
+pub static PGT_WEBSITE: &str = "https://pgtools.dev";
+
 pub struct PgTEnv {
  pub pgt_log_path: PgTEnvVariable,
  pub pgt_log_prefix: PgTEnvVariable,