Merge branch 'dev-2.0'

Author: cjbj

.github/SUPPORT.md

@@ -0,0 +1,30 @@
+# Node-oracledb Support
+
+Node-oracledb is an Open Source project.
+
+Searching and reading may be the quickest way to resolve a problem.
+
+## Node-oracledb Installation issues
+
+Read the [Installation instructions](https://github.com/oracle/node-oracledb/blob/master/INSTALL.md) and see [Troubleshooting](https://github.com/oracle/node-oracledb/blob/master/INSTALL.md#troubleshooting)
+
+## SQL and PL/SQL Questions
+
+Ask SQL and PL/SQL questions at [AskTOM](https://asktom.oracle.com/)
+
+Try out SQL and find code snippets on our hosted database with [LIVE SQL](https://livesql.oracle.com/)
+
+## Database and other Oracle Issues
+
+Ask Database, network connectivity, or other Oracle issues on an [OTN Forum](https://community.oracle.com/community/database/)
+
+## Node-oracledb Documentation
+
+The Node API documentation is divided into [API documentation](https://github.com/oracle/node-oracledb/blob/master/doc/api.md) and a [User Guide](https://github.com/oracle/node-oracledb/blob/master/doc/api.md#connectionhandling)
+
+## Got a Node-oracledb question?
+
+Ask at [GitHub](https://github.com/oracle/node-oracledb/issues)
+
+When opening a new issue, fill in the template that will be shown.
+Include enough information for people to understand your problem.

.github/issue_template.md

@@ -1,4 +1,4 @@
-*Delete irrelevant parts of this template.*
+*Delete unnecessary parts of this template.*
 
 ### For general questions:
 
@@ -7,44 +7,36 @@ Use the questions at the bottom of this template as a guide.
 
 Use Markdown syntax, particularly for code blocks: see https://help.github.com/articles/basic-writing-and-formatting-syntax/#quoting-code
 
+Use a gist for screen output and logs: see https://gist.github.com/ **Do not paste long output into this issue**.
+
 ### For security issues:
 
 See https://www.oracle.com/support/assurance/vulnerability-remediation/reporting-security-vulnerabilities.html for how to report security issues.
 
 ### For installation issues:
 
-Use a gist for screen output and logs: see https://gist.github.com/
-**Do not paste long output into this issue**
-
-Review the install instructions at https://github.com/oracle/node-oracledb/blob/master/INSTALL.md
-
-Use `npm install --verbose oracledb`.  Review your output and logs.
-Try to install in a different way.  **Google anything that looks like an error.**  Try some potential solutions.
-
-For Node 4 onwards, you need a compiler with C++11 support.  On Linux use GCC 4.7 or later.
+- Review the install instructions https://github.com/oracle/node-oracledb/blob/master/INSTALL.md
 
-Did the error indicate a network connection issue?  Do you need to set `http_proxy`?
-
-Try running `npm cache clean` and deleting the `node_modules/oracledb` directory.
-
-Do you have an old version of `node-gyp` installed?  Try updating it.  Also try deleting `$HOME/.node-gyp` or equivalent.
+- Review the troubleshooting tips https://github.com/oracle/node-oracledb/blob/master/INSTALL.md#troubleshooting
 
 #### Answer the following questions:
 
-1. What is your version of Node.js?  Run examples/version.js to find versions.
+1. What is your Node.js version?  Is it 64-bit or 32-bit?  Run `version.js` from https://github.com/oracle/node-oracledb/blob/master/examples/version.js
 
-2. What version of node-oracledb are you using?
+2. What is your node-oracledb version?
 
-3. What is the version of your Oracle client (e.g. Instant Client)?  How was it installed?  Where it is installed?
+3. What is your Oracle client (e.g. Instant Client) version?  Is it 64-bit or 32-bit?  How was it installed?  Where is it installed?
 
-4. What is the version of Oracle Database?
+4. What is your Oracle Database version?
 
 5. What is your OS and version?
 
-6. What compiler version did you use?  For example, with GCC, run `gcc --version`
+6. What is your compiler version?  For example, with GCC, run `gcc --version`
+
+7. What Oracle environment variables did you set?  How *exactly* did you set them?
 
-7. What environment variables did you set?  How *exactly* did you set them?
+8. What is the `PATH` environment variable (on Windows) or `LD_LIBRARY_PATH` (on Linux) set to?  On macOS, what is in `~/lib`?
 
-8. What *exact* command caused the problem (e.g. what command did you try to install with)?  Who were you logged in as?
+9. What *exact* command caused the problem (e.g. what command did you try to install with)?  Who were you logged in as?
 
-9. What error(s) you are seeing?
+10. What error(s) you are seeing?

.github/pull_request_template.md

@@ -4,6 +4,8 @@ Before submitting PRs for node-oracledb you must have your signed *Oracle Contri
 
 If the problem solved is small, you may find it easier to open an Issue describing the problem and its cause so we can create the fix.
 
+**Note that the ODPI-C submodule does not accept PRs.**  Any required changes to ODPI-C should be submitted in the form of a problem description at https://github.com/oracle/odpi/issues before submitting a node-oracledb PR.
+
 The bottom of your commit message must have the following line using your name and e-mail address as it appears in the OCA Signatories list.
 
 ```

.gitignore

@@ -14,7 +14,9 @@ node_modules
 /examples/lobselectout.jpg
 /examples/lobbindsout1.txt
 /examples/lobbindsout2.txt
-/odpi
+/package/SHASUMS256.txt
+/package/*.gz
+package-lock.json
 
 # Oracle Ignores
 sqlnet.log
@@ -24,3 +26,4 @@ oraaccess.xml
 instantclient
 instantclient_11_2
 instantclient_12_1
+instantclient_12_2

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "odpi"]
+	path = odpi
+	url = https://github.com/oracle/odpi

.npmignore

@@ -1,4 +1,6 @@
+.github
 .editorconfig
+.gitmodules
 INSTALL.md
 CONTRIBUTING.md
 /doc
@@ -7,6 +9,16 @@ CONTRIBUTING.md
 /build
 /node_modules
 /oracle_private
-/.github
+/package/*.gz
+/package/SHASUMS256.*
 oracledb-*.tgz
+staging-oracledb-*.tgz
 .npmignore
+/odpi/Makefile
+/odpi/Makefile.win32
+/odpi/doc
+/odpi/samples
+/odpi/test
+/odpi/.git
+/odpi/.github
+/odpi/.gitattributes