Skip to content

Commit

Permalink
fix stuff from merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
colin-ho committed Mar 4, 2024
1 parent 871cb03 commit ad002d6
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 15 deletions.
20 changes: 9 additions & 11 deletions docs/source/api_docs/creation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -102,17 +102,6 @@ Delta Lake

read_delta_lake

In-memory
---------

Arrow
~~~~~

.. autosummary::
:nosignatures:
:toctree: doc_gen/io_functions

read_sql

Integrations
------------
Expand All @@ -136,3 +125,12 @@ Dask
:toctree: doc_gen/io_functions

from_dask_dataframe

Databases
~~~~~~~~~

.. autosummary::
:nosignatures:
:toctree: doc_gen/io_functions

read_sql
6 changes: 2 additions & 4 deletions src/daft-dsl/src/lit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -222,15 +222,13 @@ impl LiteralValue {
Utf8(val) => format!("'{}'", val).into(),
Binary(val) => format!("x'{}'", val.len()).into(),
Date(val) => format!("DATE '{}'", display_date32(*val)).into(),
// TODO(Colin): Reading time from Postgres is parsed as Time(Nanoseconds), while from MySQL it is parsed as Duration(Microseconds)
// Need to fix our time comparison code to handle this.
Time(..) => None,
Timestamp(val, tu, tz) => format!(
"TIMESTAMP '{}'",
display_timestamp(*val, tu, tz).replace('T', " ")
)
.into(),
Series(..) => None,
// TODO(Colin): Implement the rest of the types in future work for SQl pushdowns.
Decimal(..) | Series(..) | Time(..) => None,
#[cfg(feature = "python")]
Python(..) => None,
}
Expand Down

0 comments on commit ad002d6

Please sign in to comment.