Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:
push:
branches:
- master
- main

jobs:
build:
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
# Node.js version. Thus, we have to checkout the code manually.
# Doing so is a bit tricky when it comes to PRs from forks (see #249 for details). The general idea here is that
# we access Github's context information for the event triggering the action's execution and use some details on
# the PR's HEAD if given. Otherwise (for executions due to master updates), we still use the provided
# the PR's HEAD if given. Otherwise (for executions due to main branch updates), we still use the provided
# environment variables.
run: |
apt-get update
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
C++ SQL Parser
=========================
[![Build Status](https://github.com/hyrise/sql-parser/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/hyrise/sql-parser/actions?query=branch%3Amaster)
[![Build Status](https://github.com/hyrise/sql-parser/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/hyrise/sql-parser/actions?query=branch%3Amain)


This is a SQL Parser for C++. It parses the given SQL query into C++ objects.
Expand All @@ -20,7 +20,7 @@ To use the SQL parser in your own projects you simply have to follow these few s
3. *(Optional, Recommended)* Run `make install` to copy the library to `/usr/local/lib/`
4. Run the tests `make test` to make sure everything worked
5. Include the `SQLParser.h` from `src/` (or from `/usr/local/lib/hsql/` if you installed it) and link the library in your project
6. Take a look at the [example project here](https://github.com/hyrise/sql-parser/tree/master/example)
6. Take a look at the [example project here](https://github.com/hyrise/sql-parser/tree/main/example)

```cpp
#include "hsql/SQLParser.h"
Expand Down
4 changes: 2 additions & 2 deletions format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ elif [ "$1" = "staged" ]; then
# Run on all files that are staged to be committed.
git diff --diff-filter=d --cached --name-only | grep -E "$source_regex" | xargs -I{} sh -c "${format_cmd}"
else
# Run on all changed as well as untracked cpp/hpp files, as compared to the current master. Skip deleted files.
{ git diff --diff-filter=d --name-only master & git ls-files --others --exclude-standard; } | grep -E "$source_regex" | xargs -I{} sh -c "${format_cmd}"
# Run on all changed as well as untracked cpp/hpp files, as compared to the current main. Skip deleted files.
{ git diff --diff-filter=d --name-only main & git ls-files --others --exclude-standard; } | grep -E "$source_regex" | xargs -I{} sh -c "${format_cmd}"
fi