Skip to content

Commit 87e1c66

Browse files
LucaCappelletti94LucaCappelletti94
committed
Restored period_before_table in place of period_specified_before_table 
1 parent c893bda commit 87e1c66

File tree

7 files changed

+27
-27
lines changed

7 files changed

+27
-27
lines changed

‎src/ast/ddl.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3283,12 +3283,12 @@ pub struct CreateTrigger {
32833283
/// but rather the position of the period clause in relation to the table name.
32843284
///
32853285
/// ```sql
3286-
/// -- period_specified_before_table == true: Postgres, MySQL, and standard SQL
3286+
/// -- period_before_table == true: Postgres, MySQL, and standard SQL
32873287
/// CREATE TRIGGER t BEFORE INSERT ON table_name ...;
3288-
/// -- period_specified_before_table == false: MSSQL
3288+
/// -- period_before_table == false: MSSQL
32893289
/// CREATE TRIGGER t ON table_name BEFORE INSERT ...;
32903290
/// ```
3291-
pub period_specified_before_table: bool,
3291+
pub period_before_table: bool,
32923292
/// Multiple events can be specified using OR, such as `INSERT`, `UPDATE`, `DELETE`, or `TRUNCATE`.
32933293
pub events: Vec<TriggerEvent>,
32943294
/// The table on which the trigger is to be created.
@@ -3323,7 +3323,7 @@ impl Display for CreateTrigger {
33233323
or_replace,
33243324
is_constraint,
33253325
name,
3326-
period_specified_before_table,
3326+
period_before_table,
33273327
period,
33283328
events,
33293329
table_name,
@@ -3345,7 +3345,7 @@ impl Display for CreateTrigger {
33453345
is_constraint = if *is_constraint { "CONSTRAINT " } else { "" },
33463346
)?;
33473347

3348-
if *period_specified_before_table {
3348+
if *period_before_table {
33493349
write!(f, "{period}")?;
33503350
if !events.is_empty() {
33513351
write!(f, " {}", display_separated(events, " OR "))?;

‎src/dialect/mssql.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ impl MsSqlDialect {
259259
is_constraint: false,
260260
name,
261261
period,
262-
period_specified_before_table: false,
262+
period_before_table: false,
263263
events,
264264
table_name,
265265
referenced_table_name: None,

‎src/parser/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5651,7 +5651,7 @@ impl<'a> Parser<'a> {
56515651
is_constraint,
56525652
name,
56535653
period,
5654-
period_specified_before_table: true,
5654+
period_before_table: true,
56555655
events,
56565656
table_name,
56575657
referenced_table_name,

‎tests/sqlparser_mssql.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2391,7 +2391,7 @@ fn parse_create_trigger() {
23912391
is_constraint: false,
23922392
name: ObjectName::from(vec![Ident::new("reminder1")]),
23932393
period: TriggerPeriod::After,
2394-
period_specified_before_table: false,
2394+
period_before_table: false,
23952395
events: vec![TriggerEvent::Insert, TriggerEvent::Update(vec![]),],
23962396
table_name: ObjectName::from(vec![Ident::new("Sales"), Ident::new("Customer")]),
23972397
referenced_table_name: None,

‎tests/sqlparser_mysql.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3929,7 +3929,7 @@ fn parse_create_trigger() {
39293929
is_constraint: false,
39303930
name: ObjectName::from(vec![Ident::new("emp_stamp")]),
39313931
period: TriggerPeriod::Before,
3932-
period_specified_before_table: true,
3932+
period_before_table: true,
39333933
events: vec![TriggerEvent::Insert],
39343934
table_name: ObjectName::from(vec![Ident::new("emp")]),
39353935
referenced_table_name: None,

‎tests/sqlparser_postgres.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5678,7 +5678,7 @@ fn parse_create_simple_before_insert_trigger() {
56785678
is_constraint: false,
56795679
name: ObjectName::from(vec![Ident::new("check_insert")]),
56805680
period: TriggerPeriod::Before,
5681-
period_specified_before_table: true,
5681+
period_before_table: true,
56825682
events: vec![TriggerEvent::Insert],
56835683
table_name: ObjectName::from(vec![Ident::new("accounts")]),
56845684
referenced_table_name: None,
@@ -5710,7 +5710,7 @@ fn parse_create_after_update_trigger_with_condition() {
57105710
is_constraint: false,
57115711
name: ObjectName::from(vec![Ident::new("check_update")]),
57125712
period: TriggerPeriod::After,
5713-
period_specified_before_table: true,
5713+
period_before_table: true,
57145714
events: vec![TriggerEvent::Update(vec![])],
57155715
table_name: ObjectName::from(vec![Ident::new("accounts")]),
57165716
referenced_table_name: None,
@@ -5749,7 +5749,7 @@ fn parse_create_instead_of_delete_trigger() {
57495749
is_constraint: false,
57505750
name: ObjectName::from(vec![Ident::new("check_delete")]),
57515751
period: TriggerPeriod::InsteadOf,
5752-
period_specified_before_table: true,
5752+
period_before_table: true,
57535753
events: vec![TriggerEvent::Delete],
57545754
table_name: ObjectName::from(vec![Ident::new("accounts")]),
57555755
referenced_table_name: None,
@@ -5781,7 +5781,7 @@ fn parse_create_trigger_with_multiple_events_and_deferrable() {
57815781
is_constraint: true,
57825782
name: ObjectName::from(vec![Ident::new("check_multiple_events")]),
57835783
period: TriggerPeriod::Before,
5784-
period_specified_before_table: true,
5784+
period_before_table: true,
57855785
events: vec![
57865786
TriggerEvent::Insert,
57875787
TriggerEvent::Update(vec![]),
@@ -5821,7 +5821,7 @@ fn parse_create_trigger_with_referencing() {
58215821
is_constraint: false,
58225822
name: ObjectName::from(vec![Ident::new("check_referencing")]),
58235823
period: TriggerPeriod::Before,
5824-
period_specified_before_table: true,
5824+
period_before_table: true,
58255825
events: vec![TriggerEvent::Insert],
58265826
table_name: ObjectName::from(vec![Ident::new("accounts")]),
58275827
referenced_table_name: None,
@@ -6137,7 +6137,7 @@ fn parse_trigger_related_functions() {
61376137
is_constraint: false,
61386138
name: ObjectName::from(vec![Ident::new("emp_stamp")]),
61396139
period: TriggerPeriod::Before,
6140-
period_specified_before_table: true,
6140+
period_before_table: true,
61416141
events: vec![TriggerEvent::Insert, TriggerEvent::Update(vec![])],
61426142
table_name: ObjectName::from(vec![Ident::new("emp")]),
61436143
referenced_table_name: None,

‎tests/sqlparser_sqlite.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ fn test_create_trigger() {
622622
is_constraint,
623623
name,
624624
period,
625-
period_specified_before_table,
625+
period_before_table,
626626
events,
627627
table_name,
628628
referenced_table_name,
@@ -640,7 +640,7 @@ fn test_create_trigger() {
640640
assert!(!is_constraint);
641641
assert_eq!(name.to_string(), "trg_inherit_asset_models");
642642
assert_eq!(period, TriggerPeriod::After);
643-
assert!(period_specified_before_table);
643+
assert!(period_before_table);
644644
assert_eq!(events, vec![TriggerEvent::Insert]);
645645
assert_eq!(table_name.to_string(), "assets");
646646
assert!(referenced_table_name.is_none());
@@ -668,7 +668,7 @@ fn test_create_trigger() {
668668
is_constraint,
669669
name,
670670
period,
671-
period_specified_before_table,
671+
period_before_table,
672672
events,
673673
table_name,
674674
referenced_table_name,
@@ -686,7 +686,7 @@ fn test_create_trigger() {
686686
assert!(!is_constraint);
687687
assert_eq!(name.to_string(), "log_new_user");
688688
assert_eq!(period, TriggerPeriod::After);
689-
assert!(period_specified_before_table);
689+
assert!(period_before_table);
690690
assert_eq!(events, vec![TriggerEvent::Insert]);
691691
assert_eq!(table_name.to_string(), "users");
692692
assert!(referenced_table_name.is_none());
@@ -708,7 +708,7 @@ fn test_create_trigger() {
708708
is_constraint,
709709
name,
710710
period,
711-
period_specified_before_table,
711+
period_before_table,
712712
events,
713713
table_name,
714714
referenced_table_name,
@@ -726,7 +726,7 @@ fn test_create_trigger() {
726726
assert!(!is_constraint);
727727
assert_eq!(name.to_string(), "cleanup_orders");
728728
assert_eq!(period, TriggerPeriod::After);
729-
assert!(period_specified_before_table);
729+
assert!(period_before_table);
730730
assert_eq!(events, vec![TriggerEvent::Delete]);
731731
assert_eq!(table_name.to_string(), "customers");
732732
assert!(referenced_table_name.is_none());
@@ -748,7 +748,7 @@ fn test_create_trigger() {
748748
is_constraint,
749749
name,
750750
period,
751-
period_specified_before_table,
751+
period_before_table,
752752
events,
753753
table_name,
754754
referenced_table_name,
@@ -766,7 +766,7 @@ fn test_create_trigger() {
766766
assert!(!is_constraint);
767767
assert_eq!(name.to_string(), "trg_before_update");
768768
assert_eq!(period, TriggerPeriod::Before);
769-
assert!(period_specified_before_table);
769+
assert!(period_before_table);
770770
assert_eq!(events, vec![TriggerEvent::Update(Vec::new())]);
771771
assert_eq!(table_name.to_string(), "products");
772772
assert!(referenced_table_name.is_none());
@@ -792,7 +792,7 @@ fn test_create_trigger() {
792792
is_constraint,
793793
name,
794794
period,
795-
period_specified_before_table,
795+
period_before_table,
796796
events,
797797
table_name,
798798
referenced_table_name,
@@ -810,7 +810,7 @@ fn test_create_trigger() {
810810
assert!(!is_constraint);
811811
assert_eq!(name.to_string(), "trg_instead_of_insert");
812812
assert_eq!(period, TriggerPeriod::InsteadOf);
813-
assert!(period_specified_before_table);
813+
assert!(period_before_table);
814814
assert_eq!(events, vec![TriggerEvent::Insert]);
815815
assert_eq!(table_name.to_string(), "my_view");
816816
assert!(referenced_table_name.is_none());
@@ -833,7 +833,7 @@ fn test_create_trigger() {
833833
is_constraint,
834834
name,
835835
period,
836-
period_specified_before_table,
836+
period_before_table,
837837
events,
838838
table_name,
839839
referenced_table_name,
@@ -851,7 +851,7 @@ fn test_create_trigger() {
851851
assert!(!is_constraint);
852852
assert_eq!(name.to_string(), "temp_trigger");
853853
assert_eq!(period, TriggerPeriod::After);
854-
assert!(period_specified_before_table);
854+
assert!(period_before_table);
855855
assert_eq!(events, vec![TriggerEvent::Insert]);
856856
assert_eq!(table_name.to_string(), "temp_table");
857857
assert!(referenced_table_name.is_none());

0 commit comments

Comments
 (0)