Skip to content

Commit

Permalink
Merge pull request #51 from amakhnach/fix/fixed_links_on_cassandra_do…
Browse files Browse the repository at this point in the history 
…cumentation

FIX: Fixed links that point to cassandra documentation
  • Loading branch information
@mpenet
mpenet committed Sep 7, 2017
2 parents 00c9f81 + c106ba8 commit 2b5230e
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Expand Up @@ -195,7 +195,7 @@ Some changes require you to run against Cassandra 2.0+ !!

## 1.2.0

* Support up to cql 3.1.1 http://cassandra.apache.org/doc/cql3/CQL.html#a3.1.1
* Support up to cql 3.1.1 http://cassandra.apache.org/doc/old/CQL-3.0.html#a3.1.1
** Added `qbits.hayt.clause/if-exists`
** Added `qbits.hayt.fns/distinct*`
** `qbits.hayt.clause/if-not-exists` is deprecated, use
Expand Down
2 changes: 1 addition & 1 deletion src/clj/qbits/hayt/cql.clj
View file
@@ -1,5 +1,5 @@
(ns qbits.hayt.cql
"CQL3 ref: http://cassandra.apache.org/doc/cql3/CQL.html or
"CQL3 ref: http://cassandra.apache.org/doc/old/CQL-3.0.html or
https://github.com/apache/cassandra/blob/trunk/doc/cql3/CQL.textile#functions
This one is really up to date:
Expand Down
42 changes: 21 additions & 21 deletions src/clj/qbits/hayt/dsl/statement.clj
View file
Expand Up @@ -2,7 +2,7 @@
(:refer-clojure :exclude [update]))

(defn select
"http://cassandra.apache.org/doc/cql3/CQL.html#selectStmt
"http://cassandra.apache.org/doc/old/CQL-3.0.html#selectStmt
Takes a table identifier and additional clause arguments:
Expand All @@ -15,7 +15,7 @@ Takes a table identifier and additional clause arguments:
(into {:select table :columns :*} clauses))

(defn insert
"http://cassandra.apache.org/doc/cql3/CQL.html#insertStmt
"http://cassandra.apache.org/doc/old/CQL-3.0.html#insertStmt
Takes a table identifier and additional clause arguments:
* values
Expand All @@ -25,7 +25,7 @@ Takes a table identifier and additional clause arguments:
(into {:insert table} clauses))

(defn update
"http://cassandra.apache.org/doc/cql3/CQL.html#updateStmt
"http://cassandra.apache.org/doc/old/CQL-3.0.html#updateStmt
Takes a table identifier and additional clause arguments:
Expand All @@ -38,7 +38,7 @@ Takes a table identifier and additional clause arguments:
(into {:update table} clauses))

(defn delete
"http://cassandra.apache.org/doc/cql3/CQL.html#deleteStmt
"http://cassandra.apache.org/doc/old/CQL-3.0.html#deleteStmt
Takes a table identifier and additional clause arguments:
Expand All @@ -50,22 +50,22 @@ Takes a table identifier and additional clause arguments:
(into {:delete table :columns :*} clauses))

(defn truncate
"http://cassandra.apache.org/doc/cql3/CQL.html#truncateStmt
"http://cassandra.apache.org/doc/old/CQL-3.0.html#truncateStmt
Takes a table identifier."
[table]
{:truncate table})

(defn drop-keyspace
"http://cassandra.apache.org/doc/cql3/CQL.html#dropKeyspaceStmt
"http://cassandra.apache.org/doc/old/CQL-3.0.html#dropKeyspaceStmt
Takes a keyspace identifier and additional clauses:
* if-exists"
[keyspace & clauses]
(into {:drop-keyspace keyspace} clauses))

(defn drop-table
"http://cassandra.apache.org/doc/cql3/CQL.html#dropTableStmt
"http://cassandra.apache.org/doc/old/CQL-3.0.html#dropTableStmt
Takes a table identifier and additional clauses:
* if-exists"
Expand All @@ -82,30 +82,30 @@ Takes a type identifier and additional clauses:


(defn drop-columnfamily
"http://cassandra.apache.org/doc/cql3/CQL.html#dropTableStmt
"http://cassandra.apache.org/doc/old/CQL-3.0.html#dropTableStmt
Takes a column family identifier and additional clauses:
* if-exists"
[cf & clauses]
(into {:drop-columnfamily cf} clauses))

(defn drop-trigger
"http://cassandra.apache.org/doc/cql3/CQL.html#dropTriggerStmt
"http://cassandra.apache.org/doc/old/CQL-3.0.html#dropTriggerStmt
Takes a trigger identifier and a table identifier"
[trigger table]
{:drop-trigger trigger :on table})

(defn drop-index
"http://cassandra.apache.org/doc/cql3/CQL.html#dropIndexStmt
"http://cassandra.apache.org/doc/old/CQL-3.0.html#dropIndexStmt
Takes an index identifier and additional clauses:
* if-exists"
[index & clauses]
(into {:drop-index index} clauses))

(defn create-index
"http://cassandra.apache.org/doc/cql3/CQL.html#createIndexStmt
"http://cassandra.apache.org/doc/old/CQL-3.0.html#createIndexStmt
Takes a table identifier and additional clause arguments:
Expand All @@ -117,20 +117,20 @@ Takes a table identifier and additional clause arguments:
(into {:create-index name :custom false :on table} clauses))

(defn create-keyspace
"http://cassandra.apache.org/doc/cql3/CQL.html#createKeyspaceStmt
"http://cassandra.apache.org/doc/old/CQL-3.0.html#createKeyspaceStmt
Takes a keyspace identifier and clauses:
* with"
[keyspace & clauses]
(into {:create-keyspace keyspace} clauses))

(defn create-trigger
"http://cassandra.apache.org/doc/cql3/CQL.html#createTriggerStmt"
"http://cassandra.apache.org/doc/old/CQL-3.0.html#createTriggerStmt"
[trigger table using]
{:create-trigger trigger :on table :using using})

(defn create-type
"http://cassandra.apache.org/doc/cql3/CQL.html#createTypeStmt"
"http://cassandra.apache.org/doc/old/CQL-3.0.html#createTypeStmt"
[type & clauses]
(into {:create-type type} clauses))

Expand All @@ -143,7 +143,7 @@ Takes a keyspace identifier and clauses:
(into {:create-table table} clauses))

(defn create-index
"http://cassandra.apache.org/doc/cql3/CQL.html#createIndexStmt
"http://cassandra.apache.org/doc/old/CQL-3.0.html#createIndexStmt
Takes a table identifier and additional clause arguments:
Expand All @@ -155,12 +155,12 @@ Takes a table identifier and additional clause arguments:
(into {:create-index name :custom false :on table} clauses))

(defn alter-type
"http://cassandra.apache.org/doc/cql3/CQL.html#alterTypeStmt"
"http://cassandra.apache.org/doc/old/CQL-3.0.html#alterTypeStmt"
[type & clauses]
(into {:alter-type type} clauses))

(defn alter-table
"http://cassandra.apache.org/doc/cql3/CQL.html#alterTableStmt
"http://cassandra.apache.org/doc/old/CQL-3.0.html#alterTableStmt
Takes a table identifier and additional clause arguments:
Expand All @@ -174,7 +174,7 @@ Takes a table identifier and additional clause arguments:
(into {:alter-table table} clauses))

(defn alter-columnfamily
"http://cassandra.apache.org/doc/cql3/CQL.html#alterTableStmt
"http://cassandra.apache.org/doc/old/CQL-3.0.html#alterTableStmt
Takes a columnfamiliy identifier and additional clause arguments:
Expand All @@ -190,14 +190,14 @@ Takes a columnfamiliy identifier and additional clause arguments:
(def ^{:deprecated "1.5.0"} alter-column-family alter-columnfamily)

(defn alter-keyspace
"http://cassandra.apache.org/doc/cql3/CQL.html#alterKeyspaceStmt
"http://cassandra.apache.org/doc/old/CQL-3.0.html#alterKeyspaceStmt
Takes a keyspace identifier and a `with` clause."
[keyspace & clauses]
(into {:alter-keyspace keyspace} clauses))

(defn batch
"http://cassandra.apache.org/doc/cql3/CQL.html#batchStmt
"http://cassandra.apache.org/doc/old/CQL-3.0.html#batchStmt
Takes hayt queries optional clauses:
* queries
Expand All @@ -208,7 +208,7 @@ Takes hayt queries optional clauses:
(into {:logged true} clauses))

(defn use-keyspace
"http://cassandra.apache.org/doc/cql3/CQL.html#useStmt
"http://cassandra.apache.org/doc/old/CQL-3.0.html#useStmt
Takes a keyspace identifier"
[keyspace]
Expand Down
20 changes: 10 additions & 10 deletions src/clj/qbits/hayt/fns.clj
View file
Expand Up @@ -44,54 +44,54 @@
(.getTime ^Date d))

(defn max-timeuuid
"http://cassandra.apache.org/doc/cql3/CQL.html#usingtimeuuid"
"http://cassandra.apache.org/doc/old/CQL-3.0.html#timeuuidFun"
[^Date date]
(cql-fn "maxTimeuuid" (date->epoch date)))

(defn min-timeuuid
"http://cassandra.apache.org/doc/cql3/CQL.html#usingtimeuuid"
"http://cassandra.apache.org/doc/old/CQL-3.0.html#timeuuidFun"
[^Date date]
(cql-fn "minTimeuuid" (date->epoch date)))

(defn token
"http://cassandra.apache.org/doc/cql3/CQL.html#selectStmt
"http://cassandra.apache.org/doc/old/CQL-3.0.html#selectStmt
Returns a token function with the supplied argument"
[& tokens]
(apply cql-fn "token" tokens))

(defn writetime
"http://cassandra.apache.org/doc/cql3/CQL.html#selectStmt
"http://cassandra.apache.org/doc/old/CQL-3.0.html#selectStmt
Returns a WRITETIME function with the supplied argument"
[x]
(cql-fn "WRITETIME" x))

(defn ttl
"http://cassandra.apache.org/doc/cql3/CQL.html#selectStmt
"http://cassandra.apache.org/doc/old/CQL-3.0.html#selectStmt
Returns a TTL function with the supplied argument"
[x]
(cql-fn "TTL" x))

(defn to-date
"http://cassandra.apache.org/doc/cql3/CQL.html#timeFun
"http://cassandra.apache.org/doc/old/CQL-3.0.html#timeFun
Converts the timestamp/timeuuid argument into a date type"
{:added "3.1.0"}
[x]
(cql-fn "toDate" x))

(defn to-timestamp
"http://cassandra.apache.org/doc/cql3/CQL.html#timeFun
"http://cassandra.apache.org/doc/old/CQL-3.0.html#timeFun
Converts the timestamp/timeuuid argument into a timestamp type"
{:added "3.1.0"}
[x]
(cql-fn "toTimestamp" x))

(defn to-unix-timestamp
"http://cassandra.apache.org/doc/cql3/CQL.html#timeFun
"http://cassandra.apache.org/doc/old/CQL-3.0.html#timeFun
Converts the timestamp/timeuuid/date argument into a bigInt raw value"
{:added "3.1.0"}
Expand All @@ -100,7 +100,7 @@ Converts the timestamp/timeuuid/date argument into a bigInt raw value"

(defn unix-timestamp-of
"DEPRECATED: USE to-unix-timestamp instead
http://cassandra.apache.org/doc/cql3/CQL.html#usingtimeuuid
http://cassandra.apache.org/doc/old/CQL-3.0.html#timeuuidFun
Returns a unixTimestampOf function with the supplied argument"
{:deprecated "3.1.0"}
Expand All @@ -109,7 +109,7 @@ Returns a unixTimestampOf function with the supplied argument"

(defn date-of
"DEPRECATED: USE to-date instead
http://cassandra.apache.org/doc/cql3/CQL.html#usingtimeuuid
http://cassandra.apache.org/doc/old/CQL-3.0.html#timeuuidFun
Returns a dateOf function with the supplied argument"
{:deprecated "3.1.0"}
Expand Down

0 comments on commit 2b5230e

Please sign in to comment.