summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2006-07-25 13:49:21 +0000
committerTom Lane2006-07-25 13:49:21 +0000
commitce5db588f47da26312c0e573a9455e5a381b90a2 (patch)
tree26d8bc3f2e4484ab8e484004d475d85210616128
parentf06826c3fa1812c5d8d1ad1b5b567616a4e48cf6 (diff)
Add missing @OVERRIDE to 'India' config file, per Michael Fuhr.
Add $PostgreSQL$ lines for CVS identity, too.
-rw-r--r--src/timezone/tznames/Africa.txt2
-rw-r--r--src/timezone/tznames/America.txt2
-rw-r--r--src/timezone/tznames/Antarctica.txt2
-rw-r--r--src/timezone/tznames/Asia.txt2
-rw-r--r--src/timezone/tznames/Atlantic.txt2
-rw-r--r--src/timezone/tznames/Australia2
-rw-r--r--src/timezone/tznames/Australia.txt2
-rw-r--r--src/timezone/tznames/Default2
-rw-r--r--src/timezone/tznames/Etc.txt2
-rw-r--r--src/timezone/tznames/Europe.txt2
-rw-r--r--src/timezone/tznames/India7
-rw-r--r--src/timezone/tznames/Indian.txt2
-rw-r--r--src/timezone/tznames/Pacific.txt2
-rw-r--r--src/timezone/tznames/README4
14 files changed, 35 insertions, 0 deletions
diff --git a/src/timezone/tznames/Africa.txt b/src/timezone/tznames/Africa.txt
index ccbced3465..419dd04d86 100644
--- a/src/timezone/tznames/Africa.txt
+++ b/src/timezone/tznames/Africa.txt
@@ -4,6 +4,8 @@
# a template for timezones you could need. See the `Date/Time Support'
# appendix in the PostgreSQL documentation for more information.
#
+# $PostgreSQL$
+#
CAT 7200 # Central Africa Time
# (Africa/Blantyre)
diff --git a/src/timezone/tznames/America.txt b/src/timezone/tznames/America.txt
index 4a27df425a..aec13aaad8 100644
--- a/src/timezone/tznames/America.txt
+++ b/src/timezone/tznames/America.txt
@@ -4,6 +4,8 @@
# a template for timezones you could need. See the `Date/Time Support'
# appendix in the PostgreSQL documentation for more information.
#
+# $PostgreSQL$
+#
# Acre time is sometimes called Acre Standard Time (AST) which leads to a
# conflict with AST (see below at AST)
diff --git a/src/timezone/tznames/Antarctica.txt b/src/timezone/tznames/Antarctica.txt
index 6f3069f1b3..9d1796d8fd 100644
--- a/src/timezone/tznames/Antarctica.txt
+++ b/src/timezone/tznames/Antarctica.txt
@@ -4,6 +4,8 @@
# a template for timezones you could need. See the `Date/Time Support'
# appendix in the PostgreSQL documentation for more information.
#
+# $PostgreSQL$
+#
CLST -10800 D # Chile Summer Time
# (America/Santiago)
diff --git a/src/timezone/tznames/Asia.txt b/src/timezone/tznames/Asia.txt
index 70c3a2e28e..8743c25005 100644
--- a/src/timezone/tznames/Asia.txt
+++ b/src/timezone/tznames/Asia.txt
@@ -4,6 +4,8 @@
# a template for timezones you could need. See the `Date/Time Support'
# appendix in the PostgreSQL documentation for more information.
#
+# $PostgreSQL$
+#
# CONFLICT! ADT is not unique
# Other timezones:
diff --git a/src/timezone/tznames/Atlantic.txt b/src/timezone/tznames/Atlantic.txt
index 5c447d9c92..cfae37bc05 100644
--- a/src/timezone/tznames/Atlantic.txt
+++ b/src/timezone/tznames/Atlantic.txt
@@ -4,6 +4,8 @@
# a template for timezones you could need. See the `Date/Time Support'
# appendix in the PostgreSQL documentation for more information.
#
+# $PostgreSQL$
+#
# CONFLICT! ADT is not unique
# Other timezones:
diff --git a/src/timezone/tznames/Australia b/src/timezone/tznames/Australia
index a47d5d3386..80e3d13873 100644
--- a/src/timezone/tznames/Australia
+++ b/src/timezone/tznames/Australia
@@ -3,6 +3,8 @@
# In order to use this file, you need to set the run-time parameter
# timezone_abbreviations to 'Australia'. See the `Date/Time Support'
# appendix in the PostgreSQL documentation for more information.
+#
+# $PostgreSQL$
# include the default set
diff --git a/src/timezone/tznames/Australia.txt b/src/timezone/tznames/Australia.txt
index 0fdad5d1c9..a5ad6f44ff 100644
--- a/src/timezone/tznames/Australia.txt
+++ b/src/timezone/tznames/Australia.txt
@@ -4,6 +4,8 @@
# a template for timezones you could need. See the `Date/Time Support'
# appendix in the PostgreSQL documentation for more information.
#
+# $PostgreSQL$
+#
ACSST 37800 D # Central Australia (not in zic)
# CONFLICT! ACST is not unique
diff --git a/src/timezone/tznames/Default b/src/timezone/tznames/Default
index dfadd22af1..fdaddd414b 100644
--- a/src/timezone/tznames/Default
+++ b/src/timezone/tznames/Default
@@ -3,6 +3,8 @@
# In order to use this file, you need to set the run-time parameter
# timezone_abbreviations to 'Default'. See the `Date/Time Support'
# appendix in the PostgreSQL documentation for more information.
+#
+# $PostgreSQL$
#################### AFRICA ####################
diff --git a/src/timezone/tznames/Etc.txt b/src/timezone/tznames/Etc.txt
index 9d8d15f055..4f92a5304a 100644
--- a/src/timezone/tznames/Etc.txt
+++ b/src/timezone/tznames/Etc.txt
@@ -4,6 +4,8 @@
# a template for timezones you could need. See the `Date/Time Support'
# appendix in the PostgreSQL documentation for more information.
#
+# $PostgreSQL$
+#
GMT 0 # Greenwich Mean Time
# (Africa/Abidjan)
diff --git a/src/timezone/tznames/Europe.txt b/src/timezone/tznames/Europe.txt
index 19839a69a0..1977d51920 100644
--- a/src/timezone/tznames/Europe.txt
+++ b/src/timezone/tznames/Europe.txt
@@ -4,6 +4,8 @@
# a template for timezones you could need. See the `Date/Time Support'
# appendix in the PostgreSQL documentation for more information.
#
+# $PostgreSQL$
+#
BST 3600 D # British Summer Time
# Brazil Standard Time
diff --git a/src/timezone/tznames/India b/src/timezone/tznames/India
index 11e4d12609..0eafb98d79 100644
--- a/src/timezone/tznames/India
+++ b/src/timezone/tznames/India
@@ -3,10 +3,17 @@
# In order to use this file, you need to set the run-time parameter
# timezone_abbreviations to 'India'. See the `Date/Time Support'
# appendix in the PostgreSQL documentation for more information.
+#
+# $PostgreSQL$
# include the default set
@INCLUDE Default
+# most timezones are already defined in the default set. With the OVERRIDE
+# option, PostgreSQL will use the new definitions instead of throwing an error
+# in case of a conflict.
+@OVERRIDE
+
IST 19800 # Indian Standard Time
# (Asia/Calcutta)
diff --git a/src/timezone/tznames/Indian.txt b/src/timezone/tznames/Indian.txt
index 06a880ecc9..876719aab9 100644
--- a/src/timezone/tznames/Indian.txt
+++ b/src/timezone/tznames/Indian.txt
@@ -4,6 +4,8 @@
# a template for timezones you could need. See the `Date/Time Support'
# appendix in the PostgreSQL documentation for more information.
#
+# $PostgreSQL$
+#
CCT 23400 # Cocos Islands Time (Indian Ocean)
# (Indian/Cocos)
diff --git a/src/timezone/tznames/Pacific.txt b/src/timezone/tznames/Pacific.txt
index 1616b939f7..7a60cc4f60 100644
--- a/src/timezone/tznames/Pacific.txt
+++ b/src/timezone/tznames/Pacific.txt
@@ -4,6 +4,8 @@
# a template for timezones you could need. See the `Date/Time Support'
# appendix in the PostgreSQL documentation for more information.
#
+# $PostgreSQL$
+#
CHADT 49500 D # Chatham Daylight Time (New Zealand)
# (Pacific/Chatham)
diff --git a/src/timezone/tznames/README b/src/timezone/tznames/README
index ce4538873e..3b1bdcce50 100644
--- a/src/timezone/tznames/README
+++ b/src/timezone/tznames/README
@@ -16,3 +16,7 @@ If you do not find an appropriate set of time zone names for your geographic
location supplied here, please report this to <[email protected]>.
Your set of time zone names can then be included in future releases.
For the time being you can always add your own set.
+
+The files named Africa.txt, etc, are not intended to be used directly as
+timezone abbreviation files. They contain reference definitions of timezone
+names that can be copied into a custom abbreviation file as needed.