Skip to content
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
21 changes: 15 additions & 6 deletions src/db/postgres/ddl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,8 @@ fn build_table_ddl(
(None, None) => ddl.push_str("\n);\n"),
}

// 인덱스 정의 추가. 파티션 부모의 인덱스는 pg_get_indexdef 가 `ON ONLY` 로 돌려준다.
// 인덱스 정의 추가 (파티션 부모의 인덱스는 fetch_table_ddl 이 하위 파티션 뒤에 붙인다)
for idx_def in index_defs {
let idx_def = match partition_key {
Some(_) => without_on_only(idx_def),
None => idx_def.clone(),
};
ddl.push_str(&format!("{idx_def};\n"));
}

Expand Down Expand Up @@ -573,12 +569,19 @@ pub(super) async fn fetch_table_ddl(
partition_key: partition_key.as_deref(),
foreign: foreign.as_deref(),
};
// 파티션 부모의 인덱스는 하위 파티션(과 그 자체 인덱스)을 다 만든 뒤에 만든다 — 먼저 만들면
// PARTITION OF 가 상속 인덱스를 자동 이름(c1_id_idx)으로 만들어, 원본에서 그 이름을 쓰는 하위
// 파티션 자체 인덱스와 충돌한다. 뒤에 만들면 상속 인덱스 쪽이 겹치지 않는 이름을 고른다.
let (table_indexes, parent_indexes) = match partition_key {
Some(_) => (Vec::new(), index_defs),
None => (index_defs, Vec::new()),
};
let mut create = build_table_ddl(
schema,
table,
&ddl_columns,
&ddl_constraints,
&index_defs,
&table_indexes,
&options,
)?;
if foreign.is_some() {
Expand All @@ -601,6 +604,12 @@ pub(super) async fn fetch_table_ddl(
append_statements(&mut create, &partitions.create);
after.extend(partitions.after);
cross_schema.extend(partitions.cross_schema);
// pg_get_indexdef 는 파티션 부모 인덱스를 `ON ONLY` 로 돌려준다 — 하위 파티션에 전파되게 `ON` 으로
let parent_indexes: Vec<String> = parent_indexes
.iter()
.map(|def| format!("{};", without_on_only(def)))
.collect();
append_statements(&mut create, &parent_indexes);
}
let ownership = super::schema_ddl::fetch_sequence_ownership(pool, schema, table).await?;
append_statements(&mut create, &ownership);
Expand Down
2 changes: 2 additions & 0 deletions src/db/postgres/partition.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
//! 덧붙인다. 외부 테이블 파티션은 `CREATE FOREIGN TABLE .. PARTITION OF .. SERVER ..` 로 쓴다.
// ponytail: 하위 파티션에만 다른 컬럼 기본값과 PG 17 이하의 하위 파티션 전용 NOT NULL 은 생략
// (PG 18+ 은 NOT NULL 도 제약이라 함께 나온다) — 필요해지면 ALTER COLUMN 으로 추가.
// ponytail: 상속 인덱스는 PostgreSQL 이 자동 이름으로 만든다 — 원본에서 이름을 바꿨으면 이름만 다르다
// (pg_dump 처럼 하위 인덱스를 원래 이름으로 만들고 ATTACH PARTITION 하면 보존, 필요해지면).

use sqlx::PgPool;

Expand Down
69 changes: 65 additions & 4 deletions src/db/postgres/schema_ddl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ pub(super) async fn fetch_schema_ddl(pool: &PgPool, schema: &str) -> Result<Vec<
THEN format('%I.%I', cn.nspname, co.collname) END AS collation, \
pg_get_expr(t.typdefaultbin, 'pg_catalog.pg_type'::regclass) AS default_value, \
t.typnotnull AS not_null, \
(SELECT c.conname::text FROM pg_catalog.pg_constraint c \
WHERE c.contypid = t.oid AND c.contype = 'n' LIMIT 1) AS not_null_name, \
(SELECT array_agg(c.conname::text ORDER BY c.conname) \
FROM pg_catalog.pg_constraint c \
WHERE c.contypid = t.oid AND c.contype = 'c') AS check_names, \
Expand All @@ -100,6 +102,7 @@ pub(super) async fn fetch_schema_ddl(pool: &PgPool, schema: &str) -> Result<Vec<
let collation: Option<String> = try_get_or_warn(row, "collation", schema, LABEL);
let default_value: Option<String> = try_get_or_warn(row, "default_value", schema, LABEL);
let not_null: bool = try_get_or_warn(row, "not_null", schema, LABEL);
let not_null_name: Option<String> = try_get_or_warn(row, "not_null_name", schema, LABEL);
let check_names: Option<Vec<String>> = try_get_or_warn(row, "check_names", schema, LABEL);
let check_defs: Option<Vec<String>> = try_get_or_warn(row, "check_defs", schema, LABEL);
let checks: Vec<(String, String)> = check_names
Expand All @@ -112,6 +115,7 @@ pub(super) async fn fetch_schema_ddl(pool: &PgPool, schema: &str) -> Result<Vec<
collation: collation.as_deref(),
default_value: default_value.as_deref(),
not_null,
not_null_name: not_null_name.as_deref(),
checks: &checks,
};
add_type(
Expand Down Expand Up @@ -171,10 +175,15 @@ pub(super) async fn fetch_schema_ddl(pool: &PgPool, schema: &str) -> Result<Vec<
let ranges = sqlx::query(
"SELECT t.oid::int8 AS oid, t.typname::text AS name, \
format_type(r.rngsubtype, NULL) AS subtype, \
CASE WHEN r.rngcollation <> 0 AND r.rngcollation <> st.typcollation \
THEN format('%I.%I', cn.nspname, co.collname) END AS collation, \
mn.nspname::text AS multirange_schema, mt.typname::text AS multirange_name \
FROM pg_catalog.pg_type t \
JOIN pg_catalog.pg_namespace n ON n.oid = t.typnamespace \
JOIN pg_catalog.pg_range r ON r.rngtypid = t.oid \
JOIN pg_catalog.pg_type st ON st.oid = r.rngsubtype \
LEFT JOIN pg_catalog.pg_collation co ON co.oid = r.rngcollation \
LEFT JOIN pg_catalog.pg_namespace cn ON cn.oid = co.collnamespace \
LEFT JOIN pg_catalog.pg_type mt ON mt.oid = (to_jsonb(r) ->> 'rngmultitypid')::oid \
LEFT JOIN pg_catalog.pg_namespace mn ON mn.oid = mt.typnamespace \
WHERE n.nspname = $1 AND t.typtype = 'r'",
Expand All @@ -187,10 +196,17 @@ pub(super) async fn fetch_schema_ddl(pool: &PgPool, schema: &str) -> Result<Vec<
let oid: i64 = try_get_or_warn(row, "oid", schema, LABEL);
let name: String = try_get_or_warn(row, "name", schema, LABEL);
let subtype: String = try_get_or_warn(row, "subtype", schema, LABEL);
let collation: Option<String> = try_get_or_warn(row, "collation", schema, LABEL);
let mr_schema: Option<String> = try_get_or_warn(row, "multirange_schema", schema, LABEL);
let mr_name: Option<String> = try_get_or_warn(row, "multirange_name", schema, LABEL);
let multirange = mr_schema.zip(mr_name);
let ddl = build_range_ddl(schema, &name, &subtype, multirange.as_ref());
let ddl = build_range_ddl(
schema,
&name,
&subtype,
collation.as_deref(),
multirange.as_ref(),
);
add_type(oid, "range type", &name, ddl);
}

Expand Down Expand Up @@ -376,6 +392,8 @@ struct DomainDef<'a> {
collation: Option<&'a str>,
default_value: Option<&'a str>,
not_null: bool,
/// PG 17+ 의 도메인 NOT NULL 제약 이름 (그 전 버전은 `None`)
not_null_name: Option<&'a str>,
checks: &'a [(String, String)],
}

Expand All @@ -391,7 +409,16 @@ fn build_domain_ddl(schema: &str, name: &str, domain: &DomainDef) -> Result<Stri
ddl.push_str(&format!(" DEFAULT {default}"));
}
if domain.not_null {
ddl.push_str(" NOT NULL");
// 기본 이름(`{domain}_not_null`)이 아니면 이름을 살린다 (PG 16 이하도 받는 문법)
match domain.not_null_name {
Some(nn) if nn != format!("{name}_not_null") => {
ddl.push_str(&format!(
" CONSTRAINT {} NOT NULL",
quote_pg_identifier(nn)?
));
}
_ => ddl.push_str(" NOT NULL"),
}
}
let mut not_valid = Vec::new();
for (check_name, definition) in domain.checks {
Expand All @@ -413,13 +440,18 @@ fn build_domain_ddl(schema: &str, name: &str, domain: &DomainDef) -> Result<Stri
Ok(ddl)
}

/// `CREATE TYPE "s"."r" AS RANGE (SUBTYPE = .. [, MULTIRANGE_TYPE_NAME = "s"."rm"]);`
/// `CREATE TYPE "s"."r" AS RANGE (SUBTYPE = ..[, COLLATION = ..][, MULTIRANGE_TYPE_NAME = "s"."rm"]);`
/// COLLATION 은 subtype 의 기본값과 다를 때만 — 빠지면 범위 경계의 비교 의미가 바뀐다.
fn build_range_ddl(
schema: &str,
name: &str,
subtype: &str,
collation: Option<&str>,
multirange: Option<&(String, String)>,
) -> Result<String, AppError> {
let collation = collation
.map(|c| format!(", COLLATION = {c}"))
.unwrap_or_default();
let multirange = match multirange {
Some((mr_schema, mr_name)) => {
format!(
Expand All @@ -430,7 +462,7 @@ fn build_range_ddl(
None => String::new(),
};
Ok(format!(
"CREATE TYPE {} AS RANGE (SUBTYPE = {subtype}{multirange});",
"CREATE TYPE {} AS RANGE (SUBTYPE = {subtype}{collation}{multirange});",
qualified(schema, name)?
))
}
Expand Down Expand Up @@ -497,6 +529,7 @@ mod tests {
collation: None,
default_value: Some("1"),
not_null: true,
not_null_name: None,
checks: &checks,
};
assert_eq!(
Expand Down Expand Up @@ -533,12 +566,34 @@ mod tests {
collation: Some("pg_catalog.\"C\""),
default_value: None,
not_null: false,
not_null_name: None,
checks: &[],
};
assert_eq!(
build_domain_ddl("a", "code", &collated).unwrap(),
r#"CREATE DOMAIN "a"."code" AS text COLLATE pg_catalog."C";"#
);
// 기본이 아닌 NOT NULL 제약 이름은 보존, 기본 이름은 생략
let named = DomainDef {
base_type: "integer",
collation: None,
default_value: None,
not_null: true,
not_null_name: Some("must"),
checks: &[],
};
assert_eq!(
build_domain_ddl("a", "nn", &named).unwrap(),
r#"CREATE DOMAIN "a"."nn" AS integer CONSTRAINT "must" NOT NULL;"#
);
let default_named = DomainDef {
not_null_name: Some("nn_not_null"),
..named
};
assert_eq!(
build_domain_ddl("a", "nn", &default_named).unwrap(),
r#"CREATE DOMAIN "a"."nn" AS integer NOT NULL;"#
);
// NOT VALID CHECK 는 CREATE DOMAIN 뒤 ALTER DOMAIN 으로 (CREATE DOMAIN 에 쓰면 구문 오류)
let not_valid = [
("pos".to_string(), "CHECK ((VALUE > 0))".to_string()),
Expand All @@ -552,6 +607,7 @@ mod tests {
collation: None,
default_value: None,
not_null: false,
not_null_name: None,
checks: &not_valid,
};
assert_eq!(
Expand All @@ -568,11 +624,16 @@ mod tests {
"a",
"price_range",
"numeric",
None,
Some(&("a".into(), "price_multirange".into()))
)
.unwrap(),
r#"CREATE TYPE "a"."price_range" AS RANGE (SUBTYPE = numeric, MULTIRANGE_TYPE_NAME = "a"."price_multirange");"#
);
assert_eq!(
build_range_ddl("a", "tr", "text", Some(r#"pg_catalog."C""#), None).unwrap(),
r#"CREATE TYPE "a"."tr" AS RANGE (SUBTYPE = text, COLLATION = pg_catalog."C");"#
);
// 위험 식별자는 거부
assert!(build_enum_ddl("a;b", "mood", &[]).is_err());
}
Expand Down
10 changes: 7 additions & 3 deletions src/export/sql.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ fn write_cross_schema_sql(
)?;
writeln!(file, "SET client_encoding = 'UTF8';")?;
writeln!(file, "SET standard_conforming_strings = on;")?;
writeln!(file, "SET search_path = '';")?;
writeln!(file)?;
for statement in statements {
writeln!(file, "{statement}")?;
Expand Down Expand Up @@ -307,9 +308,12 @@ fn write_sql(
// 파일은 UTF-8 이고 리터럴은 '' 이스케이프만 쓴다 — 복원 세션 설정과 무관하게 해석되도록
// 고정한다 (standard_conforming_strings=off 면 '\'' 가 문자열을 탈출해 주입이 된다)
DbType::Postgres => {
// DDL 은 search_path 를 비운 채 만들어 pg_catalog 밖의 이름이 모두 스키마로 한정돼 있다.
// 실행할 때도 비워야 public 등의 같은 이름 함수·연산자가 뷰·기본값·CHECK 에 대신 묶이지
// 않는다 (pg_dump 와 동일, CVE-2018-1058)
writeln!(
file,
"SET client_encoding = 'UTF8';\nSET standard_conforming_strings = on;"
"SET client_encoding = 'UTF8';\nSET standard_conforming_strings = on;\nSET search_path = '';"
)?;
// DDL 이 스키마로 한정돼 있으므로 빈 DB 에서도 실행되게 스키마부터 만든다
match quote_pg_identifier(schema) {
Expand Down Expand Up @@ -474,7 +478,7 @@ mod tests {
assert!(
pg.contains(
"SET client_encoding = 'UTF8';\nSET standard_conforming_strings = on;\n\
CREATE SCHEMA IF NOT EXISTS \"s\";"
SET search_path = '';\nCREATE SCHEMA IF NOT EXISTS \"s\";"
),
"{pg}"
);
Expand Down Expand Up @@ -502,7 +506,7 @@ mod tests {
write_cross_schema_sql(&mut out, "a", &["ALTER TABLE a.t ADD FK;"]).unwrap();
let out = String::from_utf8(out).unwrap();
assert!(out.starts_with("/* Cross-schema : a — "), "{out}");
assert!(out.contains("SET standard_conforming_strings = on;\n\nALTER TABLE a.t ADD FK;\n"));
assert!(out.contains("SET search_path = '';\n\nALTER TABLE a.t ADD FK;\n"));
}

#[test]
Expand Down
Loading