Skip to content

Commit 3333141

Browse files
author
Christopher Jones
committed
Merge branch 'dev-2.0'
2 parents 18e5117 + 4ac1d79 commit 3333141

File tree

255 files changed

+42578
-25488
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

255 files changed

+42578
-25488
lines changed

‎.github/SUPPORT.md‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Node-oracledb Support
2+
3+
Node-oracledb is an Open Source project.
4+
5+
Searching and reading may be the quickest way to resolve a problem.
6+
7+
## Node-oracledb Installation issues
8+
9+
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)
10+
11+
## SQL and PL/SQL Questions
12+
13+
Ask SQL and PL/SQL questions at [AskTOM](https://asktom.oracle.com/)
14+
15+
Try out SQL and find code snippets on our hosted database with [LIVE SQL](https://livesql.oracle.com/)
16+
17+
## Database and other Oracle Issues
18+
19+
Ask Database, network connectivity, or other Oracle issues on an [OTN Forum](https://community.oracle.com/community/database/)
20+
21+
## Node-oracledb Documentation
22+
23+
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)
24+
25+
## Got a Node-oracledb question?
26+
27+
Ask at [GitHub](https://github.com/oracle/node-oracledb/issues)
28+
29+
When opening a new issue, fill in the template that will be shown.
30+
Include enough information for people to understand your problem.

‎.github/issue_template.md‎

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*Delete irrelevant parts of this template.*
1+
*Delete unnecessary parts of this template.*
22

33
### For general questions:
44

@@ -7,44 +7,36 @@ Use the questions at the bottom of this template as a guide.
77

88
Use Markdown syntax, particularly for code blocks: see https://help.github.com/articles/basic-writing-and-formatting-syntax/#quoting-code
99

10+
Use a gist for screen output and logs: see https://gist.github.com/ **Do not paste long output into this issue**.
11+
1012
### For security issues:
1113

1214
See https://www.oracle.com/support/assurance/vulnerability-remediation/reporting-security-vulnerabilities.html for how to report security issues.
1315

1416
### For installation issues:
1517

16-
Use a gist for screen output and logs: see https://gist.github.com/
17-
**Do not paste long output into this issue**
18-
19-
Review the install instructions at https://github.com/oracle/node-oracledb/blob/master/INSTALL.md
20-
21-
Use `npm install --verbose oracledb`. Review your output and logs.
22-
Try to install in a different way. **Google anything that looks like an error.** Try some potential solutions.
23-
24-
For Node 4 onwards, you need a compiler with C++11 support. On Linux use GCC 4.7 or later.
18+
- Review the install instructions https://github.com/oracle/node-oracledb/blob/master/INSTALL.md
2519

26-
Did the error indicate a network connection issue? Do you need to set `http_proxy`?
27-
28-
Try running `npm cache clean` and deleting the `node_modules/oracledb` directory.
29-
30-
Do you have an old version of `node-gyp` installed? Try updating it. Also try deleting `$HOME/.node-gyp` or equivalent.
20+
- Review the troubleshooting tips https://github.com/oracle/node-oracledb/blob/master/INSTALL.md#troubleshooting
3121

3222
#### Answer the following questions:
3323

34-
1. What is your version of Node.js? Run examples/version.js to find versions.
24+
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
3525

36-
2. What version of node-oracledb are you using?
26+
2. What is your node-oracledb version?
3727

38-
3. What is the version of your Oracle client (e.g. Instant Client)? How was it installed? Where it is installed?
28+
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?
3929

40-
4. What is the version of Oracle Database?
30+
4. What is your Oracle Database version?
4131

4232
5. What is your OS and version?
4333

44-
6. What compiler version did you use? For example, with GCC, run `gcc --version`
34+
6. What is your compiler version? For example, with GCC, run `gcc --version`
35+
36+
7. What Oracle environment variables did you set? How *exactly* did you set them?
4537

46-
7. What environment variables did you set? How *exactly* did you set them?
38+
8. What is the `PATH` environment variable (on Windows) or `LD_LIBRARY_PATH` (on Linux) set to? On macOS, what is in `~/lib`?
4739

48-
8. What *exact* command caused the problem (e.g. what command did you try to install with)? Who were you logged in as?
40+
9. What *exact* command caused the problem (e.g. what command did you try to install with)? Who were you logged in as?
4941

50-
9. What error(s) you are seeing?
42+
10. What error(s) you are seeing?

‎.github/pull_request_template.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ Before submitting PRs for node-oracledb you must have your signed *Oracle Contri
44

55
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.
66

7+
**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.
8+
79
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.
810

911
```

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ node_modules
1414
/examples/lobselectout.jpg
1515
/examples/lobbindsout1.txt
1616
/examples/lobbindsout2.txt
17-
/odpi
17+
/package/SHASUMS256.txt
18+
/package/*.gz
19+
package-lock.json
1820

1921
# Oracle Ignores
2022
sqlnet.log
@@ -24,3 +26,4 @@ oraaccess.xml
2426
instantclient
2527
instantclient_11_2
2628
instantclient_12_1
29+
instantclient_12_2

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "odpi"]
2+
path = odpi
3+
url = https://github.com/oracle/odpi

‎.npmignore‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
.github
12
.editorconfig
3+
.gitmodules
24
INSTALL.md
35
CONTRIBUTING.md
46
/doc
@@ -7,6 +9,16 @@ CONTRIBUTING.md
79
/build
810
/node_modules
911
/oracle_private
10-
/.github
12+
/package/*.gz
13+
/package/SHASUMS256.*
1114
oracledb-*.tgz
15+
staging-oracledb-*.tgz
1216
.npmignore
17+
/odpi/Makefile
18+
/odpi/Makefile.win32
19+
/odpi/doc
20+
/odpi/samples
21+
/odpi/test
22+
/odpi/.git
23+
/odpi/.github
24+
/odpi/.gitattributes

0 commit comments

Comments
 (0)