diff --git a/go/libraries/doltcore/sqle/dtablefunctions/dolt_log.go b/go/libraries/doltcore/sqle/dtablefunctions/dolt_log.go index eddc5806ac..b3f8847e25 100644 --- a/go/libraries/doltcore/sqle/dtablefunctions/dolt_log.go +++ b/go/libraries/doltcore/sqle/dtablefunctions/dolt_log.go @@ -177,7 +177,7 @@ var logTableSchema = sql.Schema{ &sql.Column{Name: "commit_hash", Type: types.Text}, &sql.Column{Name: "committer", Type: types.Text}, &sql.Column{Name: "email", Type: types.Text}, - &sql.Column{Name: "date", Type: types.Datetime}, + &sql.Column{Name: "date", Type: types.Datetime3}, &sql.Column{Name: "message", Type: types.Text}, &sql.Column{Name: "commit_order", Type: types.Uint64}, } diff --git a/go/libraries/doltcore/sqle/dtables/branch_activity_table.go b/go/libraries/doltcore/sqle/dtables/branch_activity_table.go index 15b8ef770b..c230170ab3 100644 --- a/go/libraries/doltcore/sqle/dtables/branch_activity_table.go +++ b/go/libraries/doltcore/sqle/dtables/branch_activity_table.go @@ -50,10 +50,10 @@ func (bat *BranchActivityTable) String() string { func (bat *BranchActivityTable) Schema() sql.Schema { return []*sql.Column{ {Name: "branch", Type: types.Text, Source: bat.tableName, PrimaryKey: true, Nullable: false, DatabaseSource: bat.db.Name()}, - {Name: "last_read", Type: types.Datetime, Source: bat.tableName, PrimaryKey: false, Nullable: true, DatabaseSource: bat.db.Name()}, - {Name: "last_write", Type: types.Datetime, Source: bat.tableName, PrimaryKey: false, Nullable: true, DatabaseSource: bat.db.Name()}, + {Name: "last_read", Type: types.DatetimeMaxPrecision, Source: bat.tableName, PrimaryKey: false, Nullable: true, DatabaseSource: bat.db.Name()}, + {Name: "last_write", Type: types.DatetimeMaxPrecision, Source: bat.tableName, PrimaryKey: false, Nullable: true, DatabaseSource: bat.db.Name()}, {Name: "active_sessions", Type: types.Int32, Source: bat.tableName, PrimaryKey: false, Nullable: false, DatabaseSource: bat.db.Name()}, - {Name: "system_start_time", Type: types.Datetime, Source: bat.tableName, PrimaryKey: false, Nullable: false, DatabaseSource: bat.db.Name()}, + {Name: "system_start_time", Type: types.DatetimeMaxPrecision, Source: bat.tableName, PrimaryKey: false, Nullable: false, DatabaseSource: bat.db.Name()}, } } diff --git a/go/libraries/doltcore/sqle/dtables/branches_table.go b/go/libraries/doltcore/sqle/dtables/branches_table.go index 6ae651f17d..6898aa0669 100644 --- a/go/libraries/doltcore/sqle/dtables/branches_table.go +++ b/go/libraries/doltcore/sqle/dtables/branches_table.go @@ -235,7 +235,7 @@ func (bt *BranchesTable) Schema() sql.Schema { {Name: "hash", Type: types.Text, Source: bt.tableName, PrimaryKey: false, Nullable: false, DatabaseSource: bt.db.Name()}, {Name: "latest_committer", Type: types.Text, Source: bt.tableName, PrimaryKey: false, Nullable: true, DatabaseSource: bt.db.Name()}, {Name: "latest_committer_email", Type: types.Text, Source: bt.tableName, PrimaryKey: false, Nullable: true, DatabaseSource: bt.db.Name()}, - {Name: "latest_commit_date", Type: types.Datetime, Source: bt.tableName, PrimaryKey: false, Nullable: true, DatabaseSource: bt.db.Name()}, + {Name: "latest_commit_date", Type: types.Datetime3, Source: bt.tableName, PrimaryKey: false, Nullable: true, DatabaseSource: bt.db.Name()}, {Name: "latest_commit_message", Type: types.Text, Source: bt.tableName, PrimaryKey: false, Nullable: true, DatabaseSource: bt.db.Name()}, } if !bt.remote { diff --git a/go/libraries/doltcore/sqle/dtables/commits_table.go b/go/libraries/doltcore/sqle/dtables/commits_table.go index 8528d06100..d9eeb8591c 100644 --- a/go/libraries/doltcore/sqle/dtables/commits_table.go +++ b/go/libraries/doltcore/sqle/dtables/commits_table.go @@ -76,7 +76,7 @@ func (ct *CommitsTable) Schema() sql.Schema { {Name: "commit_hash", Type: types.Text, Source: ct.tableName, PrimaryKey: true, DatabaseSource: ct.dbName}, {Name: "committer", Type: types.Text, Source: ct.tableName, PrimaryKey: false, DatabaseSource: ct.dbName}, {Name: "email", Type: types.Text, Source: ct.tableName, PrimaryKey: false, DatabaseSource: ct.dbName}, - {Name: "date", Type: types.Datetime, Source: ct.tableName, PrimaryKey: false, DatabaseSource: ct.dbName}, + {Name: "date", Type: types.Datetime3, Source: ct.tableName, PrimaryKey: false, DatabaseSource: ct.dbName}, {Name: "message", Type: types.Text, Source: ct.tableName, PrimaryKey: false, DatabaseSource: ct.dbName}, } } diff --git a/go/libraries/doltcore/sqle/dtables/log_table.go b/go/libraries/doltcore/sqle/dtables/log_table.go index 2757bec49e..6a6450c778 100644 --- a/go/libraries/doltcore/sqle/dtables/log_table.go +++ b/go/libraries/doltcore/sqle/dtables/log_table.go @@ -90,7 +90,7 @@ func (dt *LogTable) Schema() sql.Schema { {Name: "commit_hash", Type: types.Text, Source: dt.tableName, PrimaryKey: true, DatabaseSource: dt.dbName}, {Name: "committer", Type: types.Text, Source: dt.tableName, PrimaryKey: false, DatabaseSource: dt.dbName}, {Name: "email", Type: types.Text, Source: dt.tableName, PrimaryKey: false, DatabaseSource: dt.dbName}, - {Name: "date", Type: types.Datetime, Source: dt.tableName, PrimaryKey: false, DatabaseSource: dt.dbName}, + {Name: "date", Type: types.Datetime3, Source: dt.tableName, PrimaryKey: false, DatabaseSource: dt.dbName}, {Name: "message", Type: types.Text, Source: dt.tableName, PrimaryKey: false, DatabaseSource: dt.dbName}, {Name: "commit_order", Type: types.Uint64, Source: dt.tableName, PrimaryKey: false, DatabaseSource: dt.dbName}, } diff --git a/go/libraries/doltcore/sqle/dtables/tags_table.go b/go/libraries/doltcore/sqle/dtables/tags_table.go index 4e42bebb64..c5e73b0762 100644 --- a/go/libraries/doltcore/sqle/dtables/tags_table.go +++ b/go/libraries/doltcore/sqle/dtables/tags_table.go @@ -71,7 +71,7 @@ func (tt *TagsTable) Schema() sql.Schema { {Name: "tag_hash", Type: types.Text, Source: tt.tableName, PrimaryKey: true}, {Name: "tagger", Type: types.Text, Source: tt.tableName, PrimaryKey: false}, {Name: "email", Type: types.Text, Source: tt.tableName, PrimaryKey: false}, - {Name: "date", Type: types.Datetime, Source: tt.tableName, PrimaryKey: false}, + {Name: "date", Type: types.Datetime3, Source: tt.tableName, PrimaryKey: false}, {Name: "message", Type: types.Text, Source: tt.tableName, PrimaryKey: false}, } } diff --git a/go/libraries/doltcore/sqle/enginetest/dolt_queries.go b/go/libraries/doltcore/sqle/enginetest/dolt_queries.go index d33ca9ba84..8fcd279daa 100644 --- a/go/libraries/doltcore/sqle/enginetest/dolt_queries.go +++ b/go/libraries/doltcore/sqle/enginetest/dolt_queries.go @@ -5324,7 +5324,7 @@ var LogTableFunctionScriptTests = []queries.ScriptTest{ {"commit_hash", "text", "NO", "PRI", nil, ""}, {"committer", "text", "NO", "", nil, ""}, {"email", "text", "NO", "", nil, ""}, - {"date", "datetime", "NO", "", nil, ""}, + {"date", "datetime(3)", "NO", "", nil, ""}, {"message", "text", "NO", "", nil, ""}, {"commit_order", "bigint unsigned", "NO", "", nil, ""}, }, diff --git a/go/libraries/doltcore/sqle/history_table.go b/go/libraries/doltcore/sqle/history_table.go index 3dd9dc6ee3..8303a35a61 100644 --- a/go/libraries/doltcore/sqle/history_table.go +++ b/go/libraries/doltcore/sqle/history_table.go @@ -95,7 +95,7 @@ func (ht *HistoryTable) PrimaryKeySchema() sql.PrimaryKeySchema { &sql.Column{ Name: CommitDateCol, Source: tableName, - Type: types.Datetime, + Type: types.Datetime3, }, ) return newSch @@ -209,7 +209,7 @@ func historyTableSchema(tableName string, table *DoltTable) sql.Schema { &sql.Column{ Name: CommitDateCol, Source: tableName, - Type: types.Datetime, + Type: types.Datetime3, }, ) return newSch @@ -409,7 +409,7 @@ func (ht *HistoryTable) Schema() sql.Schema { projectedSch[i] = &sql.Column{ Name: CommitDateCol, Source: ht.Name(), - Type: types.Datetime, + Type: types.Datetime3, } } else { panic("column not found") diff --git a/go/libraries/doltcore/sqle/sqlselect_test.go b/go/libraries/doltcore/sqle/sqlselect_test.go index 8a54315cbe..3c30e46f1c 100644 --- a/go/libraries/doltcore/sqle/sqlselect_test.go +++ b/go/libraries/doltcore/sqle/sqlselect_test.go @@ -759,7 +759,7 @@ func BasicSelectTests() []SelectTest { &sql.Column{Name: "commit_hash", Type: gmstypes.Text}, &sql.Column{Name: "committer", Type: gmstypes.Text}, &sql.Column{Name: "email", Type: gmstypes.Text}, - &sql.Column{Name: "date", Type: gmstypes.Datetime}, + &sql.Column{Name: "date", Type: gmstypes.Datetime3}, &sql.Column{Name: "message", Type: gmstypes.Text}, &sql.Column{Name: "commit_order", Type: gmstypes.Uint64}, }, @@ -793,7 +793,7 @@ func BasicSelectTests() []SelectTest { &sql.Column{Name: "hash", Type: gmstypes.Text}, &sql.Column{Name: "latest_committer", Type: gmstypes.Text}, &sql.Column{Name: "latest_committer_email", Type: gmstypes.Text}, - &sql.Column{Name: "latest_commit_date", Type: gmstypes.Datetime}, + &sql.Column{Name: "latest_commit_date", Type: gmstypes.Datetime3}, &sql.Column{Name: "latest_commit_message", Type: gmstypes.Text}, &sql.Column{Name: "remote", Type: gmstypes.Text}, &sql.Column{Name: "branch", Type: gmstypes.Text},