Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Fix various issues #46

Open
wants to merge 51 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
6c52bf1
Merge pull request #2 from hiiamrohit/master
javydreamercsw Jun 21, 2016
216c3c8
Add missing state id 2182
javydreamercsw Jun 2, 2016
049e712
Country phone codes added
erickmorales3 Oct 3, 2016
2954bc0
duplicate entry removed
theoomoregbee Oct 14, 2016
53c42ee
converted to json so client side coder can use
theoomoregbee Oct 14, 2016
9522241
Update README.md
hiiamrohit Jan 13, 2017
1ecb3b6
Updated countries.sql
dev-z Mar 16, 2017
a8f2370
Fixing issues with US states.
javydreamercsw Apr 3, 2018
9c0cb86
Removed cities from list.
javydreamercsw Apr 3, 2018
6ff6d47
Fix some issues.
javydreamercsw Apr 3, 2018
c56b0e0
Fix and comment troublesome entries refering to non-states
javydreamercsw Apr 3, 2018
e1025d0
Add a Maven project around to test the scripts.
javydreamercsw Apr 3, 2018
f2d8f22
Create travis.yml
javydreamercsw Apr 3, 2018
096a3b8
Correct file name.
javydreamercsw Apr 3, 2018
7a85a5a
Update Travis script.
javydreamercsw Apr 3, 2018
6ee81f3
Specify distribution
javydreamercsw Apr 3, 2018
b9333fd
Use a different port
javydreamercsw Apr 3, 2018
1787365
Make one script
javydreamercsw Apr 3, 2018
b7877eb
Remove JPA stuff
javydreamercsw Apr 3, 2018
e5c80f1
Use correct comment format
javydreamercsw Apr 3, 2018
96a678a
dd relationships between tables.
javydreamercsw Apr 3, 2018
d8c5529
Address MySQL warning.
javydreamercsw Apr 3, 2018
b183cf0
Adressing issue #25
javydreamercsw Apr 3, 2018
b2ac3df
Fix issue #38
javydreamercsw Apr 3, 2018
5435b7c
Add test to check for empty countries and cities.
javydreamercsw Apr 5, 2018
e1c4def
Add cities for Sao Paulo.
javydreamercsw Apr 5, 2018
747e6ef
Add sheet to help adding cities.
javydreamercsw Apr 5, 2018
ebdc3e1
Fix format of Readme file.
javydreamercsw Apr 5, 2018
30f2835
Merge branch 'master' into javydreamercsw-fix-issue-32
javydreamercsw Apr 5, 2018
3e5caa7
Fixed missing city in Puerto Rico
javydreamercsw Apr 5, 2018
f7560de
Merge branch 'javydreamercsw-fix-issue-32' of https://github.com/javy…
javydreamercsw Apr 5, 2018
c9b777f
Update README.md
javydreamercsw Apr 5, 2018
4ef335f
Incorporated issue #6.
javydreamercsw Apr 5, 2018
0cdde46
Merge branch 'javydreamercsw-fix-issue-32' of https://github.com/javy…
javydreamercsw Apr 5, 2018
3b208fe
Create clean files removing empty countries/states.
javydreamercsw Apr 5, 2018
087438e
Formatting.
javydreamercsw Apr 7, 2018
528f2a8
Add missing Puerto Rico cities.
javydreamercsw Apr 7, 2018
c3cb8e3
Merge remote-tracking branch 'upstream/master'
javydreamercsw Aug 8, 2018
55db2ce
Merge remote-tracking branch 'origin/master'
javydreamercsw Aug 8, 2018
cf8141e
Add NetBeans configuration files.
javydreamercsw Aug 8, 2018
332bd45
Disable failing test while stuff is fixed.
javydreamercsw Aug 8, 2018
a65b1e6
Address Issue #44
javydreamercsw Aug 8, 2018
099f20b
Add Travis Badge
javydreamercsw Aug 8, 2018
32fc44d
Add Travis Badge
javydreamercsw Aug 8, 2018
d97d876
Merge remote-tracking branch 'origin/master'
javydreamercsw Aug 8, 2018
5e9da03
Update README.md
javydreamercsw Aug 8, 2018
4083b0a
Add a test to check key integrity to make sure referenced parents exist.
javydreamercsw Aug 9, 2018
8036c39
Uncomment part of the test failing.
javydreamercsw Aug 9, 2018
e74f265
Revert "Address Issue #44"
javydreamercsw Aug 8, 2018
7bdf2da
Revert "Address Issue #44"
javydreamercsw Aug 8, 2018
f18712e
Merge remote-tracking branch 'origin/javydreamercsw-fix-issue-32' int…
javydreamercsw Aug 9, 2018
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/target/
/nbproject/
**/*-clean.sql
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
language: java
dist: trusty

sudo: false # faster builds

script: mvn install test
Binary file added City Import Sheet.xlsx
Binary file not shown.
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
[![Build Status](https://travis-ci.org/javydreamercsw/Countries-States-Cities-database.svg?branch=master)](https://travis-ci.org/javydreamercsw/Countries-States-Cities-database)

#Database
# Database
City state country dropdown : http://lab.iamrohit.in/php_ajax_country_state_city_dropdown/
Download full source code: http://www.iamrohit.in/tag/php-ajax-country-state-city-dropdown

#Note:
*This Free database dose not guarantee for the complete list of world countries, states and cities.

*You can manually change the spelling mistakes, or add edit any records, which are not correct.
# Note:
* This Free database dose not guarantee for the complete list of world countries, states and cities.
* You can manually change the spelling mistakes, or add edit any records, which are not correct.
* You can submit new data by filling up the provided excel files following the instructions within.
* There's a Maven Java project built around the sql files with the sole purpose of testing that the scripts are correct to help with the Pull Request process to prevent bad data to be added.
Loading