Page MenuHomePhabricator
Files F14332366

D16788.diff
No OneTemporary
Actions

D16788.diff
View Options

diff --git a/resources/sql/autopatches/20161101.calendar.01.noholiday.sql b/resources/sql/autopatches/20161101.calendar.01.noholiday.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20161101.calendar.01.noholiday.sql
@@ -0,0 +1 @@
+DROP TABLE {$NAMESPACE}_calendar.calendar_holiday;
diff --git a/scripts/calendar/import_us_holidays.php b/scripts/calendar/import_us_holidays.php
deleted file mode 100755
--- a/scripts/calendar/import_us_holidays.php
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-$root = dirname(dirname(dirname(__FILE__)));
-require_once $root.'/scripts/__init_script__.php';
-
-// http://www.opm.gov/operating_status_schedules/fedhol/
-$holidays = array(
- '2014-01-01' => "New Year's Day",
- '2014-01-20' => 'Birthday of Martin Luther King, Jr.',
- '2014-02-17' => "Washington's Birthday",
- '2014-05-26' => 'Memorial Day',
- '2014-07-04' => 'Independence Day',
- '2014-09-01' => 'Labor Day',
- '2014-10-13' => 'Columbus Day',
- '2014-11-11' => 'Veterans Day',
- '2014-11-27' => 'Thanksgiving Day',
- '2014-12-25' => 'Christmas Day',
- '2015-01-01' => "New Year's Day",
- '2015-01-19' => 'Birthday of Martin Luther King, Jr.',
- '2015-02-16' => "Washington's Birthday",
- '2015-05-25' => 'Memorial Day',
- '2015-07-03' => 'Independence Day',
- '2015-09-07' => 'Labor Day',
- '2015-10-12' => 'Columbus Day',
- '2015-11-11' => 'Veterans Day',
- '2015-11-26' => 'Thanksgiving Day',
- '2015-12-25' => 'Christmas Day',
- '2016-01-01' => "New Year's Day",
- '2016-01-18' => 'Birthday of Martin Luther King, Jr.',
- '2016-02-15' => "Washington's Birthday",
- '2016-05-30' => 'Memorial Day',
- '2016-07-04' => 'Independence Day',
- '2016-09-05' => 'Labor Day',
- '2016-10-10' => 'Columbus Day',
- '2016-11-11' => 'Veterans Day',
- '2016-11-24' => 'Thanksgiving Day',
- '2016-12-26' => 'Christmas Day',
- '2017-01-02' => "New Year's Day",
- '2017-01-16' => 'Birthday of Martin Luther King, Jr.',
- '2017-02-10' => "Washington's Birthday",
- '2017-05-29' => 'Memorial Day',
- '2017-07-04' => 'Independence Day',
- '2017-09-04' => 'Labor Day',
- '2017-10-09' => 'Columbus Day',
- '2017-11-10' => 'Veterans Day',
- '2017-11-23' => 'Thanksgiving Day',
- '2017-12-25' => 'Christmas Day',
-);
-
-$table = new PhabricatorCalendarHoliday();
-$conn_w = $table->establishConnection('w');
-$table_name = $table->getTableName();
-
-foreach ($holidays as $day => $name) {
- queryfx(
- $conn_w,
- 'INSERT IGNORE INTO %T (day, name) VALUES (%s, %s)',
- $table_name,
- $day,
- $name);
-}
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2103,8 +2103,6 @@
'PhabricatorCalendarExternalInvitee' => 'applications/calendar/storage/PhabricatorCalendarExternalInvitee.php',
'PhabricatorCalendarExternalInviteePHIDType' => 'applications/calendar/phid/PhabricatorCalendarExternalInviteePHIDType.php',
'PhabricatorCalendarExternalInviteeQuery' => 'applications/calendar/query/PhabricatorCalendarExternalInviteeQuery.php',
- 'PhabricatorCalendarHoliday' => 'applications/calendar/storage/PhabricatorCalendarHoliday.php',
- 'PhabricatorCalendarHolidayTestCase' => 'applications/calendar/storage/__tests__/PhabricatorCalendarHolidayTestCase.php',
'PhabricatorCalendarICSFileImportEngine' => 'applications/calendar/import/PhabricatorCalendarICSFileImportEngine.php',
'PhabricatorCalendarICSImportEngine' => 'applications/calendar/import/PhabricatorCalendarICSImportEngine.php',
'PhabricatorCalendarICSURIImportEngine' => 'applications/calendar/import/PhabricatorCalendarICSURIImportEngine.php',
@@ -6960,8 +6958,6 @@
),
'PhabricatorCalendarExternalInviteePHIDType' => 'PhabricatorPHIDType',
'PhabricatorCalendarExternalInviteeQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
- 'PhabricatorCalendarHoliday' => 'PhabricatorCalendarDAO',
- 'PhabricatorCalendarHolidayTestCase' => 'PhabricatorTestCase',
'PhabricatorCalendarICSFileImportEngine' => 'PhabricatorCalendarICSImportEngine',
'PhabricatorCalendarICSImportEngine' => 'PhabricatorCalendarImportEngine',
'PhabricatorCalendarICSURIImportEngine' => 'PhabricatorCalendarICSImportEngine',
diff --git a/src/applications/calendar/storage/PhabricatorCalendarHoliday.php b/src/applications/calendar/storage/PhabricatorCalendarHoliday.php
deleted file mode 100644
--- a/src/applications/calendar/storage/PhabricatorCalendarHoliday.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-final class PhabricatorCalendarHoliday extends PhabricatorCalendarDAO {
-
- protected $day;
- protected $name;
-
- protected function getConfiguration() {
- return array(
- self::CONFIG_TIMESTAMPS => false,
- self::CONFIG_COLUMN_SCHEMA => array(
- 'day' => 'date',
- 'name' => 'text64',
- ),
- self::CONFIG_KEY_SCHEMA => array(
- 'day' => array(
- 'columns' => array('day'),
- 'unique' => true,
- ),
- ),
- ) + parent::getConfiguration();
- }
-
-}
diff --git a/src/applications/calendar/storage/__tests__/PhabricatorCalendarHolidayTestCase.php b/src/applications/calendar/storage/__tests__/PhabricatorCalendarHolidayTestCase.php
deleted file mode 100644
--- a/src/applications/calendar/storage/__tests__/PhabricatorCalendarHolidayTestCase.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-final class PhabricatorCalendarHolidayTestCase extends PhabricatorTestCase {
-
- protected function getPhabricatorTestCaseConfiguration() {
- return array(
- self::PHABRICATOR_TESTCONFIG_BUILD_STORAGE_FIXTURES => true,
- );
- }
-
- protected function willRunTests() {
- parent::willRunTests();
- id(new PhabricatorCalendarHoliday())
- ->setDay('2012-01-02')
- ->setName(pht('International Testing Day'))
- ->save();
- }
-
-}

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 19, 4:21 PM (2 h, 35 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6908021
Default Alt Text
D16788.diff (5 KB)

Event Timeline

Phabricator · Built by Phacility