From 477bfe3cfba4d0b0f1ce8860eeddb80694b04bb4 Mon Sep 17 00:00:00 2001 From: Peter Wood Date: Tue, 2 Aug 2022 06:12:02 -0400 Subject: [PATCH] database redesign --- .gitignore | 2 ++ holidays.sql | Bin 0 -> 7600 bytes procedures/proc_GetTransactions.sql | 2 +- views/vw_BudgetRunningBalance.sql | 10 +++++----- views/vw_CurrentMonthBudget.sql | 8 ++++---- 5 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 holidays.sql diff --git a/.gitignore b/.gitignore index 8d4f890..bccaf02 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ .vs/* budget.sqlproj +Load BUDGET_DETAIL.sql +budget queries.sql diff --git a/holidays.sql b/holidays.sql new file mode 100644 index 0000000000000000000000000000000000000000..ee3cc20a5babaec5dbddd2047b5ead42345f831f GIT binary patch literal 7600 zcmd5>X;T|V5bdv|D*s`>NyZjf^6fGyV-6ny?0{?+MY$*t;xHglk}%=VCwZ@1t(nhcVCd_R+ic+N1Zjk!IYdn6tG_i#x295c^#r5Rn@)_;?%L25g) zi&e=FkLNh|Fw&J7N$2)Q5_FYrOW)~2iVW{}$%M0xX@z;|94g5 zGw{`wub|MvJR3j7ye4Sytyy^liJwBs$GCfj=R7Yp%yrIdxa)v!OhScf+t#0!uvkPrcyV5Ex+@0X}9KSn|j+n`m zeFccPg9WS zPn<3A<12oUb$KrfvMnFw1MD~tYcJvH4Mtbwt&VKMdfOPEmsc2DQtM3vDddSKwMK3A zKzA8*)&znOA<1s=UOzE~nq!(KXk>M-ywU zV~q`!$L5ird5rM-3UgkAk2QTVugmbfjQK9<8fLFzUR7ya$UR)+Rqx<=4rc{4xdQ#% z_^TvTo%)9IMH-7E&iTHtH;=nTtY$R0S`E?0R`oYbLQ3FNm!Nl2{x{qczyB@g-{(8F zQmj|XwgkH@styledyep&1WRR}HyLWaVZ9#w;ZUztM8NxE+8>W0?jb`I_ zwb+)lBfW?|LY*)I5h0v2g=0bSYhK3ZDfq=3)mHG@>w8fZ^yr75Kw%v#Rwd<<$lH=l z$U{wh!BYkeWO5g01=!?XXulO5C#SK0IM?K}IpVW|72DW}vJqwTmfM%-F8IGadA1Ns zxa%>lQH2yuD zP^P!K+qRMK5pRY%%j3t{tPF9iM7|$CUMS+8l+3+3-d2Dz)+dY#Q!xtUW871$~L#e4M#-f0UD6y<2fE^>&QetbMHERcZLRU*p;$t~vaFzor>Kv(!!SHV^7?&3y-T>3Ax|YrJ?Ywy-dU=2JDm+yEmVq7*qtLymwy`?UHO3vNrP_!!lCN*A(-Q1h0H2{#V_5Q9Hl9ZWQMOo`KCsFDBs+zyH3!<4aIY)lihT@n z!JUlwPJ22r?R|K=^;gT0n_t_yIXj@g2Tm=1vR3U3_c%sJKC{o+QLpNOlVWxIa@4sc zm!3c5t6EACbL&G>M+*pk?xT_;3h*B)YdEe zPt5cTlk8Q~A5wam;*$l?pU<=~{n~k9Cq0$WHCB{8wLprM9a!4q8}Cz^TRe=ZI5kFB=5`sr$aGcWqC6S&k!e)po$+ZlaIRy@F+#&^_hx>{FfWeZp)SZn z94+$EgOReX_OSYu@ALE+;NRJ9{yn1jE#f0$h~p%+NFRRb-=Lh6)S_<9^gW_t5pP<@ z?K9+V!++*9qu_TAj}!Dd>;01s?RR~<(=*twGQ6=`rcbeE-c>&(#d4mfOV>#y2$3+A zcN1}JF7h(tyXXb13)%S}U^e$kyRVM;Ey`K8{((l(bJ)kF3jS>?Q^KO``B|1HSRTbM GNdEvvQ8#@6 literal 0 HcmV?d00001 diff --git a/procedures/proc_GetTransactions.sql b/procedures/proc_GetTransactions.sql index 59d512f..6e32298 100644 --- a/procedures/proc_GetTransactions.sql +++ b/procedures/proc_GetTransactions.sql @@ -9,7 +9,7 @@ begin set @yr = isnull(@yr, year(getdate())) set @mo = isnull(@mo, month(getdate())) - select Id, TrxDate, TrxDate_ISO8601, TrxDescription, TrxAmount, RunningBal + select TrxId, TrxDate, TrxDate_ISO8601, TrxDescription, TrxAmount, RunningBal from dbo.vw_BudgetRunningBalance where YEAR(TrxDate) = @yr diff --git a/views/vw_BudgetRunningBalance.sql b/views/vw_BudgetRunningBalance.sql index 1d3ed71..ccebe68 100644 --- a/views/vw_BudgetRunningBalance.sql +++ b/views/vw_BudgetRunningBalance.sql @@ -1,9 +1,9 @@ use Leo go -create view dbo.vw_BUDGET_RUNNING_BAL -as -select - BDT_DATE, BDT_DESCRIPTION, BDT_AMOUNT - , sum(BDT_AMOUNT) over(order by BDT_DATE, BDT_AMOUNT desc rows unbounded preceding) RUNNING_BAL +alter view dbo.vw_BudgetRunningBalance +as +select + TrxId, TrxDate, TrxDate_ISO8601=convert(datetime, TrxDate, 126), TrxDescription, TrxAmount + , sum(TrxAmount) over(order by TrxDate, TrxAmount desc rows unbounded preceding) RunningBal from dbo.BUDGET_DETAIL \ No newline at end of file diff --git a/views/vw_CurrentMonthBudget.sql b/views/vw_CurrentMonthBudget.sql index 1e404f7..ebcc304 100644 --- a/views/vw_CurrentMonthBudget.sql +++ b/views/vw_CurrentMonthBudget.sql @@ -1,8 +1,8 @@ use Leo go -create view dbo.vw_CURR_MONTH_BUDGET +alter view dbo.vw_CurrentMonthBudget as -select * -from dbo.vw_BUDGET_RUNNING_BAL -where BDT_DATE between dateadd(DAY, 1, EOMONTH(getDate(), -1)) and eomonth(getDate()) \ No newline at end of file +select * +from dbo.vw_BudgetRunningBalance +where TrxDate between dateadd(DAY, 1, EOMONTH(getDate(), -1)) and eomonth(getDate()) \ No newline at end of file